holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix checking of entry var and posted start/order/sort, etc.

Browse Source
This commit is contained in:
Miles Lott 2001-12-23 17:28:14 +00:00
parent 17dd3eb457
commit fcf1e0a7ec
2 changed files with 70 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
addressbook/inc/class.boaddressbook.inc.php
View File

@ -76,31 +76,71 @@
} }
/* _debug_array($GLOBALS['HTTP_POST_VARS']); */ /* _debug_array($GLOBALS['HTTP_POST_VARS']); */
/* Might change this to '' at the end---> */ /* Might change this to '' at the end---> */
$start = $GLOBALS['HTTP_POST_VARS']['start'] ? $GLOBALS['HTTP_POST_VARS']['start'] : $GLOBALS['HTTP_GET_VARS']['start']; $_start = $GLOBALS['HTTP_POST_VARS']['start'] ? $GLOBALS['HTTP_POST_VARS']['start'] : $GLOBALS['HTTP_GET_VARS']['start'];
$query = $GLOBALS['HTTP_POST_VARS']['query'] ? $GLOBALS['HTTP_POST_VARS']['query'] : $GLOBALS['HTTP_GET_VARS']['query']; $_query = $GLOBALS['HTTP_POST_VARS']['query'] ? $GLOBALS['HTTP_POST_VARS']['query'] : $GLOBALS['HTTP_GET_VARS']['query'];
$sort = $GLOBALS['HTTP_POST_VARS']['sort'] ? $GLOBALS['HTTP_POST_VARS']['sort'] : $GLOBALS['HTTP_GET_VARS']['sort']; $_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']; $_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']; $_filter = $GLOBALS['HTTP_POST_VARS']['filter'] ? $GLOBALS['HTTP_POST_VARS']['filter'] : $GLOBALS['HTTP_GET_VARS']['filter'];
$cat_id = $GLOBALS['HTTP_POST_VARS']['cat_id'] ? $GLOBALS['HTTP_POST_VARS']['cat_id'] : $GLOBALS['HTTP_GET_VARS']['cat_id']; $_cat_id = $GLOBALS['HTTP_POST_VARS']['cat_id'] ? $GLOBALS['HTTP_POST_VARS']['cat_id'] : $GLOBALS['HTTP_GET_VARS']['cat_id'];
$fcat_id = $GLOBALS['HTTP_POST_VARS']['fcat_id'] ? $GLOBALS['HTTP_POST_VARS']['fcat_id'] : $GLOBALS['HTTP_GET_VARS']['fcat_id']; $_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(!empty($_start) || ($_start == '0') || ($_start == 0))
{ {
if($this->debug) { echo '<br>overriding start: "' . $this->start . '" now "' . $start . '"'; } if($this->debug) { echo '<br>overriding $start: "' . $this->start . '" now "' . $_start . '"'; }
$this->start = $start; $this->start = $_start;
} }
if($limit) { $this->limit = $limit; } if($_limit)
if((empty($query) && !empty($this->query)) ||
!empty($query))
{ {
$this->query = $query; $this->limit = $_limit;
}
if((empty($_query) && !empty($this->query)) || !empty($_query))
{
$this->query = $_query;
} }
if(isset($fcat_id)) { $this->cat_id = $fcat_id; } if(isset($_fcat_id) && !empty($_fcat_id))
if($fcat_id == '0' || $fcat_id == 0 || $fcat_id == '') { $this->cat_id = 0; } {
if(isset($sort)) { $this->sort = $sort; } $this->cat_id = $_fcat_id;
if(isset($order)) { $this->order = $order; } }
if(isset($filter)) { $this->filter = $filter; } if($_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;
}
if($this->debug) { $this->_debug_sqsof(); }
}
function _debug_sqsof()
{
$data = array(
'start' => $this->start,
'limit' => $this->limit,
'query' => $this->query,
'sort' => $this->sort,
'order' => $this->order,
'filter' => $this->filter,
'cat_id' => $this->cat_id
);
echo '<br>BO:';
_debug_array($data);
} }
function list_methods($_type='xmlrpc') function list_methods($_type='xmlrpc')
@ -181,6 +221,7 @@
$this->order = $data['order']; $this->order = $data['order'];
$this->filter = $data['filter']; $this->filter = $data['filter'];
$this->cat_id = $data['cat_id']; $this->cat_id = $data['cat_id'];
if($this->debug) { echo '<br>read_sessiondata();'; $this->_debug_sqsof(); }
} }
function strip_html($dirty = '') function strip_html($dirty = '')

11
addressbook/inc/class.uiaddressbook.inc.php
View File

@ -63,6 +63,11 @@
$this->company = CreateObject('phpgwapi.categories','addressbook_company'); $this->company = CreateObject('phpgwapi.categories','addressbook_company');
$this->prefs = $GLOBALS['phpgw_info']['user']['preferences']['addressbook']; $this->prefs = $GLOBALS['phpgw_info']['user']['preferences']['addressbook'];
$this->_set_sessiondata();
}
function _set_sessiondata()
{
$this->start = $this->bo->start; $this->start = $this->bo->start;
$this->limit = $this->bo->limit; $this->limit = $this->bo->limit;
$this->query = $this->bo->query; $this->query = $this->bo->query;
@ -71,7 +76,6 @@
$this->filter = $this->bo->filter; $this->filter = $this->bo->filter;
$this->cat_id = $this->bo->cat_id; $this->cat_id = $this->bo->cat_id;
if($this->debug) { $this->_debug_sqsof(); } if($this->debug) { $this->_debug_sqsof(); }
/* _debug_array($this); */
} }
function _debug_sqsof() function _debug_sqsof()
@ -1151,6 +1155,11 @@
$entry = $GLOBALS['HTTP_POST_VARS']['entry']; $entry = $GLOBALS['HTTP_POST_VARS']['entry'];
$fcat_id = $GLOBALS['HTTP_POST_VARS']['fcat_id']; $fcat_id = $GLOBALS['HTTP_POST_VARS']['fcat_id'];
$test = unserialize(rawurldecode($entry));
if(!($test == $entry))
{
$entry = $test;
}
/* _debug_array($entry); exit; */ /* _debug_array($entry); exit; */
if (!$entry['bday_month'] && !$entry['bday_day'] && !$entry['bday_year']) if (!$entry['bday_month'] && !$entry['bday_day'] && !$entry['bday_year'])