merge r9923 from trunk to branch 2.1

bug:2234
HTML characters are allowed in username

git-svn-id: http://piwigo.org/svn/branches/2.1@9929 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2011-03-29 19:59:09 +00:00
parent f0550e906c
commit 04d6281dd2
4 changed files with 9 additions and 3 deletions
+4
View File
@@ -112,6 +112,10 @@ function register_user($login, $password, $mail_address,
{
array_push($errors, l10n('this login is already used'));
}
if ($login != strip_tags($login))
{
array_push($errors, l10n('html tags are not allowed in login'));
}
$mail_error = validate_mail_address(null, $mail_address);
if ('' != $mail_error)
{
+2 -1
View File
@@ -377,4 +377,5 @@ $lang['This author modified following comment:'] = 'This author modified followi
$lang['This author removed the comment with id %d'] = 'This author removed the comment with id %d';
$lang['delete this comment'] = "delete this comment";
$lang['validate this comment'] = 'validate this comment';
?>
$lang['html tags are not allowed in login'] = 'html tags are not allowed in login';
?>
+2 -1
View File
@@ -379,4 +379,5 @@ $lang['This author modified following comment:'] = 'Cet auteur a modifié le com
$lang['This author removed the comment with id %d'] = 'Cet auteur a supprimé le commentaire portant l\'identifiant %d';
$lang['delete this comment'] = "supprimer ce commentaire";
$lang['validate this comment'] = 'valider ce commentaire';
?>
$lang['html tags are not allowed in login'] = 'les balises html ne sont pas autorisées dans le login';
?>
+1 -1
View File
@@ -46,7 +46,7 @@ if (isset($_POST['submit']))
}
$errors =
register_user(htmlspecialchars($_POST['login'],ENT_COMPAT,'utf-8'),
register_user($_POST['login'],
$_POST['password'],
$_POST['mail_address'],
true,