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

put the language-string for speciallogwarning to admin_domains, not customer_domains, this fixes an undefined variable and the possibility to edit the 'special-logfile' setting; thx to oschn00r for the hint

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-03-27 12:30:37 +01:00
parent a903455ee0
commit a8681b1e7b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin_domains.php
View File

@@ -1266,6 +1266,8 @@ if($page == 'domains'
$title = $domain_edit_data['domain_edit']['title']; $title = $domain_edit_data['domain_edit']['title'];
$image = $domain_edit_data['domain_edit']['image']; $image = $domain_edit_data['domain_edit']['image'];
$speciallogwarning = sprintf($lng['admin']['speciallogwarning'], $lng['admin']['delete_statistics']);
eval("echo \"" . getTemplate("domains/domains_edit") . "\";"); eval("echo \"" . getTemplate("domains/domains_edit") . "\";");
} }
} }

2
customer_domains.php
View File

@@ -631,8 +631,6 @@ elseif($page == 'domains')
$title = $subdomain_edit_data['domain_edit']['title']; $title = $subdomain_edit_data['domain_edit']['title'];
$image = $subdomain_edit_data['domain_edit']['image']; $image = $subdomain_edit_data['domain_edit']['image'];
$speciallogwarning = sprintf($lng['admin']['speciallogwarning'], $lng['admin']['delete_statistics']);
eval("echo \"" . getTemplate("domains/domains_edit") . "\";"); eval("echo \"" . getTemplate("domains/domains_edit") . "\";");
} }
} }

2
lng/english.lng.php
View File

@@ -1898,7 +1898,7 @@ $lng['serversettings']['phpfpm_settings']['idle_timeout']['description'] = 'Time
// ADDED IN 0.9.27-svn2 // ADDED IN 0.9.27-svn2
$lng['panel']['cancel'] = 'Cancel'; $lng['panel']['cancel'] = 'Cancel';
$lng['admin']['delete_statistics'] = 'Delete Statistics'; $lng['admin']['delete_statistics'] = 'Delete Statistics';
$lng['admin']['speciallogwarning'] = 'WARNING: By changing this setting you will lose all your old statistics for this domain. If you are 100% sure you wish to change this type "%s" in the field below and click the "delete" button.<br /><br />'; $lng['admin']['speciallogwarning'] = 'WARNING: By changing this setting you will lose all your old statistics for this domain. If you are sure you wish to change this type "%s" in the field below and click the "delete" button.<br /><br />';
// ADDED IN 0.9.28-svn2 // ADDED IN 0.9.28-svn2
$lng['serversettings']['vmail_maildirname']['title'] = 'Maildir name'; $lng['serversettings']['vmail_maildirname']['title'] = 'Maildir name';