[22868] standard/branches/user/zf-ldap-dev: added Zend_Ldap_Converter subcomponent provided by Andreas Heigl

sgehrig

2010-08-21 13:26:42 UTC

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22868] standard/branches/user/zf-ldap-dev: added Zend_Ldap_Converter subcomponent provided by Andreas Heigl</title>
</head>
<body>

<style type="text/css"></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22868</dd>
<dt>Author</dt> <dd>sgehrig</dd>
<dt>Date</dt> <dd>2010-08-21 06:26:42 -0700 (Sat, 21 Aug 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>added Zend_Ldap_Converter subcomponent provided by Andreas Heigl
adjusted to fit coding-guidelines and coding-style
modified to be usabale as a replacement for the conversion methods of Zend_Ldap_Attribute in a backwards-compatible way

NOTICE: This revision is not passing all unit tests introducing a backwards-compatibility breakage. Not to be used!</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#standardbranchesuserzfldapdevlibraryZendLdapAttributephp">standard/branches/user/zf-ldap-dev/library/Zend/Ldap/Attribute.php</a></li>
<li><a href="#standardbranchesuserzfldapdevlibraryZendLdapConverterphp">standard/branches/user/zf-ldap-dev/library/Zend/Ldap/Converter.php</a></li>
<li><a href="#standardbranchesuserzfldapdevtestsZendLdapConverterTestphp">standard/branches/user/zf-ldap-dev/tests/Zend/Ldap/ConverterTest.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>standard/branches/user/zf-ldap-dev/library/Zend/Ldap/Converter/</li>
<li><a href="#standardbranchesuserzfldapdevlibraryZendLdapConverterExceptionphp">standard/branches/user/zf-ldap-dev/library/Zend/Ldap/Converter/Exception.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardbranchesuserzfldapdevlibraryZendLdapAttributephp"></a>
<div class="modfile"><h4>Modified: standard/branches/user/zf-ldap-dev/library/Zend/Ldap/Attribute.php (22867 => 22868)</h4>
<pre class="diff">
--- standard/branches/user/zf-ldap-dev/library/Zend/Ldap/Attribute.php 2010-08-21 13:23:27 UTC (rev 22867)
+++ standard/branches/user/zf-ldap-dev/library/Zend/Ldap/Attribute.php 2010-08-21 13:26:42 UTC (rev 22868)
@@ -20,6 +20,11 @@
 */

 /**
<ins>+ * @see Zend_Ldap_Converter
+ */
+require_once 'Zend/Ldap/Converter.php';
+
+/**
</ins> * Zend_Ldap_Attribute is a collection of LDAP attribute related functions.
 *
 * @category Zend
@@ -185,32 +190,33 @@
 */
 private static function _valueToLdap($value)
 {
<del>- if (is_string($value)) return $value;
- else if (is_int($value) || is_float($value)) return (string)$value;
- else if (is_bool($value)) return ($value === true) ? 'TRUE' : 'FALSE';
- else if (is_object($value) || is_array($value)) return serialize($value);
- else if (is_resource($value) && get_resource_type($value) === 'stream')
- return stream_get_contents($value);
- else return null;
</del><ins>+ return Zend_Ldap_Converter::toLdap($value);
</ins> }

 /**
 * @param string $value
<del>- * @return string|boolean
</del><ins>+ * @return mixed
</ins> */
 private static function _valueFromLdap($value)
 {
<del>- $value = (string)$value;
- if ($value === 'TRUE') return true;
- else if ($value === 'FALSE') return false;
- else return $value;
</del><ins>+ try {
+ $return = Zend_Ldap_Converter::fromLdap($value, Zend_Ldap_Converter::STANDARD, false);
+ if ($return instanceof DateTime) {
+ return Zend_Ldap_Converter::toLdapDateTime($return, false);
+ } else {
+ return $return;
+ }
+ } catch (InvalidArgumentException $e) {
+ return $value;
+ }
</ins> }

 /**
 * Converts a PHP data type into its LDAP representation
 *
<del>- * @param mixed $value
- * @return string|null - null if the PHP data type cannot be converted.
</del><ins>+ * @deprected use Zend_Ldap_Converter instead
+ * @param mixed $value
+ * @return string|null - null if the PHP data type cannot be converted.
</ins> */
 public static function convertToLdapValue($value)
 {
@@ -220,8 +226,9 @@
 /**
 * Converts an LDAP value into its PHP data type
 *
<del>- * @param string $value
- * @return mixed
</del><ins>+ * @deprected use Zend_Ldap_Converter instead
+ * @param string $value
+ * @return mixed
</ins> */
 public static function convertFromLdapValue($value)
 {
@@ -362,8 +369,7 @@
 private static function _valueToLdapDateTime($value, $utc)
 {
 if (is_int($value)) {
<del>- if ($utc === true) return gmdate('YmdHis', $value) . 'Z';
- else return date('YmdHisO', $value);
</del><ins>+ return Zend_Ldap_Converter::toLdapDateTime($value, $utc);
</ins> }
 else return null;
 }
@@ -393,31 +399,19 @@
 }

 /**
<del>- * @param string $value
</del><ins>+ * @param string|DateTime $value
</ins> * @return integer|null
 */
 private static function _valueFromLdapDateTime($value)
 {
<del>- $matches = array();
- if (preg_match('/^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})(?:\.0)?([+-]\d{4}|Z)$/', $value, $matches)) {
- $year = $matches[1];
- $month = $matches[2];
- $day = $matches[3];
- $hour = $matches[4];
- $minute = $matches[5];
- $second = $matches[6];
- $timezone = $matches[7];
- $date = gmmktime($hour, $minute, $second, $month, $day, $year);
- if ($timezone !== 'Z') {
- $tzDirection = substr($timezone, 0, 1);
- $tzOffsetHour = substr($timezone, 1, 2);
- $tzOffsetMinute = substr($timezone, 3, 2);
- $tzOffset = ($tzOffsetHour*60*60) + ($tzOffsetMinute*60);
- if ($tzDirection == '+') $date -= $tzOffset;
- else if ($tzDirection == '-') $date += $tzOffset;
</del><ins>+ if ($value instanceof DateTime) {
+ return $value->format('U');
+ } else if (is_string($value)) {
+ try {
+ return Zend_Ldap_Converter::fromLdapDateTime($value, false)->format('U');
+ } catch (InvalidArgumentException $e) {
+ return null;
</ins> }
<del>- return $date;
- }
- else return null;
</del>@@ Diff output truncated at 4096 characters. @@
</pre>
</div>
</div>

</body>
</html>