From 6e8071c5e2eb86a280180638a73ad80e7264f133 Mon Sep 17 00:00:00 2001
From: Dominik Müller <info@profi-webdesign.net>
Date: Sun, 19 Jan 2014 17:13:54 -0500
Subject: [PATCH] Merge branch 'vhostalias' of /home/git/repositories/renky/ispconfig3

---
 interface/web/sites/web_aliasdomain_edit.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/web/sites/web_aliasdomain_edit.php b/interface/web/sites/web_aliasdomain_edit.php
index b220011..e618a43 100644
--- a/interface/web/sites/web_aliasdomain_edit.php
+++ b/interface/web/sites/web_aliasdomain_edit.php
@@ -57,10 +57,10 @@
 
 		// we will check only users, not admins
 		if($_SESSION["s"]["user"]["typ"] == 'user') {
-			if(!$app->tform->checkClientLimit('limit_web_aliasdomain', "type = 'alias'")) {
+			if(!$app->tform->checkClientLimit('limit_web_aliasdomain',"(type = 'alias' OR type = 'vhostalias')")) {
 				$app->error($app->tform->wordbook["limit_web_aliasdomain_txt"]);
 			}
-			if(!$app->tform->checkResellerLimit('limit_web_aliasdomain', "type = 'alias'")) {
+			if(!$app->tform->checkResellerLimit('limit_web_aliasdomain',"(type = 'alias' OR type = 'vhostalias')")) {
 				$app->error('Reseller: '.$app->tform->wordbook["limit_web_aliasdomain_txt"]);
 			}
 		}

--
Gitblit v1.9.1