[Phpgroupware-cvs] CVS: addressbook/inc class.uiaddressbook.inc.php, 1.36.2.15.2.8, 1.36.2.15.2.9

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

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.uiaddressbook.inc.php 
Log Message:
Closes 5151


Index: class.uiaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uiaddressbook.inc.php,v
retrieving revision 1.36.2.15.2.8
retrieving revision 1.36.2.15.2.9
diff -C2 -r1.36.2.15.2.8 -r1.36.2.15.2.9
*** class.uiaddressbook.inc.php 8 Sep 2003 13:26:37 -0000       1.36.2.15.2.8
--- class.uiaddressbook.inc.php 9 Sep 2003 19:17:30 -0000       1.36.2.15.2.9
***************
*** 158,163 ****
                function index()
                {
-                       $entries=array();
-                       
                        if(get_var('section'))
                        {
--- 158,161 ----
***************
*** 235,338 ****
                        }
                        
!                       
                        if ($this->section == $this->tab_main_persons)
                        {
!                               
$columns_to_display=$this->bo->get_columns_to_display($this->tab_main_persons);
!                               $comms_array = 
$columns_to_display['comm_types']?$columns_to_display['comm_types']:array();    
                         
!                               unset($columns_to_display['comm_types']);
!                               $fields = array_keys($columns_to_display);
!                               $fields_comms = array_keys($comms_array);
!                               $fields['owner']='owner';
!                               $fields['contact_id']='contact_id';
! 
!                               $addr_filter = array('addr_pref_val'=>'Y');
!                               
!                               if($this->query)
!                               {
!                                       foreach($fields as $field)
!                                       {
!                                               $query_filter[$field] = 
$this->query;
!                                       }
!                               }
! 
!                               unset($query_filter['contact_id']);
!                               unset($query_filter['owner']);
!                               
!                               $criteria = array_merge($this->filters, 
$addr_filter, $filter_person, $query_filter);
! 
!                               $total_all_persons = 
$this->bo->so->get_count_persons($criteria);
!                               $entries = $this->bo->get_persons($fields, 
$this->limit, $this->start, $this->order, $this->sort, $criteria);
!                               
!                               if (is_array($entries))
                                {
!                                       foreach ($entries as $id)
!                                       {
!                                               $contacts[] = $id['contact_id'];
!                                       }
!                                       $this->entries_comm = 
$this->bo->so->contacts->get_comm_contact_data($contacts, $fields_comms);
                                }
- 
-                               $total_records = $this->bo->total;
                                $this->edit_mode = 'edit_person'; 
!                               $this->view_mode = 'view_person'; 
                                
$this->template->set_var('add_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add_person'));
                        }
                        elseif ($this->section == $this->tab_main_organizations)
                        {
!                               
$columns_to_display=$this->bo->get_columns_to_display($this->tab_main_organizations);
!                               $comms_array = 
$columns_to_display['comm_types'];
!                               unset($columns_to_display['comm_types']);
!                               $fields = array_keys($columns_to_display);
!                               $fields_comms = array_keys($comms_array);
!                               $fields['owner']='owner';
!                               $fields['contact_id']='contact_id';
!                               
!                               $addr_filter = array('addr_pref_val'=>'Y');
! 
!                               if($this->query)
                                {
!                                       foreach($fields as $field)
!                                       {
!                                               $query_filter[$field] = 
$this->query;
!                                       }
                                }
- 
-                               unset($query_filter['contact_id']);
-                               unset($query_filter['owner']);
-                               
-                               $criteria = array_merge($this->filters, 
$addr_filter, $filter_person, $query_filter);
- 
-                               $total_all_orgs = 
$this->bo->so->get_count_orgs($criteria);
-                               $entries = $this->bo->get_orgs($fields, 
$this->limit, $this->start, '', $this->sort, $criteria);
-                               
-                               if (is_array($entries))
-                               {
-                                       foreach ($entries as $id)
-                                       {
-                                               $contacts[] = $id['contact_id'];
-                                       }
-                                       $this->entries_comm = 
$this->bo->so->contacts->get_comm_contact_data($contacts, $fields_comms);
-                               }
- 
-                               $total_records = $this->bo->total;
                                $this->edit_mode = 'edit_org';
                                $this->view_mode = 'view_org'; 
                                
$this->template->set_var('add_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add_org'));
                        }
