mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 12:28:52 +00:00
- acp popup, shouldn't require 700 px width
- throw an error if an image that's edited into an imageset doesn't exist - convert the password not its hash ;-) - only update user_login_attempts if necessary - make password requirements even clearer git-svn-id: file:///svn/phpbb/trunk@7250 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann
parent
c6b0b62165
commit
a43416dbb2
7 changed files with 24 additions and 14 deletions
|
|
@ -101,4 +101,4 @@ function swatch(field)
|
|||
|
||||
<body class="{S_CONTENT_DIRECTION}">
|
||||
|
||||
<div id="page-body" style="padding: 0; padding-right: 10px;">
|
||||
<div id="page-body" style="padding: 0; padding-right: 10px; min-width: 0px;">
|
||||
|
|
|
|||
|
|
@ -1391,7 +1391,13 @@ parse_css_file = {PARSE_CSS_FILE}
|
|||
// from the image itself ... we ignore width settings for the poll center
|
||||
// image
|
||||
$imgwidth = $imgheight = '';
|
||||
if ($imgsize)
|
||||
|
||||
if ($imageset_path && !file_exists("{$phpbb_root_path}styles/$imageset_path/imageset/$imgpath"))
|
||||
{
|
||||
trigger_error($user->lang['NO_IMAGE_ERROR'] . adm_back_link($this->u_action), E_USER_WARNING);
|
||||
}
|
||||
|
||||
if ($imgsize && $imageset_path)
|
||||
{
|
||||
list($imgwidth, $imgheight) = getimagesize("{$phpbb_root_path}styles/$imageset_path/imageset/$imgpath");
|
||||
$imgheight = '*' . $imgheight;
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ function login_db(&$username, &$password)
|
|||
}
|
||||
|
||||
// cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding
|
||||
if (md5($password_old_format) == $row['user_password'] || utf8_to_cp1252(md5($password_old_format)) == $row['user_password'])
|
||||
if (md5($password_old_format) == $row['user_password'] || md5(utf8_to_cp1252($password_old_format)) == $row['user_password'])
|
||||
{
|
||||
// Update the password in the users table to the new format and remove user_pass_convert flag
|
||||
$sql = 'UPDATE ' . USERS_TABLE . '
|
||||
|
|
@ -147,11 +147,14 @@ function login_db(&$username, &$password)
|
|||
// Check password ...
|
||||
if (!$row['user_pass_convert'] && md5($password) == $row['user_password'])
|
||||
{
|
||||
// Successful, reset login attempts (the user passed all stages)
|
||||
$sql = 'UPDATE ' . USERS_TABLE . '
|
||||
SET user_login_attempts = 0
|
||||
WHERE user_id = ' . $row['user_id'];
|
||||
$db->sql_query($sql);
|
||||
if ($row['user_login_attempts'] != 0)
|
||||
{
|
||||
// Successful, reset login attempts (the user passed all stages)
|
||||
$sql = 'UPDATE ' . USERS_TABLE . '
|
||||
SET user_login_attempts = 0
|
||||
WHERE user_id = ' . $row['user_id'];
|
||||
$db->sql_query($sql);
|
||||
}
|
||||
|
||||
// User inactive...
|
||||
if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE)
|
||||
|
|
|
|||
|
|
@ -357,7 +357,7 @@ $lang = array_merge($lang, array(
|
|||
'NO_IP_VALIDATION' => 'None',
|
||||
'PASSWORD_TYPE' => 'Password complexity',
|
||||
'PASSWORD_TYPE_EXPLAIN' => 'Determines how complex a password needs to be when set or altered, subsequent options include the previous ones.',
|
||||
'PASS_TYPE_ALPHA' => 'Must contain alphanumerics',
|
||||
'PASS_TYPE_ALPHA' => 'Must contain letters and numbers',
|
||||
'PASS_TYPE_ANY' => 'No requirements',
|
||||
'PASS_TYPE_CASE' => 'Must be mixed case',
|
||||
'PASS_TYPE_SYMBOL' => 'Must contain symbols',
|
||||
|
|
|
|||
|
|
@ -78,8 +78,8 @@ $lang = array_merge($lang, array(
|
|||
|
||||
'SEARCH_GUEST_INTERVAL' => 'Guest search flood interval',
|
||||
'SEARCH_GUEST_INTERVAL_EXPLAIN' => 'Number of seconds guests must wait between searches. If one guest searches all others have to wait until the time interval passed.',
|
||||
'SEARCH_INDEX_CREATE_REDIRECT' => 'All posts up to post id %d have now been indexed, of which %d posts were within this step.<br />The current rate of indexing is approximately %.1f posts per second.<br />Indexing in progress…',
|
||||
'SEARCH_INDEX_DELETE_REDIRECT' => 'All posts up to post id %d have been removed from the search index.<br />Deleting in progress…',
|
||||
'SEARCH_INDEX_CREATE_REDIRECT' => 'All posts up to post id %1$d have now been indexed, of which %2$d posts were within this step.<br />The current rate of indexing is approximately %3$.1f posts per second.<br />Indexing in progress…',
|
||||
'SEARCH_INDEX_DELETE_REDIRECT' => 'All posts up to post id %1$d have been removed from the search index.<br />Deleting in progress…',
|
||||
'SEARCH_INDEX_CREATED' => 'Successfully indexed all posts in the board database.',
|
||||
'SEARCH_INDEX_REMOVED' => 'Successfully deleted the search index for this backend.',
|
||||
'SEARCH_INTERVAL' => 'User search flood interval',
|
||||
|
|
|
|||
|
|
@ -285,6 +285,7 @@ $lang = array_merge($lang, array(
|
|||
'NO_CLASS' => 'Cannot find class in stylesheet.',
|
||||
'NO_IMAGESET' => 'Cannot find imageset on filesystem.',
|
||||
'NO_IMAGE' => 'No image',
|
||||
'NO_IMAGE_ERROR' => 'Cannot find image on filesystem.',
|
||||
'NO_STYLE' => 'Cannot find style on filesystem.',
|
||||
'NO_TEMPLATE' => 'Cannot find template on filesystem.',
|
||||
'NO_THEME' => 'Cannot find theme on filesystem.',
|
||||
|
|
|
|||
|
|
@ -304,10 +304,10 @@ $lang = array_merge($lang, array(
|
|||
'NO_WATCHED_FORUMS' => 'You are not watching any forums.',
|
||||
'NO_WATCHED_TOPICS' => 'You are not watching any topics.',
|
||||
|
||||
'PASS_TYPE_ALPHA_EXPLAIN' => 'Password must be between %1$d and %2$d chars long, must be mixed case and must contain numbers',
|
||||
'PASS_TYPE_ALPHA_EXPLAIN' => 'Password must be between %1$d and %2$d characters long, must contain letters in mixed case and must contain numbers',
|
||||
'PASS_TYPE_ANY_EXPLAIN' => 'Must be between %1$d and %2$d characters.',
|
||||
'PASS_TYPE_CASE_EXPLAIN' => 'Password must be between %1$d and %2$d chars long and must be mixed case',
|
||||
'PASS_TYPE_SYMBOL_EXPLAIN' => 'Password must be between %1$d and %2$d chars long, must be mixed case, must contain numbers and must contain symbols',
|
||||
'PASS_TYPE_CASE_EXPLAIN' => 'Password must be between %1$d and %2$d characters long and must contain letters in mixed case',
|
||||
'PASS_TYPE_SYMBOL_EXPLAIN' => 'Password must be between %1$d and %2$d characters long, must contain letters in mixed case, must contain numbers and must contain symbols',
|
||||
'PASSWORD' => 'Password',
|
||||
'PASSWORD_ACTIVATED' => 'Your new password has been activated',
|
||||
'PASSWORD_UPDATED' => 'Your password has been sent successfully to your original email address.',
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue