[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: wcm/inc class.boelement.inc.php,1.7,1.8 class.bo
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: wcm/inc class.boelement.inc.php,1.7,1.8 class.bopage.inc.php,1.3,1.4 class.bosite.inc.php,1.15,1.16 class.uielement.inc.php,1.15,1.16 class.uipage.inc.php,1.17,1.18 class.uisite.inc.php,1.12,1.13 |
|
Date: |
Wed, 27 Feb 2002 23:40:23 -0500 |
Update of /cvsroot/phpgroupware/wcm/inc
In directory subversions:/tmp/cvs-serv19731/inc
Modified Files:
class.boelement.inc.php class.bopage.inc.php
class.bosite.inc.php class.uielement.inc.php
class.uipage.inc.php class.uisite.inc.php
Log Message:
Using get_var() now; also fixed setting of query string in template
Index: class.boelement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.boelement.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.boelement.inc.php 19 Feb 2002 13:57:48 -0000 1.7
--- class.boelement.inc.php 28 Feb 2002 04:40:20 -0000 1.8
***************
*** 50,72 ****
}
! $start = $GLOBALS['start'];
! $query = $GLOBALS['query'];
! $sort = $GLOBALS['sort'];
! $order = $GLOBALS['order'];
! if(!empty($start) || ($start == '0') || ($start == 0))
! {
! if($this->debug) { echo '<br>overriding start:
"' . $this->start . '" now "' . $start . '"'; }
! $this->start = $start;
! }
!
! if((empty($query) && !empty($this->query)) ||
!empty($query))
! {
! $this->query = $query;
! }
!
! if($limit) { $this->limit = $limit; }
! if(isset($sort)) { $this->sort = $sort; }
! if(isset($order)) { $this->order = $order; }
$this->hooks = array(
--- 50,60 ----
}
! $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'));
! $this->start = (!empty($start) || ($start == '0')) ?
$start : $this->start;
! $this->query = (empty($query) && !empty($this->query))
|| !empty($query) ? $query : $this->query;
$this->hooks = array(
Index: class.bopage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.bopage.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.bopage.inc.php 14 Feb 2002 01:04:13 -0000 1.3
--- class.bopage.inc.php 28 Feb 2002 04:40:20 -0000 1.4
***************
*** 52,74 ****
}
! $start = $GLOBALS['start'];
! $query = $GLOBALS['query'];
! $sort = $GLOBALS['sort'];
! $order = $GLOBALS['order'];
! if(!empty($start) || ($start == '0') || ($start == 0))
! {
! if($this->debug) { echo '<br>overriding start:
"' . $this->start . '" now "' . $start . '"'; }
! $this->start = $start;
! }
!
! if((empty($query) && !empty($this->query)) ||
!empty($query))
! {
! $this->query = $query;
! }
!
! if($limit) { $this->limit = $limit; }
! if(isset($sort)) { $this->sort = $sort; }
! if(isset($order)) { $this->order = $order; }
}
--- 52,62 ----
}
! $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'));
! $this->start = (!empty($start) || ($start == '0')) ?
$start : $this->start;
! $this->query = (empty($query) && !empty($this->query))
|| !empty($query) ? $query : $this->query;
}
Index: class.bosite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.bosite.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.bosite.inc.php 27 Feb 2002 05:14:44 -0000 1.15
--- class.bosite.inc.php 28 Feb 2002 04:40:20 -0000 1.16
***************
*** 60,82 ****
}
! $start = $GLOBALS['start'];
! $query = $GLOBALS['query'];
! $sort = $GLOBALS['sort'];
! $order = $GLOBALS['order'];
! if(!empty($start) || ($start == '0') || ($start == 0))
! {
! if($this->debug) { echo '<br>overriding start:
"' . $this->start . '" now "' . $start . '"'; }
! $this->start = $start;
! }
!
! if((empty($query) && !empty($this->query)) ||
!empty($query))
! {
! $this->query = $query;
! }
!
! if($limit) { $this->limit = $limit; }
! if(isset($sort)) { $this->sort = $sort; }
! if(isset($order)) { $this->order = $order; }
}
--- 60,70 ----
}
! $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'));
! $this->start = (!empty($start) || ($start == '0')) ?
$start : $this->start;
! $this->query = (empty($query) && !empty($this->query))
|| !empty($query) ? $query : $this->query;
}
Index: class.uielement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uielement.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.uielement.inc.php 27 Feb 2002 05:14:44 -0000 1.15
--- class.uielement.inc.php 28 Feb 2002 04:40:20 -0000 1.16
***************
*** 45,49 ****
$this->start = $this->bo->start;
- $this->limit = $this->bo->limit;
$this->query = $this->bo->query;
$this->sort = $this->bo->sort;
--- 45,48 ----
***************
*** 57,61 ****
$data = array(
'start' => $this->start,
- 'limit' => $this->limit,
'query' => $this->query,
'sort' => $this->sort,
--- 56,59 ----
***************
*** 70,74 ****
$data = array(
'start' => $this->start,
- 'limit' => $this->limit,
'query' => $this->query,
'sort' => $this->sort,
--- 68,71 ----
***************
*** 173,176 ****
--- 170,174 ----
$GLOBALS['phpgw']->template->set_var('title_elements',lang('Elements'));
$GLOBALS['phpgw']->template->set_var('lang_search',lang('Search'));
+
$GLOBALS['phpgw']->template->set_var('query',$this->query);
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uielement.index'));
$GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
Index: class.uipage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uipage.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.uipage.inc.php 25 Feb 2002 00:09:00 -0000 1.17
--- class.uipage.inc.php 28 Feb 2002 04:40:20 -0000 1.18
***************
*** 40,44 ****
$this->start = $this->bo->start;
- $this->limit = $this->bo->limit;
$this->query = $this->bo->query;
$this->sort = $this->bo->sort;
--- 40,43 ----
***************
*** 52,56 ****
$data = array(
'start' => $this->start,
- 'limit' => $this->limit,
'query' => $this->query,
'sort' => $this->sort,
--- 51,54 ----
***************
*** 65,69 ****
$data = array(
'start' => $this->start,
- 'limit' => $this->limit,
'query' => $this->query,
'sort' => $this->sort,
--- 63,66 ----
***************
*** 121,124 ****
--- 118,122 ----
$GLOBALS['phpgw']->template->set_var('title_pages',lang('Pages'));
$GLOBALS['phpgw']->template->set_var('lang_search',lang('Search'));
+
$GLOBALS['phpgw']->template->set_var('query',$this->query);
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.index'));
$GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
Index: class.uisite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uisite.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uisite.inc.php 24 Feb 2002 22:36:39 -0000 1.12
--- class.uisite.inc.php 28 Feb 2002 04:40:20 -0000 1.13
***************
*** 40,44 ****
$this->start = $this->bo->start;
- $this->limit = $this->bo->limit;
$this->query = $this->bo->query;
$this->sort = $this->bo->sort;
--- 40,43 ----
***************
*** 52,56 ****
$data = array(
'start' => $this->start,
- 'limit' => $this->limit,
'query' => $this->query,
'sort' => $this->sort,
--- 51,54 ----
***************
*** 65,69 ****
$data = array(
'start' => $this->start,
- 'limit' => $this->limit,
'query' => $this->query,
'sort' => $this->sort,
--- 63,66 ----
***************
*** 121,124 ****
--- 118,122 ----
$GLOBALS['phpgw']->template->set_var('title_sites',lang('Web Sites'));
$GLOBALS['phpgw']->template->set_var('lang_search',lang('Search'));
+
$GLOBALS['phpgw']->template->set_var('query',$this->query);
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.index'));
$GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: wcm/inc class.boelement.inc.php,1.7,1.8 class.bopage.inc.php,1.3,1.4 class.bosite.inc.php,1.15,1.16 class.uielement.inc.php,1.15,1.16 class.uipage.inc.php,1.17,1.18 class.uisite.inc.php,1.12,1.13,
Miles Lott <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: wcm/templates/default listelements.tpl,1.5,1.6 listpages.tpl,1.5,1.6 listsites.tpl,1.3,1.4
- Previous by thread:
[Phpgroupware-cvs] CVS: wcm/templates/default listelements.tpl,1.5,1.6 listpages.tpl,1.5,1.6 listsites.tpl,1.3,1.4
- Index(es):