From 7bd232acfa485f8a5024d9683c9ef07f115ca498 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Tue, 9 Jun 2009 17:13:00 +0200
Subject: [PATCH] Remove the special handling when reading the postal address.
 It is invalid.

---
 .../Kolab/Server/Object/Organizationalperson.php   | 41 ----------------------
 1 file changed, 41 deletions(-)

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Organizationalperson.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Organizationalperson.php
index cd0351aaf..e6564de3a 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Organizationalperson.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Organizationalperson.php
@@ -32,9 +32,6 @@ class Horde_Kolab_Server_Object_Organizationalperson extends Horde_Kolab_Server_
     /** The postal address */
     const ATTRIBUTE_POSTALADDRESS = 'postalAddress';
 
-    /** The raw postal address as stored in the database */
-    const ATTRIBUTE_POSTALADDRESSRAW = 'postalAddressRaw';
-
     /** The job title */
     const ATTRIBUTE_JOBTITLE = 'title';
 
@@ -71,23 +68,6 @@ class Horde_Kolab_Server_Object_Organizationalperson extends Horde_Kolab_Server_
             self::ATTRIBUTE_FAX,
             self::ATTRIBUTE_POSTALADDRESS,
         ),
-        'derived' => array(
-            self::ATTRIBUTE_POSTALADDRESS => array(
-                'base' => array(
-                    self::ATTRIBUTE_POSTALADDRESS,
-                ),
-                'method' => 'getPostalAddress',
-            ),
-            self::ATTRIBUTE_POSTALADDRESSRAW => array(
-                'base' => array(
-                    self::ATTRIBUTE_POSTALADDRESS,
-                ),
-                'method' => '_get',
-                'args' => array(
-                    self::ATTRIBUTE_POSTALADDRESS,
-                ),
-            ),
-        ),
         'collapsed' => array(
             self::ATTRIBUTE_POSTALADDRESS => array(
                 'base' => array(
@@ -125,27 +105,6 @@ class Horde_Kolab_Server_Object_Organizationalperson extends Horde_Kolab_Server_
     }
 
     /**
-     * Get the value for the postal address. This is not the complete postal
-     * address but just an additional section you may set to complete the postal
-     * address (things like "c/o John Doe").
-     *
-     * @return string The postal address.
-     */
-    protected function getPostalAddress()
-    {
-        $postal = $this->_get(self::ATTRIBUTE_POSTALADDRESS, true);
-        if (empty($postal)) {
-            return $postal;
-        }
-        $postal_parts = explode('$', $postal);
-        if (isset($postal_parts[1])) {
-            return $this->unquote($postal_parts[1]);
-        } else {
-            return '';
-        }
-    }
-
-    /**
      * Set the complete postal address.
      *
      * @param string $key        The attribute to collapse into.
-- 
2.11.0