[Phpgroupware-cvs] infolog/inc class.bolink.inc.php, 1.20.2.5, 1.20.2.6 class.uiinfolog.inc.php, 1.30.2.12.2.7, 1.30.2.12.2.8

[Alejandro Borges (lex) <address@hidden>]

Update of /cvsroot/phpgroupware/infolog/inc
In directory subversions:/tmp/cvs-serv27440/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.bolink.inc.php class.uiinfolog.inc.php 
Log Message:
Fixes infolog -> ab cooperation


Index: class.bolink.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.bolink.inc.php,v
retrieving revision 1.20.2.5
retrieving revision 1.20.2.6
diff -C2 -d -r1.20.2.5 -r1.20.2.6
*** class.bolink.inc.php        7 Sep 2003 01:29:29 -0000       1.20.2.5
--- class.bolink.inc.php        5 Oct 2003 05:47:13 -0000       1.20.2.6
***************
*** 47,51 ****
                                'title' => 'addressbook_title',
                                'view' => array(
!                                       'menuaction' => 
'addressbook.uiaddressbook.view'
                                ),
                                'view_id' => 'ab_id'
--- 47,51 ----
                                'title' => 'addressbook_title',
                                'view' => array(
!                                       'menuaction' => 
'addressbook.uiaddressbook.view_person'
                                ),
                                'view_id' => 'ab_id'
***************
*** 888,907 ****
                        if (!is_array($addr))
                        {
!                               list( $addr ) = 
$this->contacts->read_single_entry( $addr );
                        }
                        if (!is_array($addr))
                        {
                                return False;
                        }
!                       $name = $addr['n_family'];
!                       if ($addr['n_given'])
                        {
!                               $name .= ', '.$addr['n_given'];
                        }
                        else
                        {
!                               if ($addr['n_prefix'])
                                {
!                                       $name .= ', '.$addr['n_prefix'];
                                }
                        }
--- 888,909 ----
                        if (!is_array($addr))
                        {
!                               //list( $addr ) = 
$this->contacts->read_single_entry( $addr );
!                               list( $addr ) = 
$this->contacts->get_principal_persons_data( $addr );
                        }
+                       
                        if (!is_array($addr))
                        {
                                return False;
                        }
!                       $name = $addr['per_last_name'];
!                       if ($addr['per_first_name'])
                        {
!                               $name .= ', '.$addr['per_first_name'];
                        }
                        else
                        {
!                               if ($addr['per_prefix'])
                                {
!                                       $name .= ', '.$addr['per_prefix'];
                                }
                        }
***************
*** 925,929 ****
                                $this->contacts = 
createobject('phpgwapi.contacts');
                        }
!                       $addrs = $this->contacts->read( 
0,0,'',$pattern,'','DESC','org_name,n_family,n_given' );
                        $content = array( );
                        while ($addrs && list( $key,$addr ) = each( $addrs ))
--- 927,935 ----
                                $this->contacts = 
createobject('phpgwapi.contacts');
                        }
!                       //$addrs = $this->contacts->read( 
0,0,'',$pattern,'','DESC','org_name,n_family,n_given' );
!                       $columns_to_display = array('per_first_name', 
'per_last_name', 'per_prefix');
!                       
!                       $addrs = $this->contacts->search( $columns_to_display, 
$pattern );
!                       
                        $content = array( );
                        while ($addrs && list( $key,$addr ) = each( $addrs ))

Index: class.uiinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.uiinfolog.inc.php,v
retrieving revision 1.30.2.12.2.7
retrieving revision 1.30.2.12.2.8
diff -C2 -d -r1.30.2.12.2.7 -r1.30.2.12.2.8
*** class.uiinfolog.inc.php     7 Sep 2003 01:29:29 -0000       1.30.2.12.2.7
--- class.uiinfolog.inc.php     5 Oct 2003 05:47:13 -0000       1.30.2.12.2.8
***************
*** 619,623 ****
                                        $app     = 'addressbook';
                                        $view_id = 'ab_id';
!                                       $view    = 
'addressbook.uiaddressbook.view';
                                        break;
                                case 'projects_view':
--- 619,623 ----
                                        $app     = 'addressbook';
                                        $view_id = 'ab_id';
!                                       $view    = 
'addressbook.uiaddressbook.view_person';
                                        break;
                                case 'projects_view':