[Phpgroupware-cvs] addressbook/inc class.soaddressbook.inc.php, 1.14.2.3.2.18, 1.14.2.3.2.19 class.boaddressbook.inc.php, 1.21.2.2.2.18, 1.21.2.2.2.19

[Edgar Luna <address@hidden>]

Update of /cvsroot/phpgroupware/addressbook/inc
In directory subversions:/tmp/cvs-serv13379

Modified Files:
      Tag: Version-0_9_16-branch
        class.soaddressbook.inc.php class.boaddressbook.inc.php 
Log Message:
Fix: [bug #5916]


Index: class.boaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.boaddressbook.inc.php,v
retrieving revision 1.21.2.2.2.18
retrieving revision 1.21.2.2.2.19
diff -C2 -d -r1.21.2.2.2.18 -r1.21.2.2.2.19
*** class.boaddressbook.inc.php 28 Oct 2003 16:17:45 -0000      1.21.2.2.2.18
--- class.boaddressbook.inc.php 29 Oct 2003 07:30:46 -0000      1.21.2.2.2.19
***************
*** 317,321 ****
                                $entry['owner'] = 
$GLOBALS['phpgw_info']['user']['account_id'];
                                $entry['access'] = 'private';
-                               //$entry['tid'] = 'n';
                                /* _debug_array($entry);exit; */
  //                            $this->so->add_entry($entry);
--- 317,320 ----

Index: class.soaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.soaddressbook.inc.php,v
retrieving revision 1.14.2.3.2.18
retrieving revision 1.14.2.3.2.19
diff -C2 -d -r1.14.2.3.2.18 -r1.14.2.3.2.19
*** class.soaddressbook.inc.php 28 Oct 2003 16:17:45 -0000      1.14.2.3.2.18
--- class.soaddressbook.inc.php 29 Oct 2003 07:30:46 -0000      1.14.2.3.2.19
***************
*** 1,5 ****
  <?php
    /**************************************************************************\
!   * phpGroupWare - soaddressbook                                         *
    * http://www.phpgroupware.org                                              *
    * This program is part of the GNU project, see http://www.gnu.org/         *
--- 1,5 ----
  <?php
    /**************************************************************************\
!   * phpGroupWare - soaddressbook                                             *
    * http://www.phpgroupware.org                                              *
    * This program is part of the GNU project, see http://www.gnu.org/         *
***************
*** 73,93 ****
                                      'n_family');
                        return $this->contacts->get_persons($data);
- //                    return $this->contacts->get_persons(
- //                            $data['start'],
- //                            $data['limit'],
- //                            $data['fields'],
- //                            $data['query'],
- //                            $data['filter'],
- //                            $data['sort'],
- //                            $data['order']
- //                    );
                }
  
                function read_entry($id,$fields)
                {
                        if ($this->rights & PHPGW_ACL_READ)
                        {
!                               //return 
$this->contacts->read_single_entry($id,$fields);
!                               return $this->contacts->get_person_data($id, 
$fields);
                        }
                        else
--- 73,84 ----
                                      'n_family');
                        return $this->contacts->get_persons($data);
                }
  
                function read_entry($id,$fields)
                {
+                       echo "Don't use this method. If you see this message 
please fill a bug<br>\n";
                        if ($this->rights & PHPGW_ACL_READ)
                        {
!                               return 
$this->contacts->read_single_entry($id,$fields);
                        }
                        else
***************
*** 133,139 ****
                function get_lastid()
                {
!                       $entry = $this->contacts->read_last_entry();
!                       $id = $entry[0]['id'];
!                       return $id;
                }
  
--- 124,128 ----
                function get_lastid()
                {
!                       return $this->contacts->last_contact_id();
                }