diff --git a/interface/web/admin/lib/lang/de_users_list.lng b/interface/web/admin/lib/lang/de_users_list.lng
index 2564b8dbfac72348b5f1be7fe709e9d8ea764fc9..b35551208ed49b9b03c4189b46366e5fa7b23e69 100644
--- a/interface/web/admin/lib/lang/de_users_list.lng
+++ b/interface/web/admin/lib/lang/de_users_list.lng
@@ -3,6 +3,7 @@ $wb['list_head_txt'] = 'Benutzer';
$wb['username_txt'] = 'Benutzername';
$wb["client_id_txt"] = 'Client ID';
$wb["active_txt"] = 'Aktiv';
+$wb["groups_txt"] = 'Gruppen';
$wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen';
$wb['warning_txt'] = '<b>WARNUNG:</b> Bitte hier keine Benutzereinstellungen verändern. Benutzen Sie die Kunden- und Resellereinstellungen im Kundenmodul. Modifizieren der Benutzer oder Gruppen hier könnte zum Datenverlust führen!';
?>
diff --git a/interface/web/admin/lib/lang/en_users_list.lng b/interface/web/admin/lib/lang/en_users_list.lng
index 44d7c88e84e4caedc8085528ed3cde177cb06e7f..d80eed172a02a5075110cbc2971d9035f11ebdcd 100644
--- a/interface/web/admin/lib/lang/en_users_list.lng
+++ b/interface/web/admin/lib/lang/en_users_list.lng
@@ -3,6 +3,7 @@ $wb["list_head_txt"] = 'Users';
$wb["username_txt"] = 'Username';
$wb["client_id_txt"] = 'Client ID';
$wb["active_txt"] = 'Active';
+$wb["groups_txt"] = 'Groups';
$wb["add_new_record_txt"] = 'Add new user';
$wb["warning_txt"] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
?>
\ No newline at end of file
diff --git a/interface/web/admin/list/users.list.php b/interface/web/admin/list/users.list.php
index bde04250f593858f61ede92edded5ebc9a78fbd4..69cd880fa20680712e890db8b2c6f17ff92ff4eb 100644
--- a/interface/web/admin/list/users.list.php
+++ b/interface/web/admin/list/users.list.php
@@ -10,13 +10,13 @@
*/
//* Name of the list
-$liste['name'] = 'users';
+$liste['name'] = 'users';
//* Database table
-$liste['table'] = 'sys_user';
+$liste['table'] = 'sys_user';
//* Primary index column
-$liste['table_idx'] = 'userid';
+$liste['table_idx'] = 'userid';
//* Search column prefix
$liste['search_prefix'] = 'search_';
@@ -25,10 +25,10 @@ $liste['search_prefix'] = 'search_';
$liste['records_per_page'] = "15";
//* Script file for list
-$liste['file'] = 'users_list.php';
+$liste['file'] = 'users_list.php';
//* Script file to edit
-$liste['edit_file'] = 'users_edit.php';
+$liste['edit_file'] = 'users_edit.php';
//* Script file to delete
$liste['delete_file'] = 'users_del.php';
@@ -37,37 +37,43 @@ $liste['delete_file'] = 'users_del.php';
$liste['paging_tpl'] = 'templates/paging.tpl.htm';
//* Enable auth
-$liste['auth'] = 'no';
+$liste['auth'] = 'no';
/*****************************************************
* Suchfelder
*****************************************************/
-$liste["item"][] = array( 'field' => "client_id",
- 'datatype' => "INTEGER",
- 'formtype' => "TEXT",
- 'op' => "=",
- 'prefix' => "",
- 'suffix' => "",
- 'width' => "",
- 'value' => "");
-
-$liste["item"][] = array( 'field' => "active",
- 'datatype' => "VARCHAR",
- 'formtype' => "SELECT",
- 'op' => "=",
- 'prefix' => "",
- 'suffix' => "",
- 'width' => "",
- 'value' => array('1' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>",'0' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
-
-
-$liste['item'][] = array( 'field' => 'username',
- 'datatype' => 'VARCHAR',
- 'op' => 'like',
- 'prefix' => '%',
- 'suffix' => '%',
- 'width' => '');
+$liste["item"][] = array( 'field' => "client_id",
+ 'datatype' => "INTEGER",
+ 'formtype' => "TEXT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'width' => "",
+ 'value' => "");
+
+$liste["item"][] = array( 'field' => "active",
+ 'datatype' => "VARCHAR",
+ 'formtype' => "SELECT",
+ 'op' => "=",
+ 'prefix' => "",
+ 'suffix' => "",
+ 'width' => "",
+ 'value' => array('1' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>",'0' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
+
+$liste['item'][] = array( 'field' => 'username',
+ 'datatype' => 'VARCHAR',
+ 'op' => 'like',
+ 'prefix' => '%',
+ 'suffix' => '%',
+ 'width' => '');
+
+$liste['item'][] = array( 'field' => 'groups',
+ 'datatype' => 'VARCHAR',
+ 'op' => 'like',
+ 'prefix' => '%',
+ 'suffix' => '%',
+ 'width' => '');
?>
\ No newline at end of file
diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm
index 2f2c393870c08b712ab11c4d667923994f60ea7f..d66228162677537a3f3dca5ce8b0909d51462384 100644
--- a/interface/web/admin/templates/users_list.htm
+++ b/interface/web/admin/templates/users_list.htm
@@ -22,12 +22,14 @@
<th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
<th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
<th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
+ <th class="tbl_col_groups" scope="col"><tmpl_var name="groups_txt"></th>
<th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
</tr>
<tr>
<td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
<td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
<td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+ <td class="tbl_col_groups"><select name="search_groups">{tmpl_var name='search_groups'}</select></td>
<td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
</tr>
</thead>
@@ -37,6 +39,7 @@
<td class="tbl_col_client_id"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
<td class="tbl_col_active"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
<td class="tbl_col_username"><a href="#" onClick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
+ <td class="tbl_col_groups">{tmpl_var name="groups"}</td>
<td class="tbl_col_buttons">
<div class="buttons icons16">
<tmpl_if name="username" op="!=" value="admin">