From 2b13ae3ad86e1df1bd3b9653aad7175b6c4d1a29 Mon Sep 17 00:00:00 2001 From: BNoiZe Date: Sun, 8 Dec 2013 15:40:07 +0100 Subject: [PATCH 1/2] fixed a wrong array-index in installation language file --- install/lng/english.lng.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/lng/english.lng.php b/install/lng/english.lng.php index f5a34231..9c5e8086 100644 --- a/install/lng/english.lng.php +++ b/install/lng/english.lng.php @@ -37,7 +37,7 @@ $lng['requirements']['openbasedirenabled'] = 'Froxlor will not work properly wit $lng['requirements']['diedbecauseofrequirements'] = 'Cannot install Froxlor without these requirements! Try to fix them and retry.'; $lng['requirements']['froxlor_succ_checks'] = 'All requirements are satisfied'; -$lng['install']['title'] = 'Froxlor install - chose language'; +$lng['install']['lngtitle'] = 'Froxlor install - choose language'; $lng['install']['language'] = 'Installation language'; $lng['install']['lngbtn_go'] = 'Change language'; $lng['install']['title'] = 'Froxlor install - setup'; From 3b0387901fefbe5339141d5955bede688bd06185 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sun, 8 Dec 2013 22:00:23 +0100 Subject: [PATCH 2/2] don't cast mysql-max to integer as for admins-usernames, it may be '' instead of 0 Signed-off-by: Michael Kaufmann (d00p) --- lib/functions/validate/function.validateUsername.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/functions/validate/function.validateUsername.php b/lib/functions/validate/function.validateUsername.php index 7cd8d976..48aeab6c 100644 --- a/lib/functions/validate/function.validateUsername.php +++ b/lib/functions/validate/function.validateUsername.php @@ -35,6 +35,6 @@ function validateUsername($username, $unix_names = 1, $mysql_max = '') { return false; } } else { - return (preg_match('/^[a-z][a-z0-9]{1,' . (int)$mysql_max . '}$/Di', $username) != false); + return (preg_match('/^[a-z][a-z0-9]{1,' . $mysql_max . '}$/Di', $username) != false); } }