From 587fe4ed3539ea05126c8dc7bac27bcf2cab8302 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 11 Aug 2014 06:35:45 -0400
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
interface/lib/classes/tools_sites.inc.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/tools_sites.inc.php b/interface/lib/classes/tools_sites.inc.php
index 0fd5963..3400c5b 100644
--- a/interface/lib/classes/tools_sites.inc.php
+++ b/interface/lib/classes/tools_sites.inc.php
@@ -47,7 +47,7 @@
$name=str_replace('['.$keyword.']', $this->getClientID($dataRecord), $name);
break;
case 'DOMAINID':
- $name=str_replace('['.$keyword.']', $dataRecord['parent_domain_id'], $name);
+ $name=str_replace('['.$keyword.']', $dataRecord['parent_domain_id'] ? $dataRecord['parent_domain_id'] : '[DOMAINID]', $name);
break;
}
}
@@ -92,7 +92,7 @@
} elseif(isset($dataRecord['sys_groupid'])) {
$client_group_id = $dataRecord['sys_groupid'];
} else {
- $client_group_id = 0;
+ return '[CLIENTNAME]';
}
}
@@ -119,7 +119,7 @@
} elseif(isset($dataRecord['sys_groupid'])) {
$client_group_id = $dataRecord['sys_groupid'];
} else {
- $client_group_id = 0;
+ return '[CLIENTID]';
}
}
$tmp = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = " . $app->functions->intval($client_group_id));
--
Gitblit v1.9.1