From 032b867c6a157f2a3a9be733a320e4a8259dfea2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 30 Jul 2014 02:28:04 -0400
Subject: [PATCH] Fixed: FS#3555 - dovecot-sql.conf: add server_id
---
server/plugins-available/apache2_plugin.inc.php | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 525592d..b1411c9 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -344,7 +344,8 @@
if($data['new']['type'] == 'vhost' || $data['new']['type'] == 'vhostsubdomain') $app->log('document_root not set', LOGLEVEL_WARN);
return 0;
}
- if($data['new']['system_user'] == 'root' or $data['new']['system_group'] == 'root') {
+ if(!$app->system->is_allowed_user($data['new']['system_user'], false, true)
+ || !$app->system->is_allowed_group($data['new']['system_group'], false, true)) {
$app->log('Websites cannot be owned by the root user or group.', LOGLEVEL_WARN);
return 0;
}
@@ -2951,8 +2952,6 @@
$seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
$seo_redirects[$prefix.'seo_redirect_operator'] = '!';
}
-
- $seo_redirects[$prefix.'seo_base_domain'] = str_replace('.', '\.', $web['domain']);
return $seo_redirects;
}
--
Gitblit v1.9.1