From 2d4162dd3e81a9e981560b37098339b1b532251e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 19 Oct 2012 04:15:46 -0400
Subject: [PATCH] Fixed: FS#2478 - apache ssl certificate issue on multi server environment - Added missing language strings to german language file.
---
interface/web/sites/lib/lang/de_aps.lng | 2 +-
server/plugins-available/apache2_plugin.inc.php | 4 ++--
interface/web/mail/lib/lang/de.lng | 1 +
server/plugins-available/nginx_plugin.inc.php | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/interface/web/mail/lib/lang/de.lng b/interface/web/mail/lib/lang/de.lng
index d0d38de..29e7cbd 100644
--- a/interface/web/mail/lib/lang/de.lng
+++ b/interface/web/mail/lib/lang/de.lng
@@ -37,6 +37,7 @@
$wb['Server Settings'] = "Servereinstellungen";
$wb['Fetchmail'] = "E-Mail Sammeldienst";
$wb['Mailbox traffic'] = "E-Mail Konto Datenverkehr";
+$wb['Mailbox quota'] = "E-Mail Konto Belegung";
$wb['Statistics'] = "Statistiken";
$wb['Postfix Whitelist'] = "Postfix Whitelist";
$wb['Postfix Blacklist'] = "Postfix Blacklist";
diff --git a/interface/web/sites/lib/lang/de_aps.lng b/interface/web/sites/lib/lang/de_aps.lng
index 7b224ce..5263f8d 100644
--- a/interface/web/sites/lib/lang/de_aps.lng
+++ b/interface/web/sites/lib/lang/de_aps.lng
@@ -28,7 +28,7 @@
$wb['install_location_txt'] = 'Installationsort';
$wb['btn_install_txt'] = 'Installieren';
$wb['btn_cancel_txt'] = 'Abbrechen';
-$wb['acceptance_txt'] = 'Lizenzvereinbarung';
+$wb['acceptance_txt'] = 'Lizenzvereinbarung akzeptieren';
$wb['acceptance_text_txt'] = 'Ja, ich habe die Lizenzvereinbarung gelesen und akzeptiere sie.';
$wb['install_language_txt'] = 'Sprache der Oberfläche';
$wb['new_database_password_txt'] = 'Datenbank Passwort';
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 0a5523c..327d63b 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -115,8 +115,8 @@
$csr_file = $ssl_dir.'/'.$domain.'.csr';
$crt_file = $ssl_dir.'/'.$domain.'.crt';
- //* Create a SSL Certificate
- if($data['new']['ssl_action'] == 'create') {
+ //* Create a SSL Certificate, but only if this is not a mirror server.
+ if($data['new']['ssl_action'] == 'create' && $conf['mirror_server_id'] == 0) {
$this->ssl_certificate_changed = true;
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 7a329c1..a0e8314 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -115,7 +115,7 @@
$crt_file = $ssl_dir.'/'.$domain.'.crt';
//* Create a SSL Certificate
- if($data['new']['ssl_action'] == 'create') {
+ if($data['new']['ssl_action'] == 'create' && $conf['mirror_server_id'] == 0) {
$this->ssl_certificate_changed = true;
--
Gitblit v1.9.1