From d8faa4e7e3fb74e554f6c9339f6fe4e2883c3bf1 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 18 Sep 2015 13:43:03 -0400
Subject: [PATCH] Fix by dirkd: Since file() doesn't remove "\n" from the lines read the condition $lines[$l] == '' never evaluated to true. So $mailHeaders would always contain every line from the template while $mailBody contained none of them.

---
 interface/web/admin/lib/lang/fr_server_ip.lng |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/interface/web/admin/lib/lang/fr_server_ip.lng b/interface/web/admin/lib/lang/fr_server_ip.lng
index 52d2b61..5c2f23e 100644
--- a/interface/web/admin/lib/lang/fr_server_ip.lng
+++ b/interface/web/admin/lib/lang/fr_server_ip.lng
@@ -1,9 +1,11 @@
 <?php
-$wb['server_id_txt'] = "Serveur";
-$wb['ip_address_txt'] = "Adresse IP";
-$wb['virtualhost_txt'] = "HTTP NameVirtualHost";
-$wb['ip_error_wrong'] = "L'adresse IP est invalide";
-$wb['ip_error_unique'] = "L'adresse IP doit être unique";
+$wb['server_id_txt'] = 'Serveur';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['virtualhost_txt'] = 'NameVirtualHost HTTP';
+$wb['ip_error_wrong'] = 'L\'adresse IP est invalide';
+$wb['ip_error_unique'] = 'L\'adresse IP doit être unique';
+$wb['client_id_txt'] = 'Client';
+$wb['ip_type_txt'] = 'Type';
+$wb['virtualhost_port_txt'] = 'HTTP Ports';
+$wb['error_port_syntax'] = 'Invalid chars in port field, please enter only comma separated numbers. Example: 80,443';
 ?>
-
-

--
Gitblit v1.9.1