From c2f53e76fde1ab534e67a9227d4f0adcde05dfa4 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 28 Oct 2009 14:05:37 -0400
Subject: [PATCH] Fix in maildrop plugin.
---
interface/web/sites/shell_user_edit.php | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/interface/web/sites/shell_user_edit.php b/interface/web/sites/shell_user_edit.php
index 2778294..c3102cd 100644
--- a/interface/web/sites/shell_user_edit.php
+++ b/interface/web/sites/shell_user_edit.php
@@ -56,17 +56,11 @@
// we will check only users, not admins
if($_SESSION["s"]["user"]["typ"] == 'user') {
-
- // Get the limits of the client
- $client_group_id = $_SESSION["s"]["user"]["default_group"];
- $client = $app->db->queryOneRecord("SELECT limit_shell_user FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
-
- // Check if the user may add another shell user.
- if($client["limit_shell_user"] >= 0) {
- $tmp = $app->db->queryOneRecord("SELECT count(shell_user_id) as number FROM shell_user WHERE sys_groupid = $client_group_id");
- if($tmp["number"] >= $client["limit_shell_user"]) {
- $app->error($app->tform->wordbook["limit_shell_user_txt"]);
- }
+ if(!$app->tform->checkClientLimit('limit_shell_user')) {
+ $app->error($app->tform->wordbook["limit_shell_user_txt"]);
+ }
+ if(!$app->tform->checkResellerLimit('limit_shell_user')) {
+ $app->error('Reseller: '.$app->tform->wordbook["limit_shell_user_txt"]);
}
}
@@ -204,7 +198,7 @@
function getClientName() {
global $app, $conf;
- if($_SESSION["s"]["user"]["typ"] != 'admin') {
+ if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
// Get the group-id of the user
$client_group_id = $_SESSION["s"]["user"]["default_group"];
} else {
--
Gitblit v1.9.1