[Phpgroupware-cvs] CVS: addressbook/inc class.uiaddressbook.inc.php, 1.36.2.15.2.12, 1.36.2.15.2.13 class.soaddressbook.inc.php, 1.14.2.3.2.2, 1.14.2.3.2.3 class.boaddressbook.inc.php, 1.21.2.2.2.4, 1.21.2.2.2.5

[Jonathan Rivera <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.uiaddressbook.inc.php class.soaddressbook.inc.php 
        class.boaddressbook.inc.php 
Log Message:
Bugfix for #5172, the support for sort catalog fields as Work mail, Work Phone, 
etc. is in process


Index: class.uiaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uiaddressbook.inc.php,v
retrieving revision 1.36.2.15.2.12
retrieving revision 1.36.2.15.2.13
diff -C2 -r1.36.2.15.2.12 -r1.36.2.15.2.13
*** class.uiaddressbook.inc.php 10 Sep 2003 18:17:38 -0000      1.36.2.15.2.12
--- class.uiaddressbook.inc.php 10 Sep 2003 20:50:50 -0000      1.36.2.15.2.13
***************
*** 253,256 ****
--- 253,257 ----
                                $count_function = 'get_count_persons';
                                $get_data_function = 'get_persons';
+ 
                                
$this->template->set_var('add_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add_person'));
                        }
***************
*** 268,271 ****
--- 269,273 ----
                                $count_function = 'get_count_orgs';
                                $get_data_function = 'get_orgs';
+ 
                                
$this->template->set_var('add_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add_org'));
                        }
***************
*** 274,277 ****
--- 276,285 ----
                        unset($columns_to_display['comm_types']);
                        $fields = array_keys($columns_to_display);
+ 
+                       if(!in_array($this->order, $fields))
+                       {
+                               $this->order = '';
+                       }
+                       
                        $fields_comms = array_keys($comms_array);
                        $fields['owner']='owner';

Index: class.soaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.soaddressbook.inc.php,v
retrieving revision 1.14.2.3.2.2
retrieving revision 1.14.2.3.2.3
diff -C2 -r1.14.2.3.2.2 -r1.14.2.3.2.3
*** class.soaddressbook.inc.php 10 Sep 2003 18:17:38 -0000      1.14.2.3.2.2
--- class.soaddressbook.inc.php 10 Sep 2003 20:50:50 -0000      1.14.2.3.2.3
***************
*** 197,203 ****
                }
  
!               function get_orgs($fields, $start, $limit, $orderby)
                {
!                       return $this->contacts->get_orgs($fields, $start, 
$limit, $orderby);
                }
  
--- 197,203 ----
                }
  
!               function get_orgs($fields, $start='', $limit='', $orderby='', 
$sort='', $criteria='')
                {
!                       return $this->contacts->get_orgs($fields, $start, 
$limit, $orderby, $sort, $criteria);
                }
  

Index: class.boaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.boaddressbook.inc.php,v
retrieving revision 1.21.2.2.2.4
retrieving revision 1.21.2.2.2.5
diff -C2 -r1.21.2.2.2.4 -r1.21.2.2.2.5
*** class.boaddressbook.inc.php 10 Sep 2003 18:17:38 -0000      1.21.2.2.2.4
--- class.boaddressbook.inc.php 10 Sep 2003 20:50:50 -0000      1.21.2.2.2.5
***************
*** 570,576 ****
                }
  
!               function get_orgs($fields, $start='', $limit='', $orderby='', 
$criteria='')
                {
!                       $entries =  $this->so->get_orgs($fields, $start, 
$limit, $orderby);
                        $this->total = $this->so->contacts->total_records;
                        return $entries;
--- 570,576 ----
                }
  
!               function get_orgs($fields, $start='', $limit='', $orderby='', 
$sort='', $criteria='')
                {
!                       $entries =  $this->so->get_orgs($fields, $start, 
$limit, $orderby, $sort, $criteria);
                        $this->total = $this->so->contacts->total_records;
                        return $entries;