[Phpgroupware-cvs] CVS: addressbook/inc class.uiaddressbook.inc.php,1.45,1.46 class.soaddressbook.inc.php,1.15,1.16 class.boaddressbook.inc.php,1.23,1.24

[Miles Lott <address@hidden>]

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

Modified Files:
        class.uiaddressbook.inc.php class.soaddressbook.inc.php 
        class.boaddressbook.inc.php 
Log Message:
Part one of two - implement filter by first char of last name, fullname, or 
company (for now)



Index: class.uiaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uiaddressbook.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** class.uiaddressbook.inc.php 18 Apr 2002 23:32:48 -0000      1.45
--- class.uiaddressbook.inc.php 13 May 2002 00:43:35 -0000      1.46
***************
*** 73,76 ****
--- 73,77 ----
                        $this->start    = $this->bo->start;
                        $this->query    = $this->bo->query;
+                       $this->cquery   = $this->bo->cquery;
                        $this->sort     = $this->bo->sort;
                        $this->order    = $this->bo->order;
***************
*** 88,91 ****
--- 89,93 ----
                                'start'  => $this->start,
                                'query'  => $this->query,
+                               'cquery' => $this->cquery,
                                'sort'   => $this->sort,
                                'order'  => $this->order,
***************
*** 103,106 ****
--- 105,109 ----
                                'start'  => $this->start,
                                'query'  => $this->query,
+                               'cquery' => $this->cquery,
                                'sort'   => $this->sort,
                                'order'  => $this->order,
***************
*** 268,271 ****
--- 271,306 ----
                        
$this->template->set_block('addressbook_list_t','remsearch','remsearch');
                        
$this->template->set_block('addressbook_list_t','addressbook_footer','addressbook_footer');
+                       
$this->template->set_block('addressbook_list_t','addressbook_alpha','addressbook_alpha');
+ 
+                       $aar = explode(',',lang('alphabet'));
+                       $aar[] = 'all';
+                       while(list(,$char) = @each($aar))
+                       {
+                               if($this->cquery == $char ||
+                                       ($char == 'all' && !$this->cquery))
+                               {
+                                       
$this->template->set_var('charbgcolor','#000000');
+                                       
$this->template->set_var('charcolor','#FFFFFF');
+                               }
+                               else
+                               {
+                                       
$this->template->set_var('charbgcolor',$GLOBALS['phpgw_info']['theme']['th_bg']);
+                                       
$this->template->set_var('charcolor',$GLOBALS['phpgw_info']['theme']['th_text']);
+                               }
+                               if($char == 'all')
+                               {
+                                       $this->template->set_var('charlink',
+                                               
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index&cquery=')
+                                       );
+                               }
+                               else
+                               {
+                                       $this->template->set_var('charlink',
+                                               
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index&cquery='
 . $char)
+                                       );
+                               }
+                               $this->template->set_var('char',$char != 'all' 
? strtoupper($char) : lang('all'));
+                               
$this->template->fp('alphalinks','addressbook_alpha',True);
+                       }
  
                        $custom = $this->fields->read_custom_fields();
***************
*** 432,435 ****
--- 467,471 ----
                                        'filter' => $qfilter,
                                        'query'  => $this->query,
+                                       'cquery' => $this->cquery,
                                        'sort'   => $this->sort,
                                        'order'  => $this->order

Index: class.soaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.soaddressbook.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.soaddressbook.inc.php 17 Jan 2002 03:52:55 -0000      1.15
--- class.soaddressbook.inc.php 13 May 2002 00:43:35 -0000      1.16
***************
*** 66,70 ****
                                $data['filter'],
                                $data['sort'],
!                               $data['order']
                        );
                }
--- 66,71 ----
                                $data['filter'],
                                $data['sort'],
!                               $data['order'],
!                               $data['cquery']
                        );
                }

Index: class.boaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.boaddressbook.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** class.boaddressbook.inc.php 28 Feb 2002 04:23:16 -0000      1.23
--- class.boaddressbook.inc.php 13 May 2002 00:43:35 -0000      1.24
***************
*** 75,80 ****
                        }
  
!                       $start  = get_var('start',   array('POST','GET'));
                        $query  = get_var('query',   array('POST','GET'));
                        $sort   = get_var('sort',    array('POST','GET'));
                        $order  = get_var('order',   array('POST','GET'));
--- 75,81 ----
                        }
  
!                       $start  = intval(get_var('start',   
array('POST','GET')));
                        $query  = get_var('query',   array('POST','GET'));
+                       $cquery = get_var('cquery',  array('GET'));
                        $sort   = get_var('sort',    array('POST','GET'));
                        $order  = get_var('order',   array('POST','GET'));
***************
*** 84,87 ****
--- 85,89 ----
                        $this->start  = (!empty($start) || ($start == '0')) ? 
$start : $this->start;
                        $this->query  = (empty($query) && !empty($this->query)) 
|| !empty($query) ? $query : $this->query;
+                       $this->cquery = (empty($cquery) && 
!empty($this->cquery)) || !empty($cquery) ? $cquery : $this->cquery;
                        $this->sort   = (!empty($sort)) ? $sort : $this->sort;
                        $this->order  = (!empty($order)) ? $order : 
$this->order;
***************
*** 105,109 ****
                                'order'  => $this->order,
                                'filter' => $this->filter,
!                               'cat_id' => $this->cat_id
                        );
                        echo '<br>BO:';
--- 107,112 ----
                                'order'  => $this->order,
                                'filter' => $this->filter,
!                               'cat_id' => $this->cat_id,
!                               'cquery' => $this->cquery
                        );
                        echo '<br>BO:';
***************
*** 190,193 ****
--- 193,197 ----
                        $this->start  = $data['start'];
                        $this->query  = $data['query'];
+                       $this->cquery = $data['cquery'];
                        $this->sort   = $data['sort'];
                        $this->order  = $data['order'];