pradosoft / prado

framework/Security/TAuthManager.php

Indentation +1 added lines, -1 removed lines

@@ -289,7 +289,7 @@
 
 		// check for authentication expiration
 		$isAuthExpired = $this->_authExpire>0 && !$user->getIsGuest() &&
-        ($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
+		($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime<time();
 
 		// try authenticating through cookie if possible
 		if($this->getAllowAutoLogin() && ($user->getIsGuest() || $isAuthExpired))

framework/I18N/TChoiceFormat.php

Indentation +2 added lines, -2 removed lines

@@ -10,8 +10,8 @@
  */
 
  /**
- * Get the ChoiceFormat class.
- */
+  * Get the ChoiceFormat class.
+  */
 Prado::using('System.I18N.core.ChoiceFormat');
 Prado::using('System.I18N.TTranslate');
 

framework/I18N/TNumberFormat.php

Indentation +43 added lines, -43 removed lines

@@ -20,49 +20,49 @@
 Prado::using('System.I18N.TI18NControl');
 
 /**
-  * 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>
-  * @version v1.0, last update on Sat Dec 11 17:49:56 EST 2004
-  * @package System.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>
+ * @version v1.0, last update on Sat Dec 11 17:49:56 EST 2004
+ * @package System.I18N
+ */
 class TNumberFormat extends TI18NControl implements IDataRenderer
 {
 	/**

framework/I18N/core/DateFormat.php

Indentation +20 added lines, -20 removed lines

@@ -79,7 +79,7 @@ 
 
 	/**
 	 * The DateTimeFormatInfo, containing culture specific patterns and names.
- 	 * @var DateTimeFormatInfo
+	 * @var DateTimeFormatInfo
 	 */
 	protected $formatInfo;
 
@@ -308,8 +308,8 @@ 
 
 	/**
 	 * Get the year.
- 	 * "yy" will return the last two digits of year.
- 	 * "yyyy" will return the full integer year.
+	 * "yy" will return the last two digits of year.
+	 * "yyyy" will return the full integer year.
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string year
@@ -330,10 +330,10 @@ 
 
 	/**
 	 * Get the month.
- 	 * "M" will return integer 1 through 12
- 	 * "MM" will return the narrow month name, e.g. "J"
- 	 * "MMM" will return the abrreviated month name, e.g. "Jan"
- 	 * "MMMM" will return the month name, e.g. "January"
+	 * "M" will return integer 1 through 12
+	 * "MM" will return the narrow month name, e.g. "J"
+	 * "MMM" will return the abrreviated month name, e.g. "Jan"
+	 * "MMMM" will return the month name, e.g. "January"
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string month name
@@ -361,10 +361,10 @@ 
 
 	/**
 	 * Get the day of the week.
- 	 * "E" will return integer 0 (for Sunday) through 6 (for Saturday).
- 	 * "EE" will return the narrow day of the week, e.g. "M"
- 	 * "EEE" will return the abrreviated day of the week, e.g. "Mon"
- 	 * "EEEE" will return the day of the week, e.g. "Monday"
+	 * "E" will return integer 0 (for Sunday) through 6 (for Saturday).
+	 * "EE" will return the narrow day of the week, e.g. "M"
+	 * "EEE" will return the abrreviated day of the week, e.g. "Mon"
+	 * "EEEE" will return the day of the week, e.g. "Monday"
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string day of the week.
@@ -394,7 +394,7 @@ 
 
 	/**
 	 * Get the day of the month.
- 	 * "d" for non-padding, "dd" will always return 2 characters.
+	 * "d" for non-padding, "dd" will always return 2 characters.
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string day of the month
@@ -581,14 +581,14 @@ 
 	protected function getDayInMonth($date, $pattern='FF')
 	{
 		switch ($pattern) {
-		    case 'F':
-		      return @date('j', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
-		      break;
-		    case 'FF':
-		      return @date('d', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
-		      break;
-		    default:
-		      throw new Exception('The pattern for day in month is "F" or "FF".');
+			case 'F':
+			  return @date('j', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
+			  break;
+			case 'FF':
+			  return @date('d', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
+			  break;
+			default:
+			  throw new Exception('The pattern for day in month is "F" or "FF".');
 		}
 	}
 

framework/I18N/core/DateTimeFormatInfo.php

Indentation +157 added lines, -157 removed lines

@@ -149,46 +149,46 @@ 
 	 * (invariant).
 	 * @return DateTimeFormatInfo default DateTimeFormatInfo.
 	 */
-    static function getInvariantInfo()
-    {
-        static $invariant;
+	static function getInvariantInfo()
+	{
+		static $invariant;
 		if($invariant === null)
-        {
-            $culture = CultureInfo::getInvariantCulture();
-            $invariant = $culture->getDateTimeFormat();
-        }
+		{
+			$culture = CultureInfo::getInvariantCulture();
+			$invariant = $culture->getDateTimeFormat();
+		}
 		return $invariant;
-    }
-
-    /**
-     * Returns the DateTimeFormatInfo associated with the specified culture.
-     * @param CultureInfo the culture that gets the DateTimeFormat property.
-     * @return DateTimeFormatInfo DateTimeFormatInfo for the specified
-     * culture.
-     */
-    static function getInstance($culture=null)
-    {
-
-        if ($culture instanceof CultureInfo)
-            return $culture->getDateTimeFormat();
-       	else if(is_string($culture))
-       	{
-       		$cultureInfo = CultureInfo::getInstance($culture);
-       		return $cultureInfo->getDateTimeFormat();
-       	}
-       	else
-       	{
+	}
+
+	/**
+	 * Returns the DateTimeFormatInfo associated with the specified culture.
+	 * @param CultureInfo the culture that gets the DateTimeFormat property.
+	 * @return DateTimeFormatInfo DateTimeFormatInfo for the specified
+	 * culture.
+	 */
+	static function getInstance($culture=null)
+	{
+
+		if ($culture instanceof CultureInfo)
+			return $culture->getDateTimeFormat();
+	   	else if(is_string($culture))
+	   	{
+	   		$cultureInfo = CultureInfo::getInstance($culture);
+	   		return $cultureInfo->getDateTimeFormat();
+	   	}
+	   	else
+	   	{
 			$cultureInfo = CultureInfo::getInvariantCulture();
-            return $cultureInfo->getDateTimeFormat();
-       	}
-    }
+			return $cultureInfo->getDateTimeFormat();
+	   	}
+	}
 
 	/**
 	 * A one-dimensional array of type String containing
 	 * the culture-specific abbreviated names of the days
 	 * of the week. The array for InvariantInfo contains
 	 * "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", and "Sat".
-     * @return array abbreviated day names
+	 * @return array abbreviated day names
 	 */
 	function getAbbreviatedDayNames()
 	{
@@ -196,37 +196,37 @@ 
 		//return $this->data['dayNames/format/abbreviated'];
 	}
 
-    /**
-     * Set the abbreviated day names. The value should be
-     * an array of string starting with Sunday and ends in Saturady.
-     * For example,
-     * <code>array("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat");</code>
-     * @param array abbreviated day names.
-     */
-    function setAbbreviatedDayNames($value)
-    {
-    	$this->data['dayNames']['format']['abbreviated'] = $value;
-    }
+	/**
+	 * Set the abbreviated day names. The value should be
+	 * an array of string starting with Sunday and ends in Saturady.
+	 * For example,
+	 * <code>array("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat");</code>
+	 * @param array abbreviated day names.
+	 */
+	function setAbbreviatedDayNames($value)
+	{
+		$this->data['dayNames']['format']['abbreviated'] = $value;
+	}
 
 	/**
 	 * A one-dimensional array of type String containing
 	 * the culture-specific narrow names of the days
 	 * of the week. The array for InvariantInfo contains
 	 * "S", "M", "T", "W", "T", "F", and "S".
-     * @return array narrow day names
+	 * @return array narrow day names
 	 */
 	function getNarrowDayNames()
 	{
 		return $this->data['dayNames']['format']['narrow'];
 	}
 
-    /**
-     * Set the narrow day names. The value should be
-     * an array of string starting with Sunday and ends in Saturady.
-     * For example,
-     * <code>array("S", "M", "T", "W", "T", "F", "S");</code>
-     * @param array narrow day names.
-     */
+	/**
+	 * Set the narrow day names. The value should be
+	 * an array of string starting with Sunday and ends in Saturady.
+	 * For example,
+	 * <code>array("S", "M", "T", "W", "T", "F", "S");</code>
+	 * @param array narrow day names.
+	 */
 	function setNarrowDayNames($value)
 	{
 		$this->data['dayNames']['format']['narrow'] = $value;
@@ -237,7 +237,7 @@ 
 	 * culture-specific full names of the days of the week.
 	 * The array for InvariantInfo contains "Sunday", "Monday",
 	 * "Tuesday", "Wednesday", "Thursday", "Friday", and "Saturday".
-     * @return array day names
+	 * @return array day names
 	 */
 	function getDayNames()
 	{
@@ -245,14 +245,14 @@ 
 	}
 
 
-    /**
-     * Set the day names. The value should be
-     * an array of string starting with Sunday and ends in Saturady.
-     * For example,
-     * <code>array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
-     * "Friday", "Saturday".);</code>
-     * @param array day names.
-     */
+	/**
+	 * Set the day names. The value should be
+	 * an array of string starting with Sunday and ends in Saturady.
+	 * For example,
+	 * <code>array("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
+	 * "Friday", "Saturday".);</code>
+	 * @param array day names.
+	 */
 	function setDayNames($value)
 	{
 		$this->data['dayNames']['format']['wide'] = $value;
@@ -270,17 +270,17 @@ 
 		return $this->data['monthNames']['format']['narrow'];
 	}
 
-    /**
-     * Set the narrow month names. The value should be
-     * an array of string starting with J and ends in D.
-     * For example,
-     * <code>array("J","F","M","A","M","J","J","A","S","O","N","D");</code>
-     * @param array month names.
-     */
-    function setNarrowMonthNames($value)
-    {
-        $this->data['monthNames']['format']['narrow'] = $value;
-    }
+	/**
+	 * Set the narrow month names. The value should be
+	 * an array of string starting with J and ends in D.
+	 * For example,
+	 * <code>array("J","F","M","A","M","J","J","A","S","O","N","D");</code>
+	 * @param array month names.
+	 */
+	function setNarrowMonthNames($value)
+	{
+		$this->data['monthNames']['format']['narrow'] = $value;
+	}
 
 	/**
 	 * A one-dimensional array of type String containing the
@@ -298,18 +298,18 @@ 
 			return $this->data['monthNames']['format']['wide'];
 	}
 
-    /**
-     * Set the abbreviated month names. The value should be
-     * an array of string starting with Jan and ends in Dec.
-     * For example,
-     * <code>array("Jan", "Feb", "Mar", "Apr", "May", "Jun",
-     * "Jul", "Aug", "Sep","Oct","Nov","Dec");</code>
-     * @param array month names.
-     */
-    function setAbbreviatedMonthNames($value)
-    {
-        $this->data['monthNames']['format']['abbreviated'] = $value;
-    }
+	/**
+	 * Set the abbreviated month names. The value should be
+	 * an array of string starting with Jan and ends in Dec.
+	 * For example,
+	 * <code>array("Jan", "Feb", "Mar", "Apr", "May", "Jun",
+	 * "Jul", "Aug", "Sep","Oct","Nov","Dec");</code>
+	 * @param array month names.
+	 */
+	function setAbbreviatedMonthNames($value)
+	{
+		$this->data['monthNames']['format']['abbreviated'] = $value;
+	}
 
 	/**
 	 * A one-dimensional array of type String containing the
@@ -324,18 +324,18 @@ 
 		return $this->data['monthNames']['format']['wide'];
 	}
 
-    /**
-     * Set the month names. The value should be
-     * an array of string starting with Janurary and ends in December.
-     * For example,
-     * <code>array("January", "February", "March", "April", "May", "June",
-     * "July", "August", "September","October","November","December");</code>
-     * @param array month names.
-     */
-    function setMonthNames($value)
-    {
-    	$this->data['monthNames']['format']['wide'] = $value;
-    }
+	/**
+	 * Set the month names. The value should be
+	 * an array of string starting with Janurary and ends in December.
+	 * For example,
+	 * <code>array("January", "February", "March", "April", "May", "June",
+	 * "July", "August", "September","October","November","December");</code>
+	 * @param array month names.
+	 */
+	function setMonthNames($value)
+	{
+		$this->data['monthNames']['format']['wide'] = $value;
+	}
 
 	/**
 	 * A string containing the name of the era.
@@ -359,16 +359,16 @@ 
 		return $result[0];
 	}
 
-    /**
-     * Set the AM Designator. For example, 'AM'.
-     * @param string AM designator.
-     */
-    function setAMDesignator($value)
-    {
-        $markers = $this->getAMPMMarkers();
-        $markers[0] = $value;
-        $this->setAMPMMarkers($markers);
-    }
+	/**
+	 * Set the AM Designator. For example, 'AM'.
+	 * @param string AM designator.
+	 */
+	function setAMDesignator($value)
+	{
+		$markers = $this->getAMPMMarkers();
+		$markers[0] = $value;
+		$this->setAMPMMarkers($markers);
+	}
 
 	/**
 	 * The string designator for hours that are "post meridiem" (after noon).
@@ -381,41 +381,41 @@ 
 		return $result[1];
 	}
 
-    /**
-     * Set the PM Designator. For example, 'PM'.
-     * @param string PM designator.
-     */
-    function setPMDesignator($value)
-    {
-        $markers = $this->getAMPMMarkers();
-        $markers[1] = $value;
-        $this->setAMPMMarkers($markers);
-    }
-
-    /**
-     * Get the AM and PM markers array.
-     * Default InvariantInfo for AM and PM is <code>array('AM','PM');</code>
-     * @return array AM and PM markers
-     */
-    function getAMPMMarkers()
+	/**
+	 * Set the PM Designator. For example, 'PM'.
+	 * @param string PM designator.
+	 */
+	function setPMDesignator($value)
+	{
+		$markers = $this->getAMPMMarkers();
+		$markers[1] = $value;
+		$this->setAMPMMarkers($markers);
+	}
+
+	/**
+	 * Get the AM and PM markers array.
+	 * Default InvariantInfo for AM and PM is <code>array('AM','PM');</code>
+	 * @return array AM and PM markers
+	 */
+	function getAMPMMarkers()
 	{
 		return $this->data['AmPmMarkers'];
 	}
 
-    /**
-     * Set the AM and PM markers array.
-     * For example <code>array('AM','PM');</code>
-     * @param array AM and PM markers
-     */
-    function setAMPMMarkers($value)
-    {
-        $this->data['AmPmMarkers'] = $value;
-    }
+	/**
+	 * Set the AM and PM markers array.
+	 * For example <code>array('AM','PM');</code>
+	 * @param array AM and PM markers
+	 */
+	function setAMPMMarkers($value)
+	{
+		$this->data['AmPmMarkers'] = $value;
+	}
 
 	/**
 	 * Returns the full time pattern "HH:mm:ss z" (default).
-     * This is culture sensitive.
-     * @return string pattern "HH:mm:ss z".
+	 * This is culture sensitive.
+	 * @return string pattern "HH:mm:ss z".
 	 */
 	function getFullTimePattern()
 	{
@@ -424,8 +424,8 @@ 
 
 	/**
 	 * Returns the long time pattern "HH:mm:ss z" (default).
-     * This is culture sensitive.
-     * @return string pattern "HH:mm:ss z".
+	 * This is culture sensitive.
+	 * @return string pattern "HH:mm:ss z".
 	 */
 	function getLongTimePattern()
 	{
@@ -434,8 +434,8 @@ 
 
 	/**
 	 * Returns the medium time pattern "HH:mm:ss" (default).
-     * This is culture sensitive.
-     * @return string pattern "HH:mm:ss".
+	 * This is culture sensitive.
+	 * @return string pattern "HH:mm:ss".
 	 */
 	function getMediumTimePattern()
 	{
@@ -444,8 +444,8 @@ 
 
 	/**
 	 * Returns the short time pattern "HH:mm" (default).
-     * This is culture sensitive.
-     * @return string pattern "HH:mm".
+	 * This is culture sensitive.
+	 * @return string pattern "HH:mm".
 	 */
 	function getShortTimePattern()
 	{
@@ -454,8 +454,8 @@ 
 
 	/**
 	 * Returns the full date pattern "EEEE, yyyy MMMM dd" (default).
-     * This is culture sensitive.
-     * @return string pattern "EEEE, yyyy MMMM dd".
+	 * This is culture sensitive.
+	 * @return string pattern "EEEE, yyyy MMMM dd".
 	 */
 	function getFullDatePattern()
 	{
@@ -464,8 +464,8 @@ 
 
 	/**
 	 * Returns the long date pattern "yyyy MMMM d" (default).
-     * This is culture sensitive.
-     * @return string pattern "yyyy MMMM d".
+	 * This is culture sensitive.
+	 * @return string pattern "yyyy MMMM d".
 	 */
 	function getLongDatePattern()
 	{
@@ -474,8 +474,8 @@ 
 
 	/**
 	 * Returns the medium date pattern "yyyy MMMM d" (default).
-     * This is culture sensitive.
-     * @return string pattern "yyyy MMM d".
+	 * This is culture sensitive.
+	 * @return string pattern "yyyy MMM d".
 	 */
 	function getMediumDatePattern()
 	{
@@ -484,28 +484,28 @@ 
 
 	/**
 	 * Returns the short date pattern "yy/MM/dd" (default).
-     * This is culture sensitive.
-     * @return string pattern "yy/MM/dd".
+	 * This is culture sensitive.
+	 * @return string pattern "yy/MM/dd".
 	 */
 	function getShortDatePattern()
 	{
 		return $this->data['DateTimePatterns'][7];
 	}
 
-    /**
-     * Returns the date time order pattern, "{1} {0}" (default).
-     * This is culture sensitive.
-     * @return string pattern "{1} {0}".
-     */
-    function getDateTimeOrderPattern()
-    {
-        return $this->data['DateTimePatterns'][8];
-    }
+	/**
+	 * Returns the date time order pattern, "{1} {0}" (default).
+	 * This is culture sensitive.
+	 * @return string pattern "{1} {0}".
+	 */
+	function getDateTimeOrderPattern()
+	{
+		return $this->data['DateTimePatterns'][8];
+	}
 
 	/**
 	 * Formats the date and time in a culture sensitive paterrn.
-     * The default is "Date Time".
-     * @return string date and time formated
+	 * The default is "Date Time".
+	 * @return string date and time formated
 	 */
 	function formatDateTime($date, $time)
 	{

framework/I18N/core/NumberFormat.php

Indentation +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
 
 	/**
 	 * The DateTimeFormatInfo, containing culture specific patterns and names.
- 	 * @var DateTimeFormatInfo
+	 * @var DateTimeFormatInfo
 	 */
 	protected $formatInfo;
 
@@ -116,7 +116,7 @@ 
 	function format($number, $pattern='d', $currency='USD', $charset='UTF-8')
 	{
 		$oldLocale=setLocale(LC_NUMERIC, '0');
-	    setlocale(LC_NUMERIC, 'C');
+		setlocale(LC_NUMERIC, 'C');
 
 		$this->setPattern($pattern);
 

framework/I18N/core/NumberFormatInfo.php

Indentation +368 added lines, -368 removed lines

@@ -122,7 +122,7 @@ 
 	/**
 	 * Set the pattern for a specific number pattern. The validate patterns
 	 * NumberFormatInfo::DECIMAL, NumberFormatInfo::CURRENCY,
-     * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
+	 * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
 	 * @param int pattern type.
 	 */
 	public function setPattern($type=NumberFormatInfo::DECIMAL)
@@ -152,94 +152,94 @@ 
 	 * (invariant).
 	 * @return NumberFormatInfo default NumberFormatInfo.
 	 */
-    public static function getInvariantInfo($type=NumberFormatInfo::DECIMAL)
-    {
-        static $invariant;
+	public static function getInvariantInfo($type=NumberFormatInfo::DECIMAL)
+	{
+		static $invariant;
 		if($invariant === null)
-        {
-            $culture = CultureInfo::getInvariantCulture();
-            $invariant = $culture->NumberFormat;
-            $invariant->setPattern($type);
-        }
+		{
+			$culture = CultureInfo::getInvariantCulture();
+			$invariant = $culture->NumberFormat;
+			$invariant->setPattern($type);
+		}
 		return $invariant;
-    }
-
-    /**
-     * Returns the NumberFormatInfo associated with the specified culture.
-     * @param CultureInfo the culture that gets the NumberFormat property.
-     * @param int the number formatting type, it should be
-     * NumberFormatInfo::DECIMAL, NumberFormatInfo::CURRENCY,
-     * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
-     * @return NumberFormatInfo NumberFormatInfo for the specified
-     * culture.
-     * @see getCurrencyInstance();
-     * @see getPercentageInstance();
-     * @see getScientificInstance();
-     */
-    public static function getInstance($culture=null,
-    								   $type=NumberFormatInfo::DECIMAL)
-    {
+	}
+
+	/**
+	 * Returns the NumberFormatInfo associated with the specified culture.
+	 * @param CultureInfo the culture that gets the NumberFormat property.
+	 * @param int the number formatting type, it should be
+	 * NumberFormatInfo::DECIMAL, NumberFormatInfo::CURRENCY,
+	 * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
+	 * @return NumberFormatInfo NumberFormatInfo for the specified
+	 * culture.
+	 * @see getCurrencyInstance();
+	 * @see getPercentageInstance();
+	 * @see getScientificInstance();
+	 */
+	public static function getInstance($culture=null,
+									   $type=NumberFormatInfo::DECIMAL)
+	{
    		if ($culture instanceof CultureInfo)
    		{
-            $formatInfo = $culture->NumberFormat;
-            $formatInfo->setPattern($type);
-            return $formatInfo;
+			$formatInfo = $culture->NumberFormat;
+			$formatInfo->setPattern($type);
+			return $formatInfo;
    		}
-       	else if(is_string($culture))
-       	{
-       		$cultureInfo = new CultureInfo($culture);
-       		$formatInfo = $cultureInfo->NumberFormat;
-       		$formatInfo->setPattern($type);
-       		return $formatInfo;
-       	}
-       	else
-       	{
-            $cultureInfo = new CultureInfo();
-       		$formatInfo = $cultureInfo->NumberFormat;
-       		$formatInfo->setPattern($type);
-       		return $formatInfo;
-       	}
-    }
-
-    /**
-     * Returns the currency format info associated with the specified culture.
-     * @param CultureInfo the culture that gets the NumberFormat property.
-     * @return NumberFormatInfo NumberFormatInfo for the specified
-     * culture.
-     */
-    public static function getCurrencyInstance($culture=null)
-    {
-        return self::getInstance($culture, self::CURRENCY);
-    }
-
-    /**
-     * Returns the percentage format info associated with the specified culture.
-     * @param CultureInfo the culture that gets the NumberFormat property.
-     * @return NumberFormatInfo NumberFormatInfo for the specified
-     * culture.
-     */
-    public static function getPercentageInstance($culture=null)
-    {
-        return self::getInstance($culture, self::PERCENTAGE);
-    }
-
-    /**
-     * Returns the scientific format info associated with the specified culture.
-     * @param CultureInfo the culture that gets the NumberFormat property.
-     * @return NumberFormatInfo NumberFormatInfo for the specified
-     * culture.
-     */
-    public static function getScientificInstance($culture=null)
-    {
-        return self::getInstance($culture, self::SCIENTIFIC);
-    }
-
-    /**
-     * Parse the given pattern and return a list of known properties.
-     * @param string a number pattern.
-     * @return array list of pattern properties.
-     */
-    protected function parsePattern($pattern)
+	   	else if(is_string($culture))
+	   	{
+	   		$cultureInfo = new CultureInfo($culture);
+	   		$formatInfo = $cultureInfo->NumberFormat;
+	   		$formatInfo->setPattern($type);
+	   		return $formatInfo;
+	   	}
+	   	else
+	   	{
+			$cultureInfo = new CultureInfo();
+	   		$formatInfo = $cultureInfo->NumberFormat;
+	   		$formatInfo->setPattern($type);
+	   		return $formatInfo;
+	   	}
+	}
+
+	/**
+	 * Returns the currency format info associated with the specified culture.
+	 * @param CultureInfo the culture that gets the NumberFormat property.
+	 * @return NumberFormatInfo NumberFormatInfo for the specified
+	 * culture.
+	 */
+	public static function getCurrencyInstance($culture=null)
+	{
+		return self::getInstance($culture, self::CURRENCY);
+	}
+
+	/**
+	 * Returns the percentage format info associated with the specified culture.
+	 * @param CultureInfo the culture that gets the NumberFormat property.
+	 * @return NumberFormatInfo NumberFormatInfo for the specified
+	 * culture.
+	 */
+	public static function getPercentageInstance($culture=null)
+	{
+		return self::getInstance($culture, self::PERCENTAGE);
+	}
+
+	/**
+	 * Returns the scientific format info associated with the specified culture.
+	 * @param CultureInfo the culture that gets the NumberFormat property.
+	 * @return NumberFormatInfo NumberFormatInfo for the specified
+	 * culture.
+	 */
+	public static function getScientificInstance($culture=null)
+	{
+		return self::getInstance($culture, self::SCIENTIFIC);
+	}
+
+	/**
+	 * Parse the given pattern and return a list of known properties.
+	 * @param string a number pattern.
+	 * @return array list of pattern properties.
+	 */
+	protected function parsePattern($pattern)
 	{
 		$pattern = explode(';',$pattern);
 
@@ -355,296 +355,296 @@ 
 	}
 
 
-    /**
-     * Indicates the number of decimal places.
-     * @return int number of decimal places.
-     */
-    function getDecimalDigits()
-    {
-    	return $this->pattern['decimalPoints'];
-    }
-
-    /**
-     * Set the number of decimal places.
-     * @param int number of decimal places.
-     */
-    function setDecimalDigits($value)
-    {
-    	return $this->pattern['decimalPoints'] = $value;
-    }
-
-    function getDigitSize()
-    {
-    	return $this->pattern['digitSize'];
-    }
-
-    function setDigitSize($value)
-    {
-    	$this->pattern['digitSize'] = $value;
-    }
-
-    /**
-     * Gets the string to use as the decimal separator.
-     * @return string decimal separator.
-     */
-    function getDecimalSeparator()
-    {
-    	return $this->data['NumberElements'][0];
-    }
-
-    /**
-     * Set the string to use as the decimal separator.
-     * @param string the decimal point
-     */
-    function setDecimalSeparator($value)
-    {
-    	return $this->data['NumberElements'][0] = $value;
-    }
-
-    /**
-     * Gets the string that separates groups of digits to the left
-     * of the decimal in currency values.
-     * @param parameter
-     * @return string currency group separator.
-     */
-    function getGroupSeparator()
-    {
-    	return $this->data['NumberElements'][1];
-    }
-
-    /**
-     * Set the string to use as the group separator.
-     * @param string the group separator.
-     */
-    function setGroupSeparator($value)
-    {
-    	return $this->data['NumberElements'][1] = $value;
-    }
-
-    /**
-     * Gets the number of digits in each group to the left of the decimal
-     * There can be two grouping sizes, this fucntion
-     * returns <b>array(group1, group2)</b>, if there is only 1 grouping size,
-     * group2 will be false.
-     * @return array grouping size(s).
-     */
-    function getGroupSizes()
-    {
-    	$group1 = $this->pattern['groupSize1'];
-    	$group2 = $this->pattern['groupSize2'];
-
-    	return array($group1, $group2);
-    }
-
-    /**
-     * Set the number of digits in each group to the left of the decimal.
-     * There can be two grouping sizes, the value should
-     * be an <b>array(group1, group2)</b>, if there is only 1 grouping size,
-     * group2 should be false.
-     * @param array grouping size(s).
-     */
-    function setGroupSizes($groupSize)
-    {
+	/**
+	 * Indicates the number of decimal places.
+	 * @return int number of decimal places.
+	 */
+	function getDecimalDigits()
+	{
+		return $this->pattern['decimalPoints'];
+	}
+
+	/**
+	 * Set the number of decimal places.
+	 * @param int number of decimal places.
+	 */
+	function setDecimalDigits($value)
+	{
+		return $this->pattern['decimalPoints'] = $value;
+	}
+
+	function getDigitSize()
+	{
+		return $this->pattern['digitSize'];
+	}
+
+	function setDigitSize($value)
+	{
+		$this->pattern['digitSize'] = $value;
+	}
+
+	/**
+	 * Gets the string to use as the decimal separator.
+	 * @return string decimal separator.
+	 */
+	function getDecimalSeparator()
+	{
+		return $this->data['NumberElements'][0];
+	}
+
+	/**
+	 * Set the string to use as the decimal separator.
+	 * @param string the decimal point
+	 */
+	function setDecimalSeparator($value)
+	{
+		return $this->data['NumberElements'][0] = $value;
+	}
+
+	/**
+	 * Gets the string that separates groups of digits to the left
+	 * of the decimal in currency values.
+	 * @param parameter
+	 * @return string currency group separator.
+	 */
+	function getGroupSeparator()
+	{
+		return $this->data['NumberElements'][1];
+	}
+
+	/**
+	 * Set the string to use as the group separator.
+	 * @param string the group separator.
+	 */
+	function setGroupSeparator($value)
+	{
+		return $this->data['NumberElements'][1] = $value;
+	}
+
+	/**
+	 * Gets the number of digits in each group to the left of the decimal
+	 * There can be two grouping sizes, this fucntion
+	 * returns <b>array(group1, group2)</b>, if there is only 1 grouping size,
+	 * group2 will be false.
+	 * @return array grouping size(s).
+	 */
+	function getGroupSizes()
+	{
+		$group1 = $this->pattern['groupSize1'];
+		$group2 = $this->pattern['groupSize2'];
+
+		return array($group1, $group2);
+	}
+
+	/**
+	 * Set the number of digits in each group to the left of the decimal.
+	 * There can be two grouping sizes, the value should
+	 * be an <b>array(group1, group2)</b>, if there is only 1 grouping size,
+	 * group2 should be false.
+	 * @param array grouping size(s).
+	 */
+	function setGroupSizes($groupSize)
+	{
    		$this->pattern['groupSize1'] = $groupSize[0];
    		$this->pattern['groupSize2'] = $groupSize[1];
-    }
-
-    /**
-     * Gets the format pattern for negative values.
-     * The negative pattern is composed of a prefix, and postfix.
-     * This function returns <b>array(prefix, postfix)</b>.
-     * @return arary negative pattern.
-     */
-    function getNegativePattern()
-    {
-    	$prefix = $this->pattern['negPref'];
-    	$postfix = $this->pattern['negPost'];
-    	return array($prefix, $postfix);
-    }
-
-    /**
-     * Set the format pattern for negative values.
-     * The negative pattern is composed of a prefix, and postfix in the form
-     * <b>array(prefix, postfix)</b>.
-     * @param arary negative pattern.
-     */
-    function setNegativePattern($pattern)
-    {
-    	$this->pattern['negPref'] = $pattern[0];
-    	$this->pattern['negPost'] = $pattern[1];
-    }
-
-    /**
-     * Gets the format pattern for positive values.
-     * The positive pattern is composed of a prefix, and postfix.
-     * This function returns <b>array(prefix, postfix)</b>.
-     * @return arary positive pattern.
-     */
-    function getPositivePattern()
-    {
-    	$prefix = $this->pattern['posPref'];
-    	$postfix = $this->pattern['posPost'];
-    	return array($prefix, $postfix);
-    }
-
-    /**
-     * Set the format pattern for positive values.
-     * The positive pattern is composed of a prefix, and postfix in the form
-     * <b>array(prefix, postfix)</b>.
-     * @param arary positive pattern.
-     */
-    function setPositivePattern($pattern)
-    {
-    	$this->pattern['posPref'] = $pattern[0];
-    	$this->pattern['posPost'] = $pattern[1];
-    }
-
-    /**
-     * Gets the string to use as the currency symbol.
-     * @return string currency symbol.
-     */
-    function getCurrencySymbol($currency='USD')
-    {
-    	if(isset($this->pattern['symbol']))
+	}
+
+	/**
+	 * Gets the format pattern for negative values.
+	 * The negative pattern is composed of a prefix, and postfix.
+	 * This function returns <b>array(prefix, postfix)</b>.
+	 * @return arary negative pattern.
+	 */
+	function getNegativePattern()
+	{
+		$prefix = $this->pattern['negPref'];
+		$postfix = $this->pattern['negPost'];
+		return array($prefix, $postfix);
+	}
+
+	/**
+	 * Set the format pattern for negative values.
+	 * The negative pattern is composed of a prefix, and postfix in the form
+	 * <b>array(prefix, postfix)</b>.
+	 * @param arary negative pattern.
+	 */
+	function setNegativePattern($pattern)
+	{
+		$this->pattern['negPref'] = $pattern[0];
+		$this->pattern['negPost'] = $pattern[1];
+	}
+
+	/**
+	 * Gets the format pattern for positive values.
+	 * The positive pattern is composed of a prefix, and postfix.
+	 * This function returns <b>array(prefix, postfix)</b>.
+	 * @return arary positive pattern.
+	 */
+	function getPositivePattern()
+	{
+		$prefix = $this->pattern['posPref'];
+		$postfix = $this->pattern['posPost'];
+		return array($prefix, $postfix);
+	}
+
+	/**
+	 * Set the format pattern for positive values.
+	 * The positive pattern is composed of a prefix, and postfix in the form
+	 * <b>array(prefix, postfix)</b>.
+	 * @param arary positive pattern.
+	 */
+	function setPositivePattern($pattern)
+	{
+		$this->pattern['posPref'] = $pattern[0];
+		$this->pattern['posPost'] = $pattern[1];
+	}
+
+	/**
+	 * Gets the string to use as the currency symbol.
+	 * @return string currency symbol.
+	 */
+	function getCurrencySymbol($currency='USD')
+	{
+		if(isset($this->pattern['symbol']))
 			return $this->pattern['symbol'];
-    	else
-    		return $this->data['Currencies'][$currency][0];
-    }
-
-
-    /**
-     * Set the string to use as the currency symbol.
-     * @param string currency symbol.
-     */
-    function setCurrencySymbol($symbol)
-    {
-    	$this->pattern['symbol'] = $symbol;
-    }
-
-    /**
-     * Gets the string that represents negative infinity.
-     * @return string negative infinity.
-     */
-    function getNegativeInfinitySymbol()
-    {
+		else
+			return $this->data['Currencies'][$currency][0];
+	}
+
+
+	/**
+	 * Set the string to use as the currency symbol.
+	 * @param string currency symbol.
+	 */
+	function setCurrencySymbol($symbol)
+	{
+		$this->pattern['symbol'] = $symbol;
+	}
+
+	/**
+	 * Gets the string that represents negative infinity.
+	 * @return string negative infinity.
+	 */
+	function getNegativeInfinitySymbol()
+	{
 		return $this->pattern['negInfty'];
-    }
-
-    /**
-     * Set the string that represents negative infinity.
-     * @param string negative infinity.
-     */
-    function setNegativeInfinitySymbol($value)
-    {
+	}
+
+	/**
+	 * Set the string that represents negative infinity.
+	 * @param string negative infinity.
+	 */
+	function setNegativeInfinitySymbol($value)
+	{
 		$this->pattern['negInfty'] = $value;
-    }
-
-    /**
-     * Gets the string that represents positive infinity.
-     * @return string positive infinity.
-     */
-    function getPositiveInfinitySymbol()
-    {
+	}
+
+	/**
+	 * Gets the string that represents positive infinity.
+	 * @return string positive infinity.
+	 */
+	function getPositiveInfinitySymbol()
+	{
 		return $this->pattern['posInfty'];
-    }
-
-    /**
-     * Set the string that represents positive infinity.
-     * @param string positive infinity.
-     */
-    function setPositiveInfinitySymbol($value)
-    {
+	}
+
+	/**
+	 * Set the string that represents positive infinity.
+	 * @param string positive infinity.
+	 */
+	function setPositiveInfinitySymbol($value)
+	{
 		$this->pattern['posInfty'] = $value;
-    }
-
-    /**
-     * Gets the string that denotes that the associated number is negative.
-     * @return string negative sign.
-     */
-    function getNegativeSign()
-    {
-    	return $this->data['NumberElements'][6];
-    }
-
-    /**
-     * Set the string that denotes that the associated number is negative.
-     * @param string negative sign.
-     */
-    function setNegativeSign($value)
-    {
-    	$this->data['NumberElements'][6] = $value;
-    }
-
-    /**
-     * Gets the string that denotes that the associated number is positive.
-     * @return string positive sign.
-     */
-    function getPositiveSign()
-    {
-    	return $this->data['NumberElements'][11];
-    }
-
-    /**
-     * Set the string that denotes that the associated number is positive.
-     * @param string positive sign.
-     */
-    function setPositiveSign($value)
-    {
-    	$this->data['NumberElements'][11] = $value;
-    }
-
-    /**
-     * Gets the string that represents the IEEE NaN (not a number) value.
-     * @return string NaN symbol.
-     */
-    function getNaNSymbol()
-    {
-    	return $this->data['NumberElements'][10];
-    }
-
-    /**
-     * Set the string that represents the IEEE NaN (not a number) value.
-     * @param string NaN symbol.
-     */
-    function setNaNSymbol($value)
-    {
-    	$this->data['NumberElements'][10] = $value;
-    }
-
-    /**
-     * Gets the string to use as the percent symbol.
-     * @return string percent symbol.
-     */
-    function getPercentSymbol()
-    {
-    	return $this->data['NumberElements'][3];
-    }
-
-    /**
-     * Set the string to use as the percent symbol.
-     * @param string percent symbol.
-     */
-    function setPercentSymbol($value)
-    {
-    	$this->data['NumberElements'][3] = $value;
-    }
-
-    /**
-     * Gets the string to use as the per mille symbol.
-     * @return string percent symbol.
-     */
-    function getPerMilleSymbol()
-    {
-    	return $this->data['NumberElements'][8];
-    }
-
-    /**
-     * Set the string to use as the per mille symbol.
-     * @param string percent symbol.
-     */
-    function setPerMilleSymbol($value)
-    {
-    	$this->data['NumberElements'][8] = $value;
-    }
+	}
+
+	/**
+	 * Gets the string that denotes that the associated number is negative.
+	 * @return string negative sign.
+	 */
+	function getNegativeSign()
+	{
+		return $this->data['NumberElements'][6];
+	}
+
+	/**
+	 * Set the string that denotes that the associated number is negative.
+	 * @param string negative sign.
+	 */
+	function setNegativeSign($value)
+	{
+		$this->data['NumberElements'][6] = $value;
+	}
+
+	/**
+	 * Gets the string that denotes that the associated number is positive.
+	 * @return string positive sign.
+	 */
+	function getPositiveSign()
+	{
+		return $this->data['NumberElements'][11];
+	}
+
+	/**
+	 * Set the string that denotes that the associated number is positive.
+	 * @param string positive sign.
+	 */
+	function setPositiveSign($value)
+	{
+		$this->data['NumberElements'][11] = $value;
+	}
+
+	/**
+	 * Gets the string that represents the IEEE NaN (not a number) value.
+	 * @return string NaN symbol.
+	 */
+	function getNaNSymbol()
+	{
+		return $this->data['NumberElements'][10];
+	}
+
+	/**
+	 * Set the string that represents the IEEE NaN (not a number) value.
+	 * @param string NaN symbol.
+	 */
+	function setNaNSymbol($value)
+	{
+		$this->data['NumberElements'][10] = $value;
+	}
+
+	/**
+	 * Gets the string to use as the percent symbol.
+	 * @return string percent symbol.
+	 */
+	function getPercentSymbol()
+	{
+		return $this->data['NumberElements'][3];
+	}
+
+	/**
+	 * Set the string to use as the percent symbol.
+	 * @param string percent symbol.
+	 */
+	function setPercentSymbol($value)
+	{
+		$this->data['NumberElements'][3] = $value;
+	}
+
+	/**
+	 * Gets the string to use as the per mille symbol.
+	 * @return string percent symbol.
+	 */
+	function getPerMilleSymbol()
+	{
+		return $this->data['NumberElements'][8];
+	}
+
+	/**
+	 * Set the string to use as the per mille symbol.
+	 * @param string percent symbol.
+	 */
+	function setPerMilleSymbol($value)
+	{
+		$this->data['NumberElements'][8] = $value;
+	}
 }
 

framework/I18N/core/MessageSource_XLIFF.php

Indentation +1 added lines, -1 removed lines

@@ -290,7 +290,7 @@
 
 		//find the body element
 		$xpath = new DomXPath($dom);
-    	$body = $xpath->query('//body')->item(0);
+		$body = $xpath->query('//body')->item(0);
 
 		$lastNodes = $xpath->query('//trans-unit[last()]');
 		if(($last=$lastNodes->item(0))!==null) {

framework/I18N/core/util.php

Indentation +104 added lines, -104 removed lines

@@ -21,7 +21,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
@@ -37,120 +37,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;
-        }
+	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
-        );
+		$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;
-        }
+		// 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;
-        }
+		// 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;
-        }
+		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);
-            }
-        }
+		// 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
+		// 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 => 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;
-            }
-        }
+		// $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;
-        }
+		// 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);
-                    }
-                }
-            }
-        }
+		// 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;
-    }
+		return $parsed;
+	}
     
    
 	/**