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

- fix missing language-entries for usage-mail template (no fallback to english in e-mail templates, we're looking for translaters btw :P), refs #564

Browse Source 
- fix possible missing setting in database (httgroup), fixes #564
This commit is contained in:
Michael Kaufmann (d00p)
2011-01-26 11:41:35 +00:00
parent b19cabef79
commit 1396aca657
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -1419,3 +1419,27 @@ if(isFroxlorVersion('0.9.17-svn2'))
updateToVersion('0.9.17');
}
if(isFroxlorVersion('0.9.17'))
{
showUpdateStep("Updating from 0.9.17 to 0.9.18-svn1");
showUpdateStep("Checking whether you are missing any settings", false);
$nonefound = true;
$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'httpgroup'");
if(!isset($result) || !isset($result['value']))
{
$nonefound = false;
showUpdateStep("Adding missing setting 'httpgroup'");
$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'httpgroup', '".$settings['system']['httpuser']."');");
lastStepStatus(0);
}
if($nonefound) {
showUpdateStep("No missing settings found ;-)");
lastStepStatus(0);
}
updateToVersion('0.9.18-svn1');
}

2
lng/german.lng.php
View File

@@ -1542,4 +1542,6 @@ $lng['admin']['templates']['DISKAVAILABLE'] = 'Wird mit dem Webspace, der dem Ku
$lng['admin']['templates']['DISKUSED'] = 'Wird mit dem Webspace, welcher vom Kunden bereits verbraucht wurde, ersetzt (in MB).';
$lng['serversettings']['dropdown'] = 'Auswahlliste';
$lng['serversettings']['manual'] = 'Manuelle Eingabe';
$lng['mails']['webmaxpercent']['mailbody'] = 'Sehr geehrte(r) {NAME},\n\nSie haben bereits {DISKUSED} MB von Ihren insgesamt {DISKAVAILABLE} MB Speicherplatz verbraucht.\nDies sind mehr als {MAX_PERCENT}%.\n\nVielen Dank,\ndas Froxlor-Team';
$lng['mails']['webmaxpercent']['subject'] = 'Sie erreichen bald Ihr Speicherplatz-Limit';
$lng['mysql']['database_edit'] = 'Datenbank bearbeiten';