[Phpgroupware-cvs] addressbook/inc class.soaddressbook.inc.php, 1.14.2.3.2.25 class.uiaddressbook.inc.php, 1.36.2.15.2.60

[jarg]

Update of addressbook/inc

Modified Files:
     Branch: Version-0_9_16-branch
            class.soaddressbook.inc.php lines: +12 -2
            class.uiaddressbook.inc.php lines: +16 -8

Log Message:
Bugfix #14130. I will send a patch for contacts API too for solve similar 
problems

====================================================
Index: addressbook/inc/class.soaddressbook.inc.php
diff -u addressbook/inc/class.soaddressbook.inc.php:1.14.2.3.2.24 
addressbook/inc/class.soaddressbook.inc.php:1.14.2.3.2.25
--- addressbook/inc/class.soaddressbook.inc.php:1.14.2.3.2.24   Sat Aug 21 
05:53:12 2004
+++ addressbook/inc/class.soaddressbook.inc.php Fri Aug 19 19:48:43 2005
@@ -599,7 +599,17 @@

                //used
                function add_person($fields)
-               {
+               {
+                       if(!is_array($fields['tab_person_data']))
+                       {
+                               $fields['tab_person_data'] = 
(array)$fields['tab_person_data'];
+                       }
+
+                       if(!is_array($fields['tab_extra']))
+                       {
+                               $fields['tab_extra'] = 
(array)$fields['tab_extra'];
+                       }
+
                        $principal = array_merge($fields['tab_person_data'], 
$fields['tab_extra']);

                        if(!is_array($fields['tab_comms']['comm_data']))

====================================================
Index: addressbook/inc/class.uiaddressbook.inc.php
diff -u addressbook/inc/class.uiaddressbook.inc.php:1.36.2.15.2.59 
addressbook/inc/class.uiaddressbook.inc.php:1.36.2.15.2.60
--- addressbook/inc/class.uiaddressbook.inc.php:1.36.2.15.2.59  Wed Dec  1 
19:15:34 2004
+++ addressbook/inc/class.uiaddressbook.inc.php Fri Aug 19 19:48:43 2005
@@ -35,7 +35,6 @@
                var $filter;
                var $cat_id;
                var $bname;
-               var $template;
                var $options_data;
                var $old_tab;

@@ -2734,6 +2733,8 @@

                function view_contact($contact_id='', $contact_type='', 
$referer='')
                {
+                       $contacts = array();
+
                        $contact_id = (empty($contact_id))? get_var('ab_id') : 
$contact_id;
                        $contact_type = 
$contact_type?$contact_type:$this->bo->search_contact_type_id(
                                $this->bo->get_type_contact($contact_id));
@@ -2812,12 +2813,19 @@

                        $addr = $this->bo->get_addr_contact_data($contact_id, 
array('addr_pref_val'=>'Y'));

-                       unset($addr[0]['contact_id']);
-                       unset($addr[0]['key_addr_id']);
-                       unset($addr[0]['addr_type']);
-                       unset($addr[0]['addr_preferred']);
-                       unset($addr[0]['addr_description']);
-                       unset($addr[0]['addr_contact_id']);
+                       if(is_array($addr[0]))
+                       {
+                               unset($addr[0]['contact_id']);
+                               unset($addr[0]['key_addr_id']);
+                               unset($addr[0]['addr_type']);
+                               unset($addr[0]['addr_preferred']);
+                               unset($addr[0]['addr_description']);
+                               unset($addr[0]['addr_contact_id']);
+                       }
+                       else
+                       {
+                               $addr[0] = array();
+                       }

                        $contacts = array_merge($contacts, $addr[0]);