[Phpgroupware-cvs] CVS: phpgwapi/inc class.nextmatchs.inc.php,1.54,1.55

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv30971

Modified Files:
        class.nextmatchs.inc.php 
Log Message:
update nm sort function

Index: class.nextmatchs.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.nextmatchs.inc.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** class.nextmatchs.inc.php    30 Nov 2002 02:19:15 -0000      1.54
--- class.nextmatchs.inc.php    5 Dec 2002 00:27:37 -0000       1.55
***************
*** 313,321 ****
                        {
                                $extravars['start'] = 0;
!                               $ret_str .= 
$this->set_link('left','first.gif',$scriptname,lang('First page'),$extravars);
                        }
                        else
                        {
!                               $ret_str .= 
$this->set_icon('left','first-grey.gif',lang('First page'));
                        }
  
--- 313,321 ----
                        {
                                $extravars['start'] = 0;
!                               $ret_str .= 
$this->set_link('left','first.png',$scriptname,lang('First page'),$extravars);
                        }
                        else
                        {
!                               $ret_str .= 
$this->set_icon('left','first-grey.png',lang('First page'));
                        }
  
***************
*** 331,339 ****
                                        $extravars['start'] = ($start - 
$this->maxmatches);
                                }
!                               $ret_str .= 
$this->set_link('left','left.gif',$scriptname,lang('Previous page'),$extravars);
                        }
                        else
                        {
!                               $ret_str .= 
$this->set_icon('left','left-grey.gif',lang('Previous page'));
                        }
                        return $ret_str;
--- 331,339 ----
                                        $extravars['start'] = ($start - 
$this->maxmatches);
                                }
!                               $ret_str .= 
$this->set_link('left','left.png',$scriptname,lang('Previous page'),$extravars);
                        }
                        else
                        {
!                               $ret_str .= 
$this->set_icon('left','left-grey.png',lang('Previous page'));
                        }
                        return $ret_str;
***************
*** 368,376 ****
                        {
                                $extravars['start'] = ($start + 
$this->maxmatches);
!                               $ret_str .= 
$this->set_link('right','right.gif',$scriptname,lang('Next page'),$extravars);
                        }
                        else
                        {
!                               $ret_str .= 
$this->set_icon('right','right-grey.gif',lang('Next page'));
                        }
  
--- 368,376 ----
                        {
                                $extravars['start'] = ($start + 
$this->maxmatches);
!                               $ret_str .= 
$this->set_link('right','right.png',$scriptname,lang('Next page'),$extravars);
                        }
                        else
                        {
!                               $ret_str .= 
$this->set_icon('right','right-grey.png',lang('Next page'));
                        }
  
***************
*** 379,387 ****
                        {
                                $extravars['start'] = ($total - 
$this->maxmatches);
!                               $ret_str .= 
$this->set_link('right','last.gif',$scriptname,lang('Last page'),$extravars);
                        }
                        else
                        {
!                               $ret_str .= 
$this->set_icon('right','last-grey.gif',lang('Last page'));
                        }
                        return $ret_str;
--- 379,387 ----
                        {
                                $extravars['start'] = ($total - 
$this->maxmatches);
!                               $ret_str .= 
$this->set_link('right','last.png',$scriptname,lang('Last page'),$extravars);
                        }
                        else
                        {
!                               $ret_str .= 
$this->set_icon('right','last-grey.png',lang('Last page'));
                        }
                        return $ret_str;
***************
*** 712,717 ****
                @param $build_an_href default True
                */
!               function 
show_sort_order($sort,$var,$order,$program,$text,$extra='',$build_an_href=True)
                {
                        list($filter,$qfield,$start,$NULL1,$NULL) = 
$this->get_var();
  
--- 712,731 ----
                @param $build_an_href default True
                */
!               function show_sort_order($sort, $var = '', $order = '', 
$program = '', $text = '', $extra='', $build_an_href = True)
                {
+                       if(is_array($sort))
+                       {
+                               $temp_format    = $sort['sort'];
+                               $var                    = 
(isset($sort['var'])?$sort['var']:'');
+                               $order                  = 
(isset($sort['order'])?$sort['order']:'');
+                               $program                = 
(isset($sort['program'])?$sort['program']:'/index.php');
+                               $text                   = 
(isset($sort['text'])?$sort['text']:'xslt');
+                               $extra                  = 
(isset($sort['extra'])?$sort['extra']:'');
+                               $build_an_href  = 
(isset($sort['build_an_href'])?$sort['build_an_href']:True);
+                               settype($sort,'string');
+                               $sort                   = $temp_format;
+                               unset($temp_format);
+                       }
+ 
                        list($filter,$qfield,$start,$NULL1,$NULL) = 
$this->get_var();
  
***************
*** 738,742 ****
                        $link = 
($this->action?$this->page($extravar):$GLOBALS['phpgw']->link($program,$extravar));
  
!                       if($build_an_href)
                        {
                                return '<a href="' . $link . '">' . $text . 
'</a>';
--- 752,760 ----
                        $link = 
($this->action?$this->page($extravar):$GLOBALS['phpgw']->link($program,$extravar));
  
!                       if ($text == 'xslt')
!                       {
!                               return $link;
!                       }
!                       elseif($build_an_href)
                        {
                                return '<a href="' . $link . '">' . $text . 
'</a>';