tweet_live: comparison web/lib/Zend/Ldap/Converter.php

equal deleted inserted replaced

-:5e7a0fedabdf
+:877f952ae2bd
 * obtain it through the world-wide-web, please send an email
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Ldap
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: Converter.php 22996 2010-09-22 17:01:46Z sgehrig $
+* @version    $Id: Converter.php 24593 2012-01-05 20:35:02Z matthew $
 */
 /**
 * Zend_Ldap_Converter is a collection of useful LDAP related conversion functions.
 *
 * @category   Zend
 * @package    Zend_Ldap
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Ldap_Converter
 {
 const STANDARD         = 0;
 {
 $string = preg_replace("/\\\([0-9A-Fa-f]{2})/e", "''.chr(hexdec('\\1')).''", $string);
 return $string;
 }
-	/**
+/**
 * Convert any value to an LDAP-compatible value.
 *
 * By setting the <var>$type</var>-parameter the conversion of a certain
 * type can be forced
 *
 * @todo write more tests
 *
-* @param	mixed 	$value 	The value to convert
+* @param    mixed     $value     The value to convert
-* @param	int   	$ytpe  	The conversion type to use
+* @param    int       $ytpe      The conversion type to use
-* @return	string
+* @return    string
-* @throws	Zend_Ldap_Converter_Exception
+* @throws    Zend_Ldap_Converter_Exception
 */
 public static function toLdap($value, $type = self::STANDARD)
 {
 try {
 switch ($type) {
 *
 * The date-entity <var>$date</var> can be either a timestamp, a
 * DateTime Object, a string that is parseable by strtotime() or a Zend_Date
 * Object.
 *
-* @param	integer|string|DateTimt|Zend_Date		$date	The date-entity
+* @param    integer|string|DateTimt|Zend_Date        $date    The date-entity
-* @param	boolean									$asUtc	Whether to return the LDAP-compatible date-string
+* @param    boolean                                    $asUtc    Whether to return the LDAP-compatible date-string
-*                          								as UTC or as local value
+*                                                          as UTC or as local value
-* @return	string
+* @return    string
-* @throws	InvalidArgumentException
+* @throws    InvalidArgumentException
 */
 public static function toLdapDateTime($date, $asUtc = true)
 {
 if (!($date instanceof DateTime)) {
 if (is_int($date)) {
 *
 * This converts a boolean value of TRUE, an integer-value of 1 and a
 * case-insensitive string 'true' to an LDAP-compatible 'TRUE'. All other
 * other values are converted to an LDAP-compatible 'FALSE'.
 *
-* @param	boolean|integer|string		$value	The boolean value to encode
+* @param    boolean|integer|string        $value    The boolean value to encode
-* @return	string
+* @return    string
 */
 public static function toLdapBoolean($value)
 {
 $return = 'FALSE';
 if (!is_scalar($value)) {
 }
 /**
 * Serialize any value for storage in LDAP
 *
-* @param	mixed		$value	The value to serialize
+* @param    mixed        $value    The value to serialize
-* @return	string
+* @return    string
 */
 public static function toLdapSerialize($value)
 {
 return serialize($value);
 }
 * Convert an LDAP-compatible value to a corresponding PHP-value.
 *
 * By setting the <var>$type</var>-parameter the conversion of a certain
 * type can be forced
 * .
-* @param	string	$value 			The value to convert
+* @param    string    $value             The value to convert
-* @param	int		$ytpe  			The conversion type to use
+* @param    int        $ytpe              The conversion type to use
-* @param	boolean	$dateTimeAsUtc	Return DateTime values in UTC timezone
+* @param    boolean    $dateTimeAsUtc    Return DateTime values in UTC timezone
-* @return	mixed
+* @return    mixed
-* @throws	Zend_Ldap_Converter_Exception
+* @throws    Zend_Ldap_Converter_Exception
 */
 public static function fromLdap($value, $type = self::STANDARD, $dateTimeAsUtc = true)
 {
 switch ($type) {
 case self::BOOLEAN:
 case self::GENERALIZED_TIME:
 return self::fromLdapDateTime($value);
 break;
 default:
 if (is_numeric($value)) {
-return (float)$value;
+// prevent numeric values to be treated as date/time
+return $value;
 } else if ('TRUE' === $value || 'FALSE' === $value) {
 return self::fromLdapBoolean($value);
 }
 if (preg_match('/^\d{4}[\d\+\-Z\.]*$/', $value)) {
 return self::fromLdapDateTime($value, $dateTimeAsUtc);
 /**
 * Convert an LDAP-Generalized-Time-entry into a DateTime-Object
 *
 * CAVEAT: The DateTime-Object returned will alwasy be set to UTC-Timezone.
 *
-* @param	string		$date	The generalized-Time
+* @param    string        $date    The generalized-Time
-* @param	boolean		$asUtc	Return the DateTime with UTC timezone
+* @param    boolean        $asUtc    Return the DateTime with UTC timezone
-* @return	DateTime
+* @return    DateTime
-* @throws	InvalidArgumentException if a non-parseable-format is given
+* @throws    InvalidArgumentException if a non-parseable-format is given
 */
 public static function fromLdapDateTime($date, $asUtc = true)
 {
 $datepart = array ();
 if (!preg_match('/^(\d{4})/', $date, $datepart) ) {
 'hour'   => 0,
 'minute' => 0,
 'second' => 0,
 'offdir' => '+',
 'offsethours' => 0,
-			'offsetminutes' => 0
+'offsetminutes' => 0
 );
 $length = strlen($date);
 // Check for month.
 }
 /**
 * Convert an LDAP-compatible boolean value into a PHP-compatible one
 *
-* @param	string		$value		The value to convert
+* @param    string        $value        The value to convert
-* @return	boolean
+* @return    boolean
-* @throws	InvalidArgumentException
+* @throws    InvalidArgumentException
 */
 public static function fromLdapBoolean($value)
 {
 if ( 'TRUE' === $value ) {
 return true;
 }
 /**
 * Unserialize a serialized value to return the corresponding object
 *
-* @param	string		$value	The value to convert
+* @param    string        $value    The value to convert
-* @return	mixed
+* @return    mixed
-* @throws	UnexpectedValueException
+* @throws    UnexpectedValueException
 */
 public static function fromLdapUnserialize($value)
 {
 $v = @unserialize($value);
 if (false===$v && $value != 'b:0;') {

changeset 807	877f952ae2bd
parent 207	621fa6caec0c
child 1230	68c69c656a2c