[Phpgroupware-cvs] CVS: phpgwapi/inc class.nextmatchs.inc.php,1.43.2.1,1.43.2.2

[Bettina Gille <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.nextmatchs.inc.php 
Log Message:
fixed filter function

Index: class.nextmatchs.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.nextmatchs.inc.php,v
retrieving revision 1.43.2.1
retrieving revision 1.43.2.2
diff -C2 -r1.43.2.1 -r1.43.2.2
*** class.nextmatchs.inc.php    19 Feb 2002 19:38:47 -0000      1.43.2.1
--- class.nextmatchs.inc.php    17 Mar 2002 19:50:57 -0000      1.43.2.2
***************
*** 436,440 ****
                function search($search_obj=0)
                {
!                       $_query = stripslashes($GLOBALS['query']);
  
                        // If the place a " in there search, it will mess 
everything up
--- 436,449 ----
                function search($search_obj=0)
                {
!                       if(is_array($search_obj))
!                       {
!                               $params         = $search_obj;
!                               $s_query        = 
stripslashes($params['query']);
!                               $search_obj = $params['search_obj'];
!                       }
!                       else
!                       {
!                               $_query = stripslashes($GLOBALS['query']);
!                       }
  
                        // If the place a " in there search, it will mess 
everything up
***************
*** 509,513 ****
                function filter($filter_obj,$yours=0)
                {
!                       global $filter;
  
                        if (is_long($filter_obj))
--- 518,531 ----
                function filter($filter_obj,$yours=0)
                {
!                       if (is_array($yours))
!                       {
!                               $params = $yours;
!                               $filter = $params['filter'];
!                               $yours  = $params['yours'];
!                       }
!                       else
!                       {
!                               $filter = $GLOBALS['HTTP_POST_VARS']['filter'] 
? $GLOBALS['HTTP_POST_VARS']['filter'] : $GLOBALS['HTTP_GET_VARS']['filter'];
!                       }
  
                        if (is_long($filter_obj))
***************
*** 520,524 ****
                                        if ($yours)
                                        {
!                                               $filter_obj = array(
                                                        array('none',lang('Show 
all')),
                                                        
array('yours',lang('Only yours')),
--- 538,543 ----
                                        if ($yours)
                                        {
!                                               $filter_obj = array
!                                               (
                                                        array('none',lang('Show 
all')),
                                                        
array('yours',lang('Only yours')),
***************
*** 528,532 ****
                                        else
                                        {
!                                               $filter_obj = array(
                                                        array('none',lang('Show 
all')),
                                                        
array('private',lang('private'))
--- 547,552 ----
                                        else
                                        {
!                                               $filter_obj = array
!                                               (
                                                        array('none',lang('Show 
all')),
                                                        
array('private',lang('private'))
***************
*** 534,540 ****
                                        }
  
!                                       while (is_array($this->extra_filters) 
&& list(,$filter) = each($this->extra_filters))
                                        {
!                                               $filter_obj[] = $filter;
                                        }
  
--- 554,560 ----
                                        }
  
!                                       while (is_array($this->extra_filters) 
&& list(,$efilter) = each($this->extra_filters))
                                        {
!                                               $filter_obj[] = $efilter;
                                        }