[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] [19054] First try to fix the GLOBAL issues ...remove
From: |
Caeies |
Subject: |
[Phpgroupware-cvs] [19054] First try to fix the GLOBAL issues ...remove urlencode since it' s already done now in the link function, test in admin and addressbooks looks ok |
Date: |
Wed, 04 Feb 2009 18:11:11 +0000 |
Revision: 19054
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=19054
Author: Caeies
Date: 2009-02-04 18:11:10 +0000 (Wed, 04 Feb 2009)
Log Message:
-----------
First try to fix the GLOBAL issues ...remove urlencode since it's already done
now in the link function, test in admin and addressbooks looks ok
Modified Paths:
--------------
core/trunk/phpgwapi/inc/class.nextmatchs.inc.php
Modified: core/trunk/phpgwapi/inc/class.nextmatchs.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.nextmatchs.inc.php 2009-02-04 18:09:23 UTC
(rev 19053)
+++ core/trunk/phpgwapi/inc/class.nextmatchs.inc.php 2009-02-04 18:11:10 UTC
(rev 19054)
@@ -116,7 +116,8 @@
phpgw::get_var('qfield'),
phpgw::get_var('start'),
phpgw::get_var('order'),
- phpgw::get_var('sort')
+ phpgw::get_var('sort'),
+ phpgw::get_var('query')
);
}
@@ -210,7 +211,7 @@
*/
function show_tpl($sn,$localstart,$total,$extra, $twidth,
$bgtheme,$search_obj=0,$filter_obj=1,$showsearch=1,$yours=0,$cat_id=0,$cat_field='fcat_id')
{
- list($filter,$qfield,$start,$order,$sort) =
$this->get_var();
+ list($filter,$qfield,$start,$order,$sort,$query) =
$this->get_var();
$start = $localstart;
@@ -232,7 +233,7 @@
'start_value' => $start,
'order_value' => $order,
'sort_value' => $sort,
- 'query_value' => urlencode($query), //FIXME
this was the global
+ 'query_value' => $query,
'table_width' => $twidth,
'left' =>
$this->left($sn,$start,$total,$extra),
'search' =>
($showsearch?$this->search($search_obj):''),
@@ -333,9 +334,8 @@
*/
function left($scriptname,$start,$total,$extradata = '')
{
- list($filter,$qfield,,$order,$sort) = $this->get_var();
+ list($filter,$qfield,,$order,$sort,$query) =
$this->get_var();
- $query = isset($_REQUEST['query']) ?
urlencode(stripslashes($_REQUEST['query'])) : '';
$extravars = array
(
'order' => $order,
@@ -389,9 +389,8 @@
*/
function right($scriptname,$start,$total,$extradata = '')
{
- list($filter,$qfield,,$order,$sort) = $this->get_var();
+ list($filter,$qfield,,$order,$sort,$query) =
$this->get_var();
- $query = isset($_REQUEST['query']) ?
urlencode(stripslashes($_REQUEST['query'])) : '';
$extravars = Array(
'order' => $order,
'filter' => $filter,
@@ -435,7 +434,7 @@
*/
function
search_filter($search_obj=0,$filter_obj=1,$yours=0,$link='',$extra='')
{
- list($filter,$qfield,$start,$order,$sort) =
$this->get_var();
+ list($filter,$qfield,$start,$order,$sort,$query) =
$this->get_var();
$start = $localstart;
$var = array(
@@ -445,7 +444,7 @@
'start_value' => $start,
'order_value' => $order,
'sort_value' => $sort,
- 'query_value' => urlencode($query), //FIXME
was global
+ 'query_value' => $query,
'th_bg' =>
$GLOBALS['phpgw_info']['theme']['th_bg'],
'search' => $this->search($search_obj),
'filter' =>
($filter_obj?$this->filter($filter_obj,$yours):'')
@@ -461,7 +460,7 @@
*/
function
cats_search_filter($search_obj=0,$filter_obj=1,$yours=0,$cat_id=0,$cat_field='fcat_id',$link='',$extra='')
{
- list($filter,$qfield,$start,$order,$sort) =
$this->get_var();
+ list($filter,$qfield,$start,$order,$sort,$query) =
$this->get_var();
$start = $localstart;
$cats = createObject('phpgwapi.categories');
@@ -477,7 +476,7 @@
'start_value' => $start,
'order_value' => $order,
'sort_value' => $sort,
- 'query_value' => urlencode($query), //FIXME
was gloval
+ 'query_value' => $query,
'th_bg' =>
$GLOBALS['phpgw_info']['theme']['th_bg'],
'search' => $this->search($search_obj),
'filter' =>
($filter_obj?$this->filter($filter_obj,$yours):'')
@@ -789,10 +788,8 @@
unset($temp_format);
}
- $query = isset($_REQUEST['query']) ?
urlencode(stripslashes($_REQUEST['query'])) : '';
+ list($filter,$qfield,$start,$NULL1,$NULL,$query) =
$this->get_var();
- list($filter,$qfield,$start,$NULL1,$NULL) =
$this->get_var();
-
if(($order == $var) && ($sort == 'ASC'))
{
$sort = 'DESC';
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] [19054] First try to fix the GLOBAL issues ...remove urlencode since it' s already done now in the link function, test in admin and addressbooks looks ok,
Caeies <=