[Phpgroupware-cvs] CVS: notes/inc class.bo.inc.php,1.2,1.2.2.1 class.ui.inc.php,1.5.2.2,1.5.2.3

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/notes/inc
In directory subversions:/tmp/cvs-serv5667/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.bo.inc.php class.ui.inc.php 
Log Message:
Hopefully fixes cat select, etc



Index: class.bo.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.bo.inc.php,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** class.bo.inc.php    10 Dec 2001 01:00:27 -0000      1.2
--- class.bo.inc.php    1 Feb 2002 04:24:29 -0000       1.2.2.1
***************
*** 61,70 ****
                        }
  
!                       global $start, $search, $filter, $cat_id;
  
!                       if(isset($start)) { $this->start = $start; }
!                       if(isset($search)) { $this->search = $search; }
!                       if(!empty($filter)) { $this->filter = $filter; }
!                       if(isset($cat_id)) { $this->cat_id = $cat_id; }
                }
  
--- 61,112 ----
                        }
  
!                       $_start   = $GLOBALS['HTTP_POST_VARS']['start']   ? 
$GLOBALS['HTTP_POST_VARS']['start']   : $GLOBALS['HTTP_GET_VARS']['start'];
!                       $_search  = $GLOBALS['HTTP_POST_VARS']['search']  ? 
$GLOBALS['HTTP_POST_VARS']['search']  : $GLOBALS['HTTP_GET_VARS']['search'];
!                       $_sort    = $GLOBALS['HTTP_POST_VARS']['sort']    ? 
$GLOBALS['HTTP_POST_VARS']['sort']    : $GLOBALS['HTTP_GET_VARS']['sort'];
!                       $_order   = $GLOBALS['HTTP_POST_VARS']['order']   ? 
$GLOBALS['HTTP_POST_VARS']['order']   : $GLOBALS['HTTP_GET_VARS']['order'];
!                       $_filter  = $GLOBALS['HTTP_POST_VARS']['filter']  ? 
$GLOBALS['HTTP_POST_VARS']['filter']  : $GLOBALS['HTTP_GET_VARS']['filter'];
!                       $_fcat_id = $GLOBALS['HTTP_POST_VARS']['fcat_id'] ? 
$GLOBALS['HTTP_POST_VARS']['fcat_id'] : $GLOBALS['HTTP_GET_VARS']['fcat_id'];
  
!                       if(!empty($_start) || ($_start == '0') || ($_start == 
0))
!                       {
!                               if($this->debug) { echo '<br>overriding $start: 
"' . $this->start . '" now "' . $_start . '"'; }
!                               $this->start = $_start;
!                       }
!                       if($_limit)
!                       {
!                               $this->limit  = $_limit;
!                       }
!                       if((empty($_search) && !empty($this->search)) || 
!empty($_search))
!                       {
!                               $this->search  = $_search;
!                       }
! 
!                       if(isset($_fcat_id) && !empty($_fcat_id))
!                       {
!                               $this->cat_id = $_fcat_id;
!                       }
!                       if((isset($GLOBALS['HTTP_POST_VARS']['fcat_id']) || 
isset($GLOBALS['HTTP_GET_VARS']['fcat_id'])) &&
!                               ($_fcat_id == '0' || $_fcat_id == 0 || 
$_fcat_id == ''))
!                       {
!                               $this->cat_id = 0;
!                       }
! 
!                       if(isset($_sort)   && !empty($_sort))
!                       {
!                               if($this->debug) { echo '<br>overriding $sort: 
"' . $this->sort . '" now "' . $_sort . '"'; }
!                               $this->sort   = $_sort;
!                       }
! 
!                       if(isset($_order)  && !empty($_order))
!                       {
!                               if($this->debug) { echo '<br>overriding $order: 
"' . $this->order . '" now "' . $_order . '"'; }
!                               $this->order  = $_order;
!                       }
! 
!                       if(isset($_filter) && !empty($_filter))
!                       {
!                               if($this->debug) { echo '<br>overriding 
$filter: "' . $this->filter . '" now "' . $_filter . '"'; }
!                               $this->filter = $_filter;
!                       }
                }
  

Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.ui.inc.php,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -r1.5.2.2 -r1.5.2.3
*** class.ui.inc.php    14 Jan 2002 20:53:53 -0000      1.5.2.2
--- class.ui.inc.php    1 Feb 2002 04:24:29 -0000       1.5.2.3
***************
*** 115,118 ****
--- 115,119 ----
  // --------------------------------- nextmatch ---------------------------
  
+                       $GLOBALS['query']  = $this->search;
                        $link_data = array
                        (
***************
*** 125,128 ****
--- 126,130 ----
                        $this->t->set_var('right',$right);
  
+                       $this->t->set_var('search',$this->search);
                        
$this->t->set_var('search_message',$this->nextmatchs->show_hits($this->bo->total_records,$this->start));