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

showing the query and keeping it when paging through the result

Browse Source
This commit is contained in:
Ralf Becker 2006-10-28 09:38:20 +00:00
parent 66abd0c259
commit 2e0e11d5a7
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
admin/inc/class.uiaccounts.inc.php
View File

@ -240,14 +240,10 @@
{ {
$cd = $param_cd; $cd = $param_cd;
} }
if(isset($_REQUEST['query'])) if(isset($_REQUEST['query']))
{ {
// limit query to limit characters $GLOBALS['query'] = $_REQUEST['query'];
if(eregi('^[a-z_0-9]+$',$_REQUEST['query']))
$GLOBALS['query'] = $_REQUEST['query'];
} }
if(isset($_REQUEST['start'])) if(isset($_REQUEST['start']))
{ {
$start = (int)$_REQUEST['start']; $start = (int)$_REQUEST['start'];
@ -300,7 +296,7 @@
) )
); );
$p->set_block('list','row','rows'); $p->set_block('list','row','rows');
$p->set_block('list','row_empty','row_empty'); $p->set_block('list','row_empty','no_rows');
$p->set_block('list','letter_search','letter_search_cells'); $p->set_block('list','letter_search','letter_search_cells');
$search_param = array( $search_param = array(
@ -321,12 +317,14 @@
'menuaction' => 'admin.uiaccounts.list_users', 'menuaction' => 'admin.uiaccounts.list_users',
'group_id' => $_REQUEST['group_id'], 'group_id' => $_REQUEST['group_id'],
'query_type' => $_REQUEST['query_type'], 'query_type' => $_REQUEST['query_type'],
'query' => $GLOBALS['query'],
); );
$uiaccountsel =& CreateObject('phpgwapi.uiaccountsel'); $uiaccountsel =& CreateObject('phpgwapi.uiaccountsel');
$p->set_var(array( $p->set_var(array(
'left_next_matchs' => $this->nextmatchs->left('/index.php',$start,$total,$link_data), 'left_next_matchs' => $this->nextmatchs->left('/index.php',$start,$total,$link_data),
'lang_showing' => ($_REQUEST['group_id'] ? $GLOBALS['egw']->common->grab_owner_name($_REQUEST['group_id']).': ' : ''). 'lang_showing' => ($_REQUEST['group_id'] ? $GLOBALS['egw']->common->grab_owner_name($_REQUEST['group_id']).': ' : '').
($GLOBALS['query'] ? lang("Search %1 '%2'",lang($uiaccountsel->query_types[$_REQUEST['query_type']]),$GLOBALS['query']).': ' : '') ($GLOBALS['query'] ? lang("Search %1 '%2'",lang($uiaccountsel->query_types[$_REQUEST['query_type']]),
$GLOBALS['egw']->html->htmlspecialchars($GLOBALS['query'])).': ' : '')
.$this->nextmatchs->show_hits($total,$start), .$this->nextmatchs->show_hits($total,$start),
'right_next_matchs' => $this->nextmatchs->right('/index.php',$start,$total,$link_data), 'right_next_matchs' => $this->nextmatchs->right('/index.php',$start,$total,$link_data),
'lang_loginid' => $this->nextmatchs->show_sort_order($sort,'account_lid',$order,'/index.php',lang('LoginID'),$link_data), 'lang_loginid' => $this->nextmatchs->show_sort_order($sort,'account_lid',$order,'/index.php',lang('LoginID'),$link_data),
@ -343,6 +341,7 @@
'sort' => $sort, 'sort' => $sort,
); );
$p->set_var(array( $p->set_var(array(
'query' => $GLOBALS['egw']->html->htmlspecialchars($GLOBALS['query']),
'query_type' => is_array($uiaccountsel->query_types) ? $GLOBALS['egw']->html->select('query_type',$_REQUEST['query_type'],$uiaccountsel->query_types) : '', 'query_type' => is_array($uiaccountsel->query_types) ? $GLOBALS['egw']->html->select('query_type',$_REQUEST['query_type'],$uiaccountsel->query_types) : '',
'lang_group' => lang('group'), 'lang_group' => lang('group'),
'group' => $uiaccountsel->selection('group_id','admin_uiaccount_listusers_group_id',$_REQUEST['group_id'],'groups',0,False,'','this.form.submit();',lang('all')), 'group' => $uiaccountsel->selection('group_id','admin_uiaccount_listusers_group_id',$_REQUEST['group_id'],'groups',0,False,'','this.form.submit();',lang('all')),

2
admin/templates/default/accounts.tpl
View File

@ -27,7 +27,7 @@
<td>{lang_group} {group}</td> <td>{lang_group} {group}</td>
<td align="right"> <td align="right">
{query_type} {query_type}
<input type="text" name="query"> <input type="text" name="query" value="{query}">
<input type="submit" name="search" value="{lang_search}"> <input type="submit" name="search" value="{lang_search}">
</td> </td>
</tr></table> </tr></table>