From 2e0e11d5a77ff4132237dd9815fabd3fa8e3edda Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 28 Oct 2006 09:38:20 +0000
Subject: [PATCH] showing the query and keeping it when paging through the
 result

---
 admin/inc/class.uiaccounts.inc.php   | 13 ++++++-------
 admin/templates/default/accounts.tpl |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php
index 6bfb72659b..70e3535f0b 100755
--- a/admin/inc/class.uiaccounts.inc.php
+++ b/admin/inc/class.uiaccounts.inc.php
@@ -240,14 +240,10 @@
 			{
 				$cd = $param_cd;
 			}
-			
 			if(isset($_REQUEST['query']))
 			{
-				// limit query to limit characters
-				if(eregi('^[a-z_0-9]+$',$_REQUEST['query']))
-					$GLOBALS['query'] = $_REQUEST['query'];
+				$GLOBALS['query'] = $_REQUEST['query'];
 			}
-			
 			if(isset($_REQUEST['start']))
 			{
 				$start = (int)$_REQUEST['start'];
@@ -300,7 +296,7 @@
 				)
 			);
 			$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');
 
 			$search_param = array(
@@ -321,12 +317,14 @@
 				'menuaction' => 'admin.uiaccounts.list_users',
 				'group_id'   => $_REQUEST['group_id'],
 				'query_type' => $_REQUEST['query_type'],
+				'query'      => $GLOBALS['query'],
 			);
 			$uiaccountsel =& CreateObject('phpgwapi.uiaccountsel');
 			$p->set_var(array(
 				'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']).': ' : '').
-					($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),
 				'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),
@@ -343,6 +341,7 @@
 				'sort'       => $sort,
 			);
 			$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) : '',
 				'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')),
diff --git a/admin/templates/default/accounts.tpl b/admin/templates/default/accounts.tpl
index b077ff1764..ef398ce516 100644
--- a/admin/templates/default/accounts.tpl
+++ b/admin/templates/default/accounts.tpl
@@ -27,7 +27,7 @@
 					<td>{lang_group} {group}</td>
 					<td align="right">
 						{query_type}
-						<input type="text" name="query">
+						<input type="text" name="query" value="{query}">
 						<input type="submit" name="search" value="{lang_search}">
 					</td>
 				</tr></table>