From 9c7092292b2848856cba6cb7e9baf7fc230154a1 Mon Sep 17 00:00:00 2001
From: Johannes Feichtner
Date: Wed, 10 Feb 2016 14:27:20 +0100
Subject: [PATCH] Feature: Make the MYSQL_PASSWORD string definable once in
order to be able to copy the fragments without further change
---
lng/english.lng.php | 2 ++
lng/german.lng.php | 4 +++-
.../Sparkle/admin/configfiles/configfiles.tpl | 4 ++++
templates/Sparkle/assets/js/main.js | 15 +++++++++++++++
4 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/lng/english.lng.php b/lng/english.lng.php
index b6903bc1..0bd2144c 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -1968,3 +1968,5 @@ $lng['admin']['server_php'] = 'PHP';
// Added for Termination-date
$lng['domains']['termination_date'] = 'Date of termination';
$lng['domains']['termination_date_overview'] = 'canceled until ';
+
+$lng['panel']['set'] = 'Apply';
\ No newline at end of file
diff --git a/lng/german.lng.php b/lng/german.lng.php
index 70166614..70e46c51 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -1498,7 +1498,7 @@ $lng['logger']['cron'] = "Cronjob";
$lng['logger']['login'] = "Login";
$lng['logger']['intern'] = "Intern";
$lng['logger']['unknown'] = "Unbekannt";
-$lng['serversettings']['mailtraffic_enabled']['title'] = "Analysiere Mailtraffic";
+$lng['serversettings']['mailtraffic_enabled']['title'] = "Analysiere Mailtraffic";
$lng['serversettings']['mailtraffic_enabled']['description'] = "Aktiviere das analysieren der Logdateien des Mailsystems um den verbrauchten Traffic zu berechnen";
$lng['serversettings']['mdaserver']['title'] = "Typ des MDA";
$lng['serversettings']['mdaserver']['description'] = "Der eingesetzte Mail Delivery Server";
@@ -1608,3 +1608,5 @@ $lng['domains']['ssl_redirect_temporarilydisabled'] = "
Die SSL-Umleitung ist
// Added for Termination-date
$lng['domains']['termination_date'] = 'Kündigungsdatum';
$lng['domains']['termination_date_overview'] = 'gekündigt zum ';
+
+$lng['panel']['set'] = 'Setzen';
\ No newline at end of file
diff --git a/templates/Sparkle/admin/configfiles/configfiles.tpl b/templates/Sparkle/admin/configfiles/configfiles.tpl
index cd017af0..f35b4051 100644
--- a/templates/Sparkle/admin/configfiles/configfiles.tpl
+++ b/templates/Sparkle/admin/configfiles/configfiles.tpl
@@ -26,6 +26,10 @@ ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero
eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,
no sea takimata sanctus est Lorem ipsum dolor sit amet.
+
diff --git a/templates/Sparkle/assets/js/main.js b/templates/Sparkle/assets/js/main.js
index 4667924f..2eaa6f3c 100644
--- a/templates/Sparkle/assets/js/main.js
+++ b/templates/Sparkle/assets/js/main.js
@@ -202,4 +202,19 @@ $(document).ready(function() {
$("#mailTemplate").html(mailOptions);
});
$("#mailLanguage").trigger("change");
+
+ // Config files
+ var configfileTextareas = $("textarea.filecontent, textarea.shell");
+ var lastPw = "MYSQL_PASSWORD";
+ $("#configfiles_setmysqlpw").submit(function(event) {
+ event.preventDefault();
+ var inputVal = $("#configfiles_mysqlpw").val();
+ if (!inputVal.trim()) {
+ inputVal = "MYSQL_PASSWORD";
+ }
+ configfileTextareas.each(function() {
+ this.value = this.value.replace(lastPw, inputVal);
+ });
+ lastPw = inputVal;
+ });
});
\ No newline at end of file