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

- show reasonable errormessage in function validateFormFieldHidden() when hidden fields changed

Browse Source 
- don't show error if cronjob-timestamps changed while editing settings, fixes #52
This commit is contained in:
Michael Kaufmann (d00p)
2010-03-09 06:45:36 +00:00
parent 8ec1b723a2
commit 1d03f04e1e
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/functions/formfields/hidden/function.validateFormFieldHidden.php
View File

@@ -19,13 +19,20 @@
function validateFormFieldHidden($fieldname, $fielddata, $newfieldvalue) function validateFormFieldHidden($fieldname, $fielddata, $newfieldvalue)
{ {
if($newfieldvalue === $fielddata['value']) /**
{ * don't show error on cronjob-timestamps changing
* because it might be possible that the cronjob ran
* while settings have been edited (bug #52)
*/
if($newfieldvalue === $fielddata['value']
|| $fieldname == 'system_last_tasks_run'
|| $fieldname == 'system_last_traffic_run'
|| $fieldname == 'system_lastcronrun'
) {
return true; return true;
} }
else else
{ {
// TODO: Throw some error that actually makes sense - false would just throw unknown error return 'hiddenfieldvaluechanged';
return false;
} }
} }

1
lng/english.lng.php
View File

@@ -1303,5 +1303,6 @@ $lng['admin']['newerversionavailable'] = 'There is a newer version of Froxlor av
// ADDED IN FROXLOR 0.9.3 // ADDED IN FROXLOR 0.9.3
$lng['emails']['noemaildomainaddedyet'] = 'You do not have a (email-)domain in your account yet.'; $lng['emails']['noemaildomainaddedyet'] = 'You do not have a (email-)domain in your account yet.';
$lng['error']['hiddenfieldvaluechanged'] = 'The value for the hidden field &quot;%s&quot; changed while editing the settings.<br /><br />This is usually not a big problem but the settings could not be saved because of this.';
?> ?>

1
lng/german.lng.php
View File

@@ -1283,5 +1283,6 @@ $lng['admin']['newerversionavailable'] = 'Eine neuere Version von Froxlor wurde
// ADDED IN FROXLOR 0.9.3 // ADDED IN FROXLOR 0.9.3
$lng['emails']['noemaildomainaddedyet'] = 'Sie haben bisher noch keine (E-Mail-)Domain in Ihrem Konto.'; $lng['emails']['noemaildomainaddedyet'] = 'Sie haben bisher noch keine (E-Mail-)Domain in Ihrem Konto.';
$lng['error']['hiddenfieldvaluechanged'] = 'Der Wert des verborgenen Feldes &quot;%s&quot; hat sich w&auml;hrend dem &Auml;ndern der Einstellungen ge&auml;ndert.<br /><br />Dies ist im Grunde kein schwerwiegendes Problem, allerdings konnten so die Einstellungen nicht gespeichert werden.';
?> ?>