extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Now using get_var() from api

Browse Source
This commit is contained in:
Miles Lott 2002-02-28 04:23:16 +00:00
parent e61f24032b
commit 18c9bede9c
2 changed files with 26 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,6 @@
var $so; var $so;
var $start; var $start;
var $limit;
var $query; var $query;
var $sort; var $sort;
var $order; var $order;
@ -74,56 +73,22 @@
$this->read_sessiondata(); $this->read_sessiondata();
$this->use_session = True; $this->use_session = True;
} }
/* _debug_array($GLOBALS['HTTP_POST_VARS']); */
/* Might change this to '' at the end---> */
$_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'];
$_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'];
$_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'];
if(!empty($_start) || ($_start == '0') || ($_start == 0)) $start = get_var('start', array('POST','GET'));
{ $query = get_var('query', array('POST','GET'));
if($this->debug) { echo '<br>overriding $start: "' . $this->start . '" now "' . $_start . '"'; } $sort = get_var('sort', array('POST','GET'));
$this->start = $_start; $order = get_var('order', array('POST','GET'));
} $filter = get_var('filter', array('POST','GET'));
if($_limit) $cat_id = get_var('fcat_id', array('POST'));
{
$this->limit = $_limit;
}
if((empty($_query) && !empty($this->query)) || !empty($_query))
{
$this->query = $_query;
}
if(isset($_fcat_id) && !empty($_fcat_id)) $this->start = (!empty($start) || ($start == '0')) ? $start : $this->start;
{ $this->query = (empty($query) && !empty($this->query)) || !empty($query) ? $query : $this->query;
$this->cat_id = $_fcat_id; $this->sort = (!empty($sort)) ? $sort : $this->sort;
} $this->order = (!empty($order)) ? $order : $this->order;
if($_fcat_id == '0' || $_fcat_id == 0 || $_fcat_id == '') $this->filter = (!empty($filter) || ($filter == '0')) ? $filter : $this->filter;
{
$this->cat_id = 0;
}
if(isset($_sort) && !empty($_sort)) $this->cat_id = (isset($cat_id) && !empty($cat_id)) ? $cat_id : $this->cat_id;
{ $this->cat_id = ($cat_id == '0' || $cat_id == 0 || $cat_id == '') ? $cat_id : $this->cat_id;
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) if($this->debug)
{ {
@ -135,7 +100,6 @@
{ {
$data = array( $data = array(
'start' => $this->start, 'start' => $this->start,
'limit' => $this->limit,
'query' => $this->query, 'query' => $this->query,
'sort' => $this->sort, 'sort' => $this->sort,
'order' => $this->order, 'order' => $this->order,
@ -224,7 +188,6 @@
} }
$this->start = $data['start']; $this->start = $data['start'];
$this->limit = $data['limit'];
$this->query = $data['query']; $this->query = $data['query'];
$this->sort = $data['sort']; $this->sort = $data['sort'];
$this->order = $data['order']; $this->order = $data['order'];
@ -241,7 +204,7 @@
} }
for($i=0;$i<count($dirty);$i++) for($i=0;$i<count($dirty);$i++)
{ {
if(gettype($dirty[$i]) == 'array') if(is_array($dirty[$i]))
{ {
while(list($name,$value) = @each($dirty[$i])) while(list($name,$value) = @each($dirty[$i]))
{ {
@ -281,7 +244,7 @@
function add_vcard() function add_vcard()
{ {
global $uploadedfile; $uploadedfile = $GLOBALS['HTTP_POST_VARS']['uploadedfile'];
if($uploadedfile == 'none' || $uploadedfile == '') if($uploadedfile == 'none' || $uploadedfile == '')
{ {
@ -322,7 +285,8 @@
function add_email() function add_email()
{ {
global $name,$referer; $name = $GLOBALS['HTTP_GET_VARS']['name'];
$referer = $GLOBALS['HTTP_GET_VARS']['referer'];
$named = explode(' ', $name); $named = explode(' ', $name);
for($i=count($named);$i>=0;$i--) for($i=count($named);$i>=0;$i--)
@ -393,19 +357,19 @@
if(is_array($other)) if(is_array($other))
{ {
$GLOBALS['phpgw']->preferences->delete('addressbook','mainscreen_showbirthdays'); $GLOBALS['phpgw']->preferences->delete('addressbook','mainscreen_showbirthdays');
if($other['mainscreen_showbirthdays']) if($other['mainscreen_showbirthdays'])
{ {
$GLOBALS['phpgw']->preferences->add('addressbook','mainscreen_showbirthdays',True); $GLOBALS['phpgw']->preferences->add('addressbook','mainscreen_showbirthdays',True);
} }
$GLOBALS['phpgw']->preferences->delete('addressbook','default_filter'); $GLOBALS['phpgw']->preferences->delete('addressbook','default_filter');
if($other['default_filter']) if($other['default_filter'])
{ {
$GLOBALS['phpgw']->preferences->add('addressbook','default_filter',True); $GLOBALS['phpgw']->preferences->add('addressbook','default_filter',True);
} }
$GLOBALS['phpgw']->preferences->delete('addressbook','autosave_category'); $GLOBALS['phpgw']->preferences->delete('addressbook','autosave_category');
if($other['autosave_category']) if($other['autosave_category'])
{ {
$GLOBALS['phpgw']->preferences->add('addressbook','autosave_category',True); $GLOBALS['phpgw']->preferences->add('addressbook','autosave_category',True);
} }

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

@ -25,7 +25,6 @@
var $debug = False; var $debug = False;
var $start; var $start;
var $limit;
var $query; var $query;
var $sort; var $sort;
var $order; var $order;
@ -69,7 +68,6 @@
function _set_sessiondata() function _set_sessiondata()
{ {
$this->start = $this->bo->start; $this->start = $this->bo->start;
$this->limit = $this->bo->limit;
$this->query = $this->bo->query; $this->query = $this->bo->query;
$this->sort = $this->bo->sort; $this->sort = $this->bo->sort;
$this->order = $this->bo->order; $this->order = $this->bo->order;
@ -85,7 +83,6 @@
{ {
$data = array( $data = array(
'start' => $this->start, 'start' => $this->start,
'limit' => $this->limit,
'query' => $this->query, 'query' => $this->query,
'sort' => $this->sort, 'sort' => $this->sort,
'order' => $this->order, 'order' => $this->order,
@ -101,7 +98,6 @@
{ {
$data = array( $data = array(
'start' => $this->start, 'start' => $this->start,
'limit' => $this->limit,
'query' => $this->query, 'query' => $this->query,
'sort' => $this->sort, 'sort' => $this->sort,
'order' => $this->order, 'order' => $this->order,
@ -364,11 +360,11 @@
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] && if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0) $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
{ {
$this->limit = $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']; $limit = $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
} }
else else
{ {
$this->limit = 30; $limit = 30;
} }
/*global $filter; */ /*global $filter; */
@ -425,7 +421,7 @@
/* read the entry list */ /* read the entry list */
$entries = $this->bo->read_entries(array( $entries = $this->bo->read_entries(array(
'start' => $this->start, 'start' => $this->start,
'limit' => $this->limit, 'limit' => $limit,
'fields' => $columns_to_display, 'fields' => $columns_to_display,
'filter' => $qfilter, 'filter' => $qfilter,
'query' => $this->query, 'query' => $this->query,
@ -436,13 +432,13 @@
} }
/* global here so nextmatchs accepts our setting of $query and $filter */ /* global here so nextmatchs accepts our setting of $query and $filter */
$GLOBALS['query'] = $this->query; // $GLOBALS['query'] = $this->query;
$GLOBALS['filter'] = $this->filter; // $GLOBALS['filter'] = $this->filter;
$search_filter = $GLOBALS['phpgw']->nextmatchs->show_tpl('/index.php', $search_filter = $GLOBALS['phpgw']->nextmatchs->show_tpl('/index.php',
$this->start, $total_records,'&menuaction=addressbook.uiaddressbook.index&fcat_id='.$this->cat_id,'75%', $this->start, $total_records,'&menuaction=addressbook.uiaddressbook.index&fcat_id='.$this->cat_id,'75%',
$GLOBALS['phpgw_info']['theme']['th_bg'],1,1,1,1,$this->cat_id); $GLOBALS['phpgw_info']['theme']['th_bg'],1,1,1,1,$this->cat_id);
$query = $filter = ''; // $query = $filter = '';
$lang_showing = $GLOBALS['phpgw']->nextmatchs->show_hits($total_records,$this->start); $lang_showing = $GLOBALS['phpgw']->nextmatchs->show_hits($total_records,$this->start);