[Phpgroupware-cvs] CVS: phpgwapi/inc class.nextmatchs.inc.php,1.44,1.45

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.nextmatchs.inc.php 
Log Message:
changed function filter plus search to pass  and  directly

Index: class.nextmatchs.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.nextmatchs.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** class.nextmatchs.inc.php    17 Jan 2002 20:52:31 -0000      1.44
--- class.nextmatchs.inc.php    1 Feb 2002 03:36:57 -0000       1.45
***************
*** 21,25 ****
        * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA         
   *
        
\**************************************************************************/
- 
        /* $Id$ */
  
--- 21,24 ----
***************
*** 434,440 ****
                function search($search_obj=0)
                {
!                       $_query = stripslashes($GLOBALS['query']);
  
!                       // If the place a " in there search, it will mess 
everything up
                        // Our only option is to remove it
                        if (ereg('"',$_query))
--- 433,448 ----
                function search($search_obj=0)
                {
!                       if (is_array($search_obj))
!                       {
!                               $params         = $search_obj;
!                               $_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
                        // Our only option is to remove it
                        if (ereg('"',$_query))
***************
*** 507,511 ****
                function filter($filter_obj,$yours=0)
                {
!                       global $filter;
  
                        if (is_long($filter_obj))
--- 515,528 ----
                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))
***************
*** 669,673 ****
                @param $old_sort : the current sort value
                @param $new_sort : the sort value you want if you click on this
!               @param $default_order : user's preference for ordering list 
items (force this when a new [different] sorting is requested)
                @param $order : the current order (will be flipped if old_sort 
= new_sort)
                @param $program : script file name
--- 686,690 ----
                @param $old_sort : the current sort value
                @param $new_sort : the sort value you want if you click on this
!               @param $default_order : users preference for ordering list 
items (force this when a new [different] sorting is requested)
                @param $order : the current order (will be flipped if old_sort 
= new_sort)
                @param $program : script file name
***************
*** 700,704 ****
                        else
                        {
!                               //user has selected a new sort scheme, reset 
the order to user's default
                                $our_order = $default_order;
                        }
--- 717,721 ----
                        else
                        {
!                               //user has selected a new sort scheme, reset 
the order to users default
                                $our_order = $default_order;
                        }