From fb3a98c0f06fb14a188e5a020936768fa04cb205 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 22 Oct 2010 06:24:31 -0400
Subject: [PATCH] Merged serveral bugfixes and new language files from stable branch (revisions 2055 - 2093)
---
interface/web/client/reseller_edit.php | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/interface/web/client/reseller_edit.php b/interface/web/client/reseller_edit.php
index 44c65be..1c9a2a1 100644
--- a/interface/web/client/reseller_edit.php
+++ b/interface/web/client/reseller_edit.php
@@ -144,7 +144,7 @@
$username = $app->db->quote($this->dataRecord["username"]);
$password = $app->db->quote($this->dataRecord["password"]);
$modules = $conf['interface_modules_enabled'] . ',client';
- $startmodule = 'client';
+ $startmodule = (stristr($modules,'dashboard'))?'dashboard':'client';
$usertheme = $app->db->quote($this->dataRecord["usertheme"]);
$type = 'user';
$active = 1;
@@ -200,6 +200,13 @@
$app->db->query($sql);
}
+ // ensure that a reseller is not converted to a client in demo mode when client_id <= 2
+ if($conf['demo_mode'] == true && $this->id <= 2) {
+ if(isset($this->dataRecord["limit_client"]) && $this->dataRecord["limit_client"] != -1) {
+ $app->db->query('UPDATE client set limit_client = -1 WHERE client_id = '.$this->id);
+ }
+ }
+
// reseller status changed
if(isset($this->dataRecord["limit_client"]) && $this->dataRecord["limit_client"] != $this->oldDataRecord["limit_client"]) {
$modules = $conf['interface_modules_enabled'] . ',client';
--
Gitblit v1.9.1