From cc65688b3da3e16729a1f73dd50fd975bd1ff741 Mon Sep 17 00:00:00 2001
From: hellkat <hellkat@ispconfig3>
Date: Tue, 26 Mar 2013 00:43:51 -0400
Subject: [PATCH]     Merged revisions 3845-3876 and 3879-3918 from stable branch.

---
 interface/web/admin/users_list.php |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/interface/web/admin/users_list.php b/interface/web/admin/users_list.php
index 105922d..ae0bca5 100644
--- a/interface/web/admin/users_list.php
+++ b/interface/web/admin/users_list.php
@@ -41,13 +41,11 @@
 * End Form configuration
 ******************************************/
 
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
-	header("Location: ../index.php");
-	exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
 
 $app->uses('listform_actions');
+$app->listform_actions->SQLOrderBy = 'ORDER BY username';
 $app->listform_actions->onLoad();
 
 

--
Gitblit v1.9.1