maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #314 from Churro/froxlorMerge_ce6cc23

Browse Source 
Feature: Make the MYSQL_PASSWORD string dynamically definable
This commit is contained in:
Michael Kaufmann
2016-02-20 22:17:49 +01:00
parent 4bec449a26 9c7092292b
commit a6bd323a0e
4 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lng/english.lng.php
View File

@@ -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';

4
lng/german.lng.php
View File

@@ -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'] = "<br>Die SSL-Umleitung ist
// Added for Termination-date
$lng['domains']['termination_date'] = 'K&uuml;ndigungsdatum';
$lng['domains']['termination_date_overview'] = 'gek&uuml;ndigt zum ';
$lng['panel']['set'] = 'Setzen';

4
templates/Sparkle/admin/configfiles/configfiles.tpl vendored
View File

@@ -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.</textarea>
</p>
<form id="configfiles_setmysqlpw" action="#">
MYSQL_PASSWORD: <input type="text" class="text" id="configfiles_mysqlpw" name="configfiles_mysqlpw" value="" />
<input type="submit" value="{$lng['panel']['set']}" />
</form>
</div>
</section>

15
templates/Sparkle/assets/js/main.js vendored
View File

@@ -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;
});
});