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/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/TCache_Lite.php

Switch Indentation +9 added lines, -9 removed lines

@@ -611,15 +611,15 @@
     function _hash($data, $controlType)
     {
         switch ($controlType) {
-        case 'md5':
-            return md5($data);
-        case 'crc32':
-            return sprintf('% 32d', crc32($data));
-        case 'strlen':
-            return sprintf('% 32d', strlen($data));
-        default:
-            $this->raiseError('Unknown controlType ! '.
-            '(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
+        	case 'md5':
+            	return md5($data);
+        	case 'crc32':
+            	return sprintf('% 32d', crc32($data));
+        	case 'strlen':
+            	return sprintf('% 32d', strlen($data));
+        	default:
+            	$this->raiseError('Unknown controlType ! '.
+            	'(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
         }
     }
 

Indentation +567 added lines, -567 removed lines

@@ -46,575 +46,575 @@
 class TCache_Lite
 {
 
-    // --- Private properties ---
-
-    /**
-    * Directory where to put the cache files
-    * (make sure to add a trailing slash)
-    *
-    * @var string $_cacheDir
-    */
-    protected $_cacheDir = '/tmp/';
-
-    /**
-    * Enable / disable caching
-    *
-    * (can be very usefull for the debug of cached scripts)
-    *
-    * @var boolean $_caching
-    */
-    protected $_caching = true;
-
-    /**
-    * Cache lifetime (in seconds)
-    *
-    * @var int $_lifeTime
-    */
-    protected $_lifeTime = 3600;
-
-    /**
-    * Enable / disable fileLocking
-    *
-    * (can avoid cache corruption under bad circumstances)
-    *
-    * @var boolean $_fileLocking
-    */
-    protected $_fileLocking = true;
-
-    /**
-    * Timestamp of the last valid cache
-    *
-    * @var int $_refreshTime
-    */
-    protected $_refreshTime;
-
-    /**
-    * File name (with path)
-    *
-    * @var string $_file
-    */
-    protected $_file;
-
-    /**
-    * Enable / disable write control (the cache is read just after writing
-    * to detect corrupt entries)
-    *
-    * Enable write control will lightly slow the cache writing but not the
-    * cache reading. Write control can detect some corrupt cache files but
-    * maybe it's not a perfect control
-    *
-    * @var boolean $_writeControl
-    */
-    protected $_writeControl = true;
-
-    /**
-    * Enable / disable read control
-    *
-    * If enabled, a control key is embeded in cache file and this key is
-    * compared with the one calculated after the reading.
-    *
-    * @var boolean $_writeControl
-    */
-    protected $_readControl = true;
-
-    /**
-    * Type of read control (only if read control is enabled)
-    *
-    * Available values are :
-    * 'md5' for a md5 hash control (best but slowest)
-    * 'crc32' for a crc32 hash control (lightly less safe but faster,
-    * better choice)
-    * 'strlen' for a length only test (fastest)
-    *
-    * @var boolean $_readControlType
-    */
-    protected $_readControlType = 'crc32';
-
-    /**
-    * Current cache id
-    *
-    * @var string $_id
-    */
-    protected $_id;
-
-    /**
-    * Current cache group
-    *
-    * @var string $_group
-    */
-    protected $_group;
-
-    /**
-    * Enable / Disable "Memory Caching"
-    *
-    * NB : There is no lifetime for memory caching !
-    *
-    * @var boolean $_memoryCaching
-    */
-    protected $_memoryCaching = false;
-
-    /**
-    * Enable / Disable "Only Memory Caching"
-    * (be carefull, memory caching is "beta quality")
-    *
-    * @var boolean $_onlyMemoryCaching
-    */
-    protected $_onlyMemoryCaching = false;
-
-    /**
-    * Memory caching array
-    *
-    * @var array $_memoryCachingArray
-    */
-    protected $_memoryCachingArray = array();
-
-    /**
-    * Memory caching counter
-    *
-    * @var int $memoryCachingCounter
-    */
-    protected $_memoryCachingCounter = 0;
-
-    /**
-    * Memory caching limit
-    *
-    * @var int $memoryCachingLimit
-    */
-    protected $_memoryCachingLimit = 1000;
-
-    /**
-    * File Name protection
-    *
-    * if set to true, you can use any cache id or group name
-    * if set to false, it can be faster but cache ids and group names
-    * will be used directly in cache file names so be carefull with
-    * special characters...
-    *
-    * @var boolean $fileNameProtection
-    */
-    protected $_fileNameProtection = true;
-
-    /**
-    * Enable / disable automatic serialization
-    *
-    * it can be used to save directly datas which aren't strings
-    * (but it's slower)
-    *
-    * @var boolean $_serialize
-    */
-    protected $_automaticSerialization = false;
-
-    // --- Public methods ---
-
-    /**
-    * Constructor
-    *
-    * $options is an assoc. Available options are :
-    * $options = array(
-    * 'cacheDir' => directory where to put the cache files (string),
-    * 'caching' => enable / disable caching (boolean),
-    * 'lifeTime' => cache lifetime in seconds (int),
-    * 'fileLocking' => enable / disable fileLocking (boolean),
-    * 'writeControl' => enable / disable write control (boolean),
-    * 'readControl' => enable / disable read control (boolean),
-    * 'readControlType' => type of read control 'crc32', 'md5', 'strlen',
-    * 'memoryCaching' => enable / disable memory caching (boolean),
-    * 'onlyMemoryCaching' => enable / disable only memory caching (boolean),
-    * 'memoryCachingLimit' => max nbr of records in memory caching (int),
-    * 'fileNameProtection' => enable / disable file name protection (boolean),
-    * 'automaticSerialization' => enable / disable serialization (boolean)
-    * );
-    *
-    * @param array $options options
-    * @access public
-    */
-    function __construct($options = array(null))
-    {
-        $availableOptions = array(	'automaticSerialization',
-        							'fileNameProtection',
-        							'memoryCaching',
-        							'onlyMemoryCaching',
-        							'memoryCachingLimit',
-        							'cacheDir',
-        							'caching',
-        							'lifeTime',
-        							'fileLocking',
-        							'writeControl',
-        							'readControl',
-        							'readControlType');
-        foreach($options as $key => $value) {
-            if(in_array($key, $availableOptions)) {
-                $property = '_'.$key;
-                $this->$property = $value;
-            }
-        }
-        $this->_refreshTime = time() - $this->_lifeTime;
+	// --- Private properties ---
+
+	/**
+	 * Directory where to put the cache files
+	 * (make sure to add a trailing slash)
+	 *
+	 * @var string $_cacheDir
+	 */
+	protected $_cacheDir = '/tmp/';
+
+	/**
+	 * Enable / disable caching
+	 *
+	 * (can be very usefull for the debug of cached scripts)
+	 *
+	 * @var boolean $_caching
+	 */
+	protected $_caching = true;
+
+	/**
+	 * Cache lifetime (in seconds)
+	 *
+	 * @var int $_lifeTime
+	 */
+	protected $_lifeTime = 3600;
+
+	/**
+	 * Enable / disable fileLocking
+	 *
+	 * (can avoid cache corruption under bad circumstances)
+	 *
+	 * @var boolean $_fileLocking
+	 */
+	protected $_fileLocking = true;
+
+	/**
+	 * Timestamp of the last valid cache
+	 *
+	 * @var int $_refreshTime
+	 */
+	protected $_refreshTime;
+
+	/**
+	 * File name (with path)
+	 *
+	 * @var string $_file
+	 */
+	protected $_file;
+
+	/**
+	 * Enable / disable write control (the cache is read just after writing
+	 * to detect corrupt entries)
+	 *
+	 * Enable write control will lightly slow the cache writing but not the
+	 * cache reading. Write control can detect some corrupt cache files but
+	 * maybe it's not a perfect control
+	 *
+	 * @var boolean $_writeControl
+	 */
+	protected $_writeControl = true;
+
+	/**
+	 * Enable / disable read control
+	 *
+	 * If enabled, a control key is embeded in cache file and this key is
+	 * compared with the one calculated after the reading.
+	 *
+	 * @var boolean $_writeControl
+	 */
+	protected $_readControl = true;
+
+	/**
+	 * Type of read control (only if read control is enabled)
+	 *
+	 * Available values are :
+	 * 'md5' for a md5 hash control (best but slowest)
+	 * 'crc32' for a crc32 hash control (lightly less safe but faster,
+	 * better choice)
+	 * 'strlen' for a length only test (fastest)
+	 *
+	 * @var boolean $_readControlType
+	 */
+	protected $_readControlType = 'crc32';
+
+	/**
+	 * Current cache id
+	 *
+	 * @var string $_id
+	 */
+	protected $_id;
+
+	/**
+	 * Current cache group
+	 *
+	 * @var string $_group
+	 */
+	protected $_group;
+
+	/**
+	 * Enable / Disable "Memory Caching"
+	 *
+	 * NB : There is no lifetime for memory caching !
+	 *
+	 * @var boolean $_memoryCaching
+	 */
+	protected $_memoryCaching = false;
+
+	/**
+	 * Enable / Disable "Only Memory Caching"
+	 * (be carefull, memory caching is "beta quality")
+	 *
+	 * @var boolean $_onlyMemoryCaching
+	 */
+	protected $_onlyMemoryCaching = false;
+
+	/**
+	 * Memory caching array
+	 *
+	 * @var array $_memoryCachingArray
+	 */
+	protected $_memoryCachingArray = array();
+
+	/**
+	 * Memory caching counter
+	 *
+	 * @var int $memoryCachingCounter
+	 */
+	protected $_memoryCachingCounter = 0;
+
+	/**
+	 * Memory caching limit
+	 *
+	 * @var int $memoryCachingLimit
+	 */
+	protected $_memoryCachingLimit = 1000;
+
+	/**
+	 * File Name protection
+	 *
+	 * if set to true, you can use any cache id or group name
+	 * if set to false, it can be faster but cache ids and group names
+	 * will be used directly in cache file names so be carefull with
+	 * special characters...
+	 *
+	 * @var boolean $fileNameProtection
+	 */
+	protected $_fileNameProtection = true;
+
+	/**
+	 * Enable / disable automatic serialization
+	 *
+	 * it can be used to save directly datas which aren't strings
+	 * (but it's slower)
+	 *
+	 * @var boolean $_serialize
+	 */
+	protected $_automaticSerialization = false;
+
+	// --- Public methods ---
+
+	/**
+	 * Constructor
+	 *
+	 * $options is an assoc. Available options are :
+	 * $options = array(
+	 * 'cacheDir' => directory where to put the cache files (string),
+	 * 'caching' => enable / disable caching (boolean),
+	 * 'lifeTime' => cache lifetime in seconds (int),
+	 * 'fileLocking' => enable / disable fileLocking (boolean),
+	 * 'writeControl' => enable / disable write control (boolean),
+	 * 'readControl' => enable / disable read control (boolean),
+	 * 'readControlType' => type of read control 'crc32', 'md5', 'strlen',
+	 * 'memoryCaching' => enable / disable memory caching (boolean),
+	 * 'onlyMemoryCaching' => enable / disable only memory caching (boolean),
+	 * 'memoryCachingLimit' => max nbr of records in memory caching (int),
+	 * 'fileNameProtection' => enable / disable file name protection (boolean),
+	 * 'automaticSerialization' => enable / disable serialization (boolean)
+	 * );
+	 *
+	 * @param array $options options
+	 * @access public
+	 */
+	function __construct($options = array(null))
+	{
+		$availableOptions = array(	'automaticSerialization',
+									'fileNameProtection',
+									'memoryCaching',
+									'onlyMemoryCaching',
+									'memoryCachingLimit',
+									'cacheDir',
+									'caching',
+									'lifeTime',
+									'fileLocking',
+									'writeControl',
+									'readControl',
+									'readControlType');
+		foreach($options as $key => $value) {
+			if(in_array($key, $availableOptions)) {
+				$property = '_'.$key;
+				$this->$property = $value;
+			}
+		}
+		$this->_refreshTime = time() - $this->_lifeTime;
 	}
 
-    /**
-    * Test if a cache is available and (if yes) return it
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @param boolean $doNotTestCacheValidity if set to true, the cache
-    * validity won't be tested
-    * @return string data of the cache (or false if no cache available)
-    * @access public
-    */
-    function get($id, $group = 'default', $doNotTestCacheValidity = false)
-    {
-        $this->_id = $id;
-        $this->_group = $group;
-        $data = false;
-        if ($this->_caching) {
-            $this->_setFileName($id, $group);
-            if ($this->_memoryCaching) {
-                if (isset($this->_memoryCachingArray[$this->_file])) {
-                    if ($this->_automaticSerialization) {
-                        return unserialize(
-                        			$this->_memoryCachingArray[$this->_file]);
-                    } else {
-                        return $this->_memoryCachingArray[$this->_file];
-                    }
-                } else {
-                    if ($this->_onlyMemoryCaching) {
-                        return false;
-                    }
-                }
-            }
-            if ($doNotTestCacheValidity) {
-                if (file_exists($this->_file)) {
-                    $data = $this->_read();
-                }
-            } else {
-                if (@filemtime($this->_file) > $this->_refreshTime) {
-                    $data = $this->_read();
-                }
-            }
-            if (($data) and ($this->_memoryCaching)) {
-                $this->_memoryCacheAdd($this->_file, $data);
-            }
-            if ($this->_automaticSerialization && is_string($data)) {
-                $data = unserialize($data);
-            }
-            return $data;
-        }
-        return false;
-    }
-
-    /**
-    * Save some data in a cache file
-    *
-    * @param string $data data to put in cache (can be another type than strings
-    * if automaticSerialization is on)
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @return boolean true if no problem
-    * @access public
-    */
-    function save($data, $id = null, $group = 'default')
-    {
-        if ($this->_caching) {
-            if ($this->_automaticSerialization) {
-                $data = serialize($data);
-            }
-            if (isset($id)) {
-                $this->_setFileName($id, $group);
-            }
-            if ($this->_memoryCaching) {
-                $this->_memoryCacheAdd($this->_file, $data);
-                if ($this->_onlyMemoryCaching) {
-                    return true;
-                }
-            }
-            if ($this->_writeControl) {
-                if (!$this->_writeAndControl($data)) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
-                    return false;
-                } else {
-                    return true;
-                }
-            } else {
-                return $this->_write($data);
-            }
-        }
-        return false;
-    }
-
-    /**
-    * Remove a cache file
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @return boolean true if no problem
-    * @access public
-    */
-    function remove($id, $group = 'default')
-    {
-        $this->_setFileName($id, $group);
-        if (!@unlink($this->_file)) {
-            $this->raiseError('TCache_Lite : Unable to remove cache !', -3);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-    * Clean the cache
-    *
-    * if no group is specified all cache files will be destroyed
-    * else only cache files of the specified group will be destroyed
-    *
-    * @param string $group name of the cache group
-    * @return boolean true if no problem
-    * @access public
-    */
-    function clean($group = false)
-    {
-        if ($this->_fileNameProtection) {
-            $motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_';
-        } else {
-            $motif = ($group) ? 'cache_'.$group.'_' : 'cache_';
-        }
-        if ($this->_memoryCaching) {
-            while (list($key, $value) = each($this->_memoryCaching)) {
-                if (strpos($key, $motif, 0)) {
-                    unset($this->_memoryCaching[$key]);
-                    $this->_memoryCachingCounter =
-                    		$this->_memoryCachingCounter - 1;
-                }
-            }
-            if ($this->_onlyMemoryCaching) {
-                return true;
-            }
-        }
-        if (!($dh = opendir($this->_cacheDir))) {
-            $this->raiseError('TCache_Lite : Unable to open cache directory !');
-            return false;
-        }
-        while ($file = readdir($dh)) {
-            if (($file != '.') && ($file != '..')) {
-                $file = $this->_cacheDir . $file;
-                if (is_file($file)) {
-                    if (strpos($file, $motif, 0)) {
-                        if (!@unlink($file)) {
-             $this->raiseError('Cache_Lite : Unable to remove cache !', -3);
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-	    /**
-    * Set a new life time
-    *
-    * @param int $newLifeTime new life time (in seconds)
-    * @access public
-    */
-    function setLifeTime($newLifeTime)
-    {
-        $this->_lifeTime = $newLifeTime;
-        $this->_refreshTime = time() - $newLifeTime;
-    }
-
-    /**
-    *
-    * @access public
-    */
-    function saveMemoryCachingState($id, $group = 'default')
-    {
-        if ($this->_caching) {
-            $array = array(
-                'counter' => $this->_memoryCachingCounter,
-                'array' => $this->_memoryCachingState
-            );
-            $data = serialize($array);
-            $this->save($data, $id, $group);
-        }
-    }
-
-    /**
-    *
-    * @access public
-    */
-    function getMemoryCachingState($id, $group = 'default',
-    								$doNotTestCacheValidity = false)
-    {
-        if ($this->_caching) {
-            if ($data = $this->get($id, $group, $doNotTestCacheValidity))
-            {
-                $array = unserialize($data);
-                $this->_memoryCachingCounter = $array['counter'];
-                $this->_memoryCachingArray = $array['array'];
-            }
-        }
-    }
-
-    /**
-    * Return the cache last modification time
-    *
-    * BE CAREFUL : THIS METHOD IS FOR HACKING ONLY !
-    *
-    * @return int last modification time
-    */
-    function lastModified() {
-        return filemtime($this->cache->_file);
-    }
-
-    /**
-    * Trigger a PEAR error
-    *
-    * To improve performances, the PEAR.php file is included dynamically.
-    * The file is so included only when an error is triggered. So, in most
-    * cases, the file isn't included and perfs are much better.
-    *
-    * @param string $msg error message
-    * @param int $code error code
-    * @access public
-    */
-    function raiseError($msg, $code)
-    {
-       throw new Exception($msg);
-    }
-
-    // --- Private methods ---
-
-    /**
-    *
-    * @access private
-    */
-    function _memoryCacheAdd($id, $data)
-    {
-        $this->_memoryCachingArray[$this->_file] = $data;
-        if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
-            list($key, $value) = each($this->_memoryCachingArray);
-            unset($this->_memoryCachingArray[$key]);
-        } else {
-            $this->_memoryCachingCounter = $this->_memoryCachingCounter + 1;
-        }
-    }
-
-    /**
-    * Make a file name (with path)
-    *
-    * @param string $id cache id
-    * @param string $group name of the group
-    * @access private
-    */
-    function _setFileName($id, $group)
-    {
-        if ($this->_fileNameProtection) {
-            $this->_file = ($this->_cacheDir.'cache_'.md5($group).'_'
-            						.md5($id));
-        } else {
-            $this->_file = $this->_cacheDir.'cache_'.$group.'_'.$id;
-        }
-    }
-
-    function getCacheFile()
-    {
-    	return $this->_file;
-    }
-
-    /**
-    * Read the cache file and return the content
-    *
-    * @return string content of the cache file
-    * @access private
-    */
-    function _read()
-    {
-        $fp = @fopen($this->_file, "rb");
-        if ($this->_fileLocking) @flock($fp, LOCK_SH);
-        if ($fp) {
-        	// because the filesize can be cached by PHP itself...
-            clearstatcache();
-            $length = @filesize($this->_file);
-            if ($this->_readControl) {
-                $hashControl = @fread($fp, 32);
-                $length = $length - 32;
-            }
-            $data = @fread($fp, $length);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
-            @fclose($fp);
-            if ($this->_readControl) {
-                $hashData = $this->_hash($data, $this->_readControlType);
-                if ($hashData != $hashControl) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
-                    return false;
-                }
-            }
-            return $data;
-        }
-        $this->raiseError('Cache_Lite : Unable to read cache !', -2);
-        return false;
-    }
-
-    /**
-    * Write the given data in the cache file
-    *
-    * @param string $data data to put in cache
-    * @return boolean true if ok
-    * @access private
-    */
-    function _write($data)
-    {
-        $fp = @fopen($this->_file, "wb");
-        if ($fp) {
-            if ($this->_fileLocking) @flock($fp, LOCK_EX);
-            if ($this->_readControl) {
-                @fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
-            }
-            $len = strlen($data);
-            @fwrite($fp, $data, $len);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
-            @fclose($fp);
-            return true;
-        }
-        $this->raiseError('Cache_Lite : Unable to write cache !', -1);
-        return false;
-    }
-
-    /**
-    * Write the given data in the cache file and control it just after to avoid
-    * corrupted cache entries
-    *
-    * @param string $data data to put in cache
-    * @return boolean true if the test is ok
-    * @access private
-    */
-    function _writeAndControl($data)
-    {
-        $this->_write($data);
-        $dataRead = $this->_read($data);
-        return ($dataRead==$data);
-    }
-
-    /**
-    * Make a control key with the string containing datas
-    *
-    * @param string $data data
-    * @param string $controlType type of control 'md5', 'crc32' or 'strlen'
-    * @return string control key
-    * @access private
-    */
-    function _hash($data, $controlType)
-    {
-        switch ($controlType) {
-        case 'md5':
-            return md5($data);
-        case 'crc32':
-            return sprintf('% 32d', crc32($data));
-        case 'strlen':
-            return sprintf('% 32d', strlen($data));
-        default:
-            $this->raiseError('Unknown controlType ! '.
-            '(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
-        }
-    }
+	/**
+	 * Test if a cache is available and (if yes) return it
+	 *
+	 * @param string $id cache id
+	 * @param string $group name of the cache group
+	 * @param boolean $doNotTestCacheValidity if set to true, the cache
+	 * validity won't be tested
+	 * @return string data of the cache (or false if no cache available)
+	 * @access public
+	 */
+	function get($id, $group = 'default', $doNotTestCacheValidity = false)
+	{
+		$this->_id = $id;
+		$this->_group = $group;
+		$data = false;
+		if ($this->_caching) {
+			$this->_setFileName($id, $group);
+			if ($this->_memoryCaching) {
+				if (isset($this->_memoryCachingArray[$this->_file])) {
+					if ($this->_automaticSerialization) {
+						return unserialize(
+									$this->_memoryCachingArray[$this->_file]);
+					} else {
+						return $this->_memoryCachingArray[$this->_file];
+					}
+				} else {
+					if ($this->_onlyMemoryCaching) {
+						return false;
+					}
+				}
+			}
+			if ($doNotTestCacheValidity) {
+				if (file_exists($this->_file)) {
+					$data = $this->_read();
+				}
+			} else {
+				if (@filemtime($this->_file) > $this->_refreshTime) {
+					$data = $this->_read();
+				}
+			}
+			if (($data) and ($this->_memoryCaching)) {
+				$this->_memoryCacheAdd($this->_file, $data);
+			}
+			if ($this->_automaticSerialization && is_string($data)) {
+				$data = unserialize($data);
+			}
+			return $data;
+		}
+		return false;
+	}
+
+	/**
+	 * Save some data in a cache file
+	 *
+	 * @param string $data data to put in cache (can be another type than strings
+	 * if automaticSerialization is on)
+	 * @param string $id cache id
+	 * @param string $group name of the cache group
+	 * @return boolean true if no problem
+	 * @access public
+	 */
+	function save($data, $id = null, $group = 'default')
+	{
+		if ($this->_caching) {
+			if ($this->_automaticSerialization) {
+				$data = serialize($data);
+			}
+			if (isset($id)) {
+				$this->_setFileName($id, $group);
+			}
+			if ($this->_memoryCaching) {
+				$this->_memoryCacheAdd($this->_file, $data);
+				if ($this->_onlyMemoryCaching) {
+					return true;
+				}
+			}
+			if ($this->_writeControl) {
+				if (!$this->_writeAndControl($data)) {
+					@touch($this->_file, time() - 2*abs($this->_lifeTime));
+					return false;
+				} else {
+					return true;
+				}
+			} else {
+				return $this->_write($data);
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Remove a cache file
+	 *
+	 * @param string $id cache id
+	 * @param string $group name of the cache group
+	 * @return boolean true if no problem
+	 * @access public
+	 */
+	function remove($id, $group = 'default')
+	{
+		$this->_setFileName($id, $group);
+		if (!@unlink($this->_file)) {
+			$this->raiseError('TCache_Lite : Unable to remove cache !', -3);
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Clean the cache
+	 *
+	 * if no group is specified all cache files will be destroyed
+	 * else only cache files of the specified group will be destroyed
+	 *
+	 * @param string $group name of the cache group
+	 * @return boolean true if no problem
+	 * @access public
+	 */
+	function clean($group = false)
+	{
+		if ($this->_fileNameProtection) {
+			$motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_';
+		} else {
+			$motif = ($group) ? 'cache_'.$group.'_' : 'cache_';
+		}
+		if ($this->_memoryCaching) {
+			while (list($key, $value) = each($this->_memoryCaching)) {
+				if (strpos($key, $motif, 0)) {
+					unset($this->_memoryCaching[$key]);
+					$this->_memoryCachingCounter =
+							$this->_memoryCachingCounter - 1;
+				}
+			}
+			if ($this->_onlyMemoryCaching) {
+				return true;
+			}
+		}
+		if (!($dh = opendir($this->_cacheDir))) {
+			$this->raiseError('TCache_Lite : Unable to open cache directory !');
+			return false;
+		}
+		while ($file = readdir($dh)) {
+			if (($file != '.') && ($file != '..')) {
+				$file = $this->_cacheDir . $file;
+				if (is_file($file)) {
+					if (strpos($file, $motif, 0)) {
+						if (!@unlink($file)) {
+			 $this->raiseError('Cache_Lite : Unable to remove cache !', -3);
+							return false;
+						}
+					}
+				}
+			}
+		}
+		return true;
+	}
+
+		/**
+		 * Set a new life time
+		 *
+		 * @param int $newLifeTime new life time (in seconds)
+		 * @access public
+		 */
+	function setLifeTime($newLifeTime)
+	{
+		$this->_lifeTime = $newLifeTime;
+		$this->_refreshTime = time() - $newLifeTime;
+	}
+
+	/**
+	 *
+	 * @access public
+	 */
+	function saveMemoryCachingState($id, $group = 'default')
+	{
+		if ($this->_caching) {
+			$array = array(
+				'counter' => $this->_memoryCachingCounter,
+				'array' => $this->_memoryCachingState
+			);
+			$data = serialize($array);
+			$this->save($data, $id, $group);
+		}
+	}
+
+	/**
+	 *
+	 * @access public
+	 */
+	function getMemoryCachingState($id, $group = 'default',
+									$doNotTestCacheValidity = false)
+	{
+		if ($this->_caching) {
+			if ($data = $this->get($id, $group, $doNotTestCacheValidity))
+			{
+				$array = unserialize($data);
+				$this->_memoryCachingCounter = $array['counter'];
+				$this->_memoryCachingArray = $array['array'];
+			}
+		}
+	}
+
+	/**
+	 * Return the cache last modification time
+	 *
+	 * BE CAREFUL : THIS METHOD IS FOR HACKING ONLY !
+	 *
+	 * @return int last modification time
+	 */
+	function lastModified() {
+		return filemtime($this->cache->_file);
+	}
+
+	/**
+	 * Trigger a PEAR error
+	 *
+	 * To improve performances, the PEAR.php file is included dynamically.
+	 * The file is so included only when an error is triggered. So, in most
+	 * cases, the file isn't included and perfs are much better.
+	 *
+	 * @param string $msg error message
+	 * @param int $code error code
+	 * @access public
+	 */
+	function raiseError($msg, $code)
+	{
+	   throw new Exception($msg);
+	}
+
+	// --- Private methods ---
+
+	/**
+	 *
+	 * @access private
+	 */
+	function _memoryCacheAdd($id, $data)
+	{
+		$this->_memoryCachingArray[$this->_file] = $data;
+		if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
+			list($key, $value) = each($this->_memoryCachingArray);
+			unset($this->_memoryCachingArray[$key]);
+		} else {
+			$this->_memoryCachingCounter = $this->_memoryCachingCounter + 1;
+		}
+	}
+
+	/**
+	 * Make a file name (with path)
+	 *
+	 * @param string $id cache id
+	 * @param string $group name of the group
+	 * @access private
+	 */
+	function _setFileName($id, $group)
+	{
+		if ($this->_fileNameProtection) {
+			$this->_file = ($this->_cacheDir.'cache_'.md5($group).'_'
+									.md5($id));
+		} else {
+			$this->_file = $this->_cacheDir.'cache_'.$group.'_'.$id;
+		}
+	}
+
+	function getCacheFile()
+	{
+		return $this->_file;
+	}
+
+	/**
+	 * Read the cache file and return the content
+	 *
+	 * @return string content of the cache file
+	 * @access private
+	 */
+	function _read()
+	{
+		$fp = @fopen($this->_file, "rb");
+		if ($this->_fileLocking) @flock($fp, LOCK_SH);
+		if ($fp) {
+			// because the filesize can be cached by PHP itself...
+			clearstatcache();
+			$length = @filesize($this->_file);
+			if ($this->_readControl) {
+				$hashControl = @fread($fp, 32);
+				$length = $length - 32;
+			}
+			$data = @fread($fp, $length);
+			if ($this->_fileLocking) @flock($fp, LOCK_UN);
+			@fclose($fp);
+			if ($this->_readControl) {
+				$hashData = $this->_hash($data, $this->_readControlType);
+				if ($hashData != $hashControl) {
+					@touch($this->_file, time() - 2*abs($this->_lifeTime));
+					return false;
+				}
+			}
+			return $data;
+		}
+		$this->raiseError('Cache_Lite : Unable to read cache !', -2);
+		return false;
+	}
+
+	/**
+	 * Write the given data in the cache file
+	 *
+	 * @param string $data data to put in cache
+	 * @return boolean true if ok
+	 * @access private
+	 */
+	function _write($data)
+	{
+		$fp = @fopen($this->_file, "wb");
+		if ($fp) {
+			if ($this->_fileLocking) @flock($fp, LOCK_EX);
+			if ($this->_readControl) {
+				@fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
+			}
+			$len = strlen($data);
+			@fwrite($fp, $data, $len);
+			if ($this->_fileLocking) @flock($fp, LOCK_UN);
+			@fclose($fp);
+			return true;
+		}
+		$this->raiseError('Cache_Lite : Unable to write cache !', -1);
+		return false;
+	}
+
+	/**
+	 * Write the given data in the cache file and control it just after to avoid
+	 * corrupted cache entries
+	 *
+	 * @param string $data data to put in cache
+	 * @return boolean true if the test is ok
+	 * @access private
+	 */
+	function _writeAndControl($data)
+	{
+		$this->_write($data);
+		$dataRead = $this->_read($data);
+		return ($dataRead==$data);
+	}
+
+	/**
+	 * Make a control key with the string containing datas
+	 *
+	 * @param string $data data
+	 * @param string $controlType type of control 'md5', 'crc32' or 'strlen'
+	 * @return string control key
+	 * @access private
+	 */
+	function _hash($data, $controlType)
+	{
+		switch ($controlType) {
+		case 'md5':
+			return md5($data);
+		case 'crc32':
+			return sprintf('% 32d', crc32($data));
+		case 'strlen':
+			return sprintf('% 32d', strlen($data));
+		default:
+			$this->raiseError('Unknown controlType ! '.
+			'(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
+		}
+	}
 
 }
 

framework/I18N/core/HTTPNegotiator.php

Indentation +14 added lines, -14 removed lines

@@ -58,7 +58,7 @@ 
 		$this->languages = array();
 
 		if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
-            return $this->languages;
+			return $this->languages;
 
 		//$basedir = CultureInfo::dataDir();
 		//$ext = CultureInfo::fileExt();
@@ -66,18 +66,18 @@ 
 
 		foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $lang)
 		{
-            // Cut off any q-value that might come after a semi-colon
-            if ($pos = strpos($lang, ';'))
-                $lang = trim(substr($lang, 0, $pos));
+			// Cut off any q-value that might come after a semi-colon
+			if ($pos = strpos($lang, ';'))
+				$lang = trim(substr($lang, 0, $pos));
 
 			if (strstr($lang, '-'))
 			{
 				$codes = explode('-',$lang);
 				if($codes[0] == 'i')
 				{
-                    // Language not listed in ISO 639 that are not variants
-                    // of any listed language, which can be registerd with the
-                    // i-prefix, such as i-cherokee
+					// Language not listed in ISO 639 that are not variants
+					// of any listed language, which can be registerd with the
+					// i-prefix, such as i-cherokee
 					if(count($codes)>1)
 						$lang = $codes[1];
 				}
@@ -91,13 +91,13 @@ 
 							$lang .= '_'.strtoupper($codes[$i]);
 					}
 				}
-            }
+			}
 
 
 
 			if($info->validCulture($lang))
 				$this->languages[] = $lang;
-        }
+		}
 
 		return $this->languages;
 	}
@@ -108,20 +108,20 @@ 
 	 */
 	function getCharsets()
 	{
-        if($this->charsets !== null) {
+		if($this->charsets !== null) {
 			return $this->charsets;
 		}
 
 		$this->charsets = array();
 
 		if (!isset($_SERVER['HTTP_ACCEPT_CHARSET']))
-            return $this->charsets;
+			return $this->charsets;
 
 		foreach (explode(',', $_SERVER['HTTP_ACCEPT_CHARSET']) as $charset)
 		{
-            if (!empty($charset))
-                $this->charsets[] = preg_replace('/;.*/', '', $charset);
-        }
+			if (!empty($charset))
+				$this->charsets[] = preg_replace('/;.*/', '', $charset);
+		}
 
 		return $this->charsets;
 	}

framework/I18N/core/CultureInfo.php

Indentation +3 added lines, -3 removed lines

@@ -199,9 +199,9 @@
 	}
 
 	/**
-	* Gets the CultureInfo that for this culture string
-	* @return CultureInfo invariant culture info is "en".
-	*/
+	 * Gets the CultureInfo that for this culture string
+	 * @return CultureInfo invariant culture info is "en".
+	 */
 	public static function getInstance($culture)
 	{
 		static $instances = array();