Commit 886a3b89 authored by tbrehm's avatar tbrehm

Fixed a problem that a site is assigned to the wrong client when it is created by a reseller.

parent 5b633597
...@@ -184,7 +184,7 @@ class page_action extends tform_actions { ...@@ -184,7 +184,7 @@ class page_action extends tform_actions {
function getClientName() { function getClientName() {
global $app, $conf; 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 // Get the group-id of the user
$client_group_id = $_SESSION["s"]["user"]["default_group"]; $client_group_id = $_SESSION["s"]["user"]["default_group"];
} else { } else {
......
...@@ -198,7 +198,7 @@ class page_action extends tform_actions { ...@@ -198,7 +198,7 @@ class page_action extends tform_actions {
function getClientName() { function getClientName() {
global $app, $conf; 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 // Get the group-id of the user
$client_group_id = $_SESSION["s"]["user"]["default_group"]; $client_group_id = $_SESSION["s"]["user"]["default_group"];
} else { } else {
......
...@@ -53,7 +53,7 @@ function replacePrefix($name, $dataRecord){ ...@@ -53,7 +53,7 @@ function replacePrefix($name, $dataRecord){
function getClientName($dataRecord) { function getClientName($dataRecord) {
global $app, $conf; 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 // Get the group-id of the user
$client_group_id = $_SESSION["s"]["user"]["default_group"]; $client_group_id = $_SESSION["s"]["user"]["default_group"];
} else { } else {
...@@ -79,7 +79,7 @@ function getClientName($dataRecord) { ...@@ -79,7 +79,7 @@ function getClientName($dataRecord) {
function getClientID($dataRecord) { function getClientID($dataRecord) {
global $app, $conf; 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 // Get the group-id of the user
$client_group_id = $_SESSION["s"]["user"]["default_group"]; $client_group_id = $_SESSION["s"]["user"]["default_group"];
} else { } else {
......
...@@ -254,7 +254,7 @@ class page_action extends tform_actions { ...@@ -254,7 +254,7 @@ class page_action extends tform_actions {
$document_root = str_replace("[website_id]",$this->id,$web_config["website_path"]); $document_root = str_replace("[website_id]",$this->id,$web_config["website_path"]);
// get the ID of the client // get the ID of the client
if($_SESSION["s"]["user"]["typ"] != 'admin') { if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
$client_group_id = $_SESSION["s"]["user"]["default_group"]; $client_group_id = $_SESSION["s"]["user"]["default_group"];
$client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = $client_group_id"); $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = $client_group_id");
$client_id = intval($client["client_id"]); $client_id = intval($client["client_id"]);
...@@ -342,7 +342,7 @@ class page_action extends tform_actions { ...@@ -342,7 +342,7 @@ class page_action extends tform_actions {
$client_id = intval($client["client_id"]); $client_id = intval($client["client_id"]);
} }
if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($this->dataRecord["client_group_id"]) && $this->dataRecord["client_group_id"] != $this->oldDataRecord["client_group_id"]) { if(($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) && isset($this->dataRecord["client_group_id"]) && $this->dataRecord["client_group_id"] != $this->oldDataRecord["client_group_id"]) {
// Set the values for document_root, system_user and system_group // Set the values for document_root, system_user and system_group
$system_user = 'web'.$this->id; $system_user = 'web'.$this->id;
$system_group = 'client'.$client_id; $system_group = 'client'.$client_id;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment