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

fixing the fix ;-)

Browse Source
This commit is contained in:
Ralf Becker 2004-08-23 18:42:30 +00:00
parent 287e0fc91c
commit 6bd9c2fd4d
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
phpgwapi/inc/class.nextmatchs.inc.php
View File

@ -178,11 +178,14 @@
'lang_select' => lang('Select'), 'lang_select' => lang('Select'),
'cat_field' => $cat_field, 'cat_field' => $cat_field,
'categories' => $GLOBALS['phpgw']->categories->formated_list('select','all',$cat_id,'True'), 'categories' => $GLOBALS['phpgw']->categories->formated_list('select','all',$cat_id,'True'),
'filter_value' => $this->_filter, 'hidden' => $GLOBALS['phpgw']->html->input_hidden(array(
'filter' => $this->_filter,
'qfield' => $this->_qfield, 'qfield' => $this->_qfield,
'start_value' => (int)$localstart, 'start' => (int)$localstart,
'order_value' => $this->_order, 'order' => $this->_order,
'sort_value' => $this->_sort, 'sort' => $this->_sort,
'query' => $GLOBALS['query'],
)),
'query_value' => $GLOBALS['phpgw']->html->htmlspecialchars($GLOBALS['query']), 'query_value' => $GLOBALS['phpgw']->html->htmlspecialchars($GLOBALS['query']),
'table_width' => $twidth, 'table_width' => $twidth,
'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'],
@ -329,12 +332,12 @@
'form_action' => ($this->_menuaction?$this->page($extra):$GLOBALS['phpgw']->link($sn, $extra)), 'form_action' => ($this->_menuaction?$this->page($extra):$GLOBALS['phpgw']->link($sn, $extra)),
'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'],
'hidden' => $GLOBALS['phpgw']->html->input_hidden(array( 'hidden' => $GLOBALS['phpgw']->html->input_hidden(array(
'filter_value' => $this->_filter, 'filter' => $this->_filter,
'qfield_value' => $this->_qfield, 'qfield' => $this->_qfield,
'start_value' => 0, 'start' => 0,
'order_value' => $this->_order, 'order' => $this->_order,
'sort_value' => $this->_sort, 'sort' => $this->_sort,
'query_value' => $GLOBALS['query'], 'query' => $GLOBALS['query'],
)), )),
'search' => $this->search($search_obj), 'search' => $this->search($search_obj),
'filter' => ($filter_obj?$this->filter($filter_obj,$yours):'') 'filter' => ($filter_obj?$this->filter($filter_obj,$yours):'')
@ -362,12 +365,12 @@
'cat_field' => $cat_field, 'cat_field' => $cat_field,
'categories' => $GLOBALS['phpgw']->categories->formated_list('select','all',(int)$cat_id,'True'), 'categories' => $GLOBALS['phpgw']->categories->formated_list('select','all',(int)$cat_id,'True'),
'hidden' => $GLOBALS['phpgw']->html->input_hidden(array( 'hidden' => $GLOBALS['phpgw']->html->input_hidden(array(
'filter_value' => $this->_filter, 'filter' => $this->_filter,
'qfield_value' => $this->_qfield, 'qfield' => $this->_qfield,
'start_value' => 0, 'start' => 0,
'order_value' => $this->_order, 'order' => $this->_order,
'sort_value' => $this->_sort, 'sort' => $this->_sort,
'query_value' => $GLOBALS['query'], 'query' => $GLOBALS['query'],
)), )),
'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'],
'search' => $this->search($search_obj), 'search' => $this->search($search_obj),
@ -456,7 +459,7 @@
{ {
$this->_qfield = $search_obj[$index][0]; $this->_qfield = $search_obj[$index][0];
} }
$str .= '<option value="' . $search_obj[$index][0] . '"' . ($qfield == $search_obj[$index][0]?' selected':'') . '>' . lang($search_obj[$index][1]) . '</option>'; $str .= '<option value="' . $search_obj[$index][0] . '"' . ($this->_qfield == $search_obj[$index][0]?' selected':'') . '>' . lang($search_obj[$index][1]) . '</option>';
} }
$str = '<select name="qfield">' . $str . '</select>' . "\n"; $str = '<select name="qfield">' . $str . '</select>' . "\n";
} }
@ -661,7 +664,7 @@
$extra = $this->extras_to_string($extra); $extra = $this->extras_to_string($extra);
} }
$extravar = 'order='.$var.'&sort='.$sort.'&filter='.$this->_filter.'&this->_qfield='.$qfield.'&start='.$this->_start.'&query='.urlencode(stripslashes(@$GLOBALS['query'])).$extra; $extravar = 'order='.$var.'&sort='.$sort.'&filter='.$this->_filter.'&qfield='.$this->_qfield.'&start='.$this->_start.'&query='.urlencode(stripslashes(@$GLOBALS['query'])).$extra;
$link = ($this->_menuaction?$this->page($extravar):$GLOBALS['phpgw']->link($program,$extravar)); $link = ($this->_menuaction?$this->page($extravar):$GLOBALS['phpgw']->link($program,$extravar));