From 2d7d9eaa5acda62f1580bc09304ce85a7f7cea9f Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.net>
Date: Thu, 23 Jan 2014 13:40:54 -0500
Subject: [PATCH] Merge remote-tracking branch 'ispc3master/master' into vhostalias
---
interface/web/admin/users_edit.php | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/interface/web/admin/users_edit.php b/interface/web/admin/users_edit.php
index 5eab80a..2b1be7f 100644
--- a/interface/web/admin/users_edit.php
+++ b/interface/web/admin/users_edit.php
@@ -66,7 +66,14 @@
if(@is_array($this->dataRecord['modules']) && !in_array($this->dataRecord['startmodule'], $this->dataRecord['modules'])) {
$app->tform->errorMessage .= $app->tform->wordbook['startmodule_err'];
}
+
$this->oldDataRecord = $app->tform->getDataRecord($this->id);
+
+ //* A user that belongs to a client record (client or reseller) may not have typ admin
+ if(isset($this->dataRecord['typ']) && $this->dataRecord['typ'][0] == 'admin' && $this->oldDataRecord['client_id'] > 0) {
+ $app->tform->errorMessage .= $app->tform->wordbook['client_not_admin_err'];
+ }
+
}
/*
--
Gitblit v1.9.1