!  
!                       $cols='';
!                       if(!$columns_to_display && 
!is_array($columns_to_display))
                        {
!                               $noprefs=lang('Please set your preferences for 
this application');
!                               // FIXME: Default values here! this is bad but 
is something
!                               $columns_to_display = array(
!                                       'per_first_name'  => 'per_first_name',
!                                       'per_last_name' => 'per_last_name',
!                                       'per_department'=>'department',
!                                       'per_title'=> 'title',
!                                       'addr_add1'=>'address1',
!                                       'addr_city'=>'city');
                        }
!                               
                        while ($column = @each($columns_to_display))
                        {
--- 233,314 ----
                        }
                        
!                       $columns_to_display = 
$this->bo->get_columns_to_display($this->section);
! 
                        if ($this->section == $this->tab_main_persons)
                        {
!                               if(!$columns_to_display && 
!is_array($columns_to_display))
                                {
!                                       $noprefs=lang('Please set your 
preferences for this application');
!                                       // FIXME: Default values here! this is 
bad but is something
!                                       $columns_to_display = array(
!                                               'per_first_name'  => 
'per_first_name',
!                                               'per_last_name' => 
'per_last_name',
!                                               'per_department'=>'department',
!                                               'per_title'=> 'title',
!                                               'addr_add1'=>'address1',
!                                               'addr_city'=>'city');
                                }
                                $this->edit_mode = 'edit_person'; 
!                               $this->view_mode = 'view_person';
!                               $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'));
                        }
                        elseif ($this->section == $this->tab_main_organizations)
                        {
!                               if(!$columns_to_display && 
!is_array($columns_to_display))
                                {
!                                       $noprefs=lang('Please set your 
preferences for this application');
!                                       // FIXME: Default values here! this is 
bad but is something
!                                       $columns_to_display = array(
!                                               'org_name'  => 'org_name');
                                }
                                $this->edit_mode = 'edit_org';
                                $this->view_mode = 'view_org'; 
+                               $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'));
                        }
! 
!                       $comms_array = 
$columns_to_display['comm_types']?$columns_to_display['comm_types']:array();
!                       unset($columns_to_display['comm_types']);
!                       $fields = array_keys($columns_to_display);
!                       $fields_comms = array_keys($comms_array);
!                       $fields['owner']='owner';
!                       $fields['contact_id']='contact_id';
!                       
!                       $addr_filter = array('addr_pref_val'=>'Y');
!                       
!                       if($this->query)
                        {
!                               foreach($fields as $field)
!                               {
!                                       $query_filter[$field] = $this->query;
!                               }
                        }
!                       
!                       unset($query_filter['contact_id']);
!                       unset($query_filter['owner']);
!                       
!                       $criteria = array_merge($this->filters, $addr_filter, 
$filter_person, $query_filter);
!                       
!                       $total_all_persons = 
$this->bo->so->$count_function($criteria);
!                       $entries = $this->bo->$get_data_function($fields, 
$this->limit, $this->start, $this->order, $this->sort, $criteria);
!                       
!                       if (is_array($entries))
!                       {
!                               foreach ($entries as $id)
!                               {
!                                       $contacts[] = $id['contact_id'];
!                               }
!                               $this->entries_comm = 
$this->bo->so->contacts->get_comm_contact_data($contacts, $fields_comms);
!                       }
!                       else
!                       {
!                               $entries=array();
!                       }
! 
!                       $total_records = $this->bo->total;
!                       $cols='';
                        while ($column = @each($columns_to_display))
                        {
***************
*** 423,427 ****
                        /* each entry */
  
-                       reset($entries);
                        $all_cols_to_display = array_merge($columns_to_display, 
$comms_array);
                        
--- 399,402 ----