Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
project
drupal
Commits
5365db7e
Commit
5365db7e
authored
Jun 23, 2005
by
Dries
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Patch by Robert: fixed problem with username blocking.
parent
e7cc200e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
52 additions
and
48 deletions
+52
-48
modules/user.module
modules/user.module
+26
-24
modules/user/user.module
modules/user/user.module
+26
-24
No files found.
modules/user.module
View file @
5365db7e
...
...
@@ -812,36 +812,38 @@ function user_login($edit = array(), $msg = '') {
drupal_goto
(
'user'
);
}
if
(
user_is_blocked
(
$edit
[
'name'
]))
{
// blocked in user administration
$error
=
t
(
'The username %name has been blocked.'
,
array
(
'%name'
=>
theme
(
'placeholder'
,
$edit
[
'name'
])));
}
else
if
(
drupal_is_denied
(
'user'
,
$edit
[
'name'
]))
{
// denied by access controls
$error
=
t
(
'The name %name is a reserved username.'
,
array
(
'%name'
=>
theme
(
'placeholder'
,
$edit
[
'name'
])));
}
else
if
(
$edit
[
'name'
]
&&
$edit
[
'pass'
])
{
if
(
!
$user
->
uid
)
{
$user
=
user_authenticate
(
$edit
[
'name'
],
trim
(
$edit
[
'pass'
]));
if
(
isset
(
$edit
[
'name'
]))
{
if
(
user_is_blocked
(
$edit
[
'name'
]))
{
// blocked in user administration
$error
=
t
(
'The username %name has been blocked.'
,
array
(
'%name'
=>
theme
(
'placeholder'
,
$edit
[
'name'
])));
}
else
if
(
drupal_is_denied
(
'user'
,
$edit
[
'name'
]))
{
// denied by access controls
$error
=
t
(
'The name %name is a reserved username.'
,
array
(
'%name'
=>
theme
(
'placeholder'
,
$edit
[
'name'
])));
}
else
if
(
$edit
[
'pass'
])
{
if
(
$user
->
uid
)
{
watchdog
(
'user'
,
t
(
'Session opened for %name.'
,
array
(
'%name'
=>
theme
(
'placeholder'
,
$user
->
name
))));
if
(
!
$user
->
uid
)
{
$user
=
user_authenticate
(
$edit
[
'name'
],
trim
(
$edit
[
'pass'
]));
}
// Update the user table timestamp noting user has logged in.
db_query
(
"UPDATE
{
users
}
SET login = '%d' WHERE uid = '%s'"
,
time
()
,
$user
->
uid
);
if
(
$user
->
uid
)
{
watchdog
(
'user'
,
t
(
'Session opened for %name.'
,
array
(
'%name'
=>
theme
(
'placeholder'
,
$user
->
name
)))
);
user_module_invoke
(
'login'
,
$edit
,
$user
);
// Update the user table timestamp noting user has logged in.
db_query
(
"UPDATE
{
users
}
SET login = '%d' WHERE uid = '%s'"
,
time
(),
$user
->
uid
);
// Redirect the user to the page he logged on from.
drupal_goto
();
}
else
{
if
(
!
$error
)
{
$error
=
t
(
'Sorry. Unrecognized username or password.'
)
.
' '
.
l
(
t
(
'Have you forgotten your password?'
),
'user/password'
);
user_module_invoke
(
'login'
,
$edit
,
$user
);
// Redirect the user to the page he logged on from.
drupal_goto
();
}
else
{
if
(
!
$error
)
{
$error
=
t
(
'Sorry. Unrecognized username or password.'
)
.
' '
.
l
(
t
(
'Have you forgotten your password?'
),
'user/password'
);
}
watchdog
(
'user'
,
t
(
'Login attempt failed for %user: %error.'
,
array
(
'%user'
=>
theme
(
'placeholder'
,
$edit
[
'name'
]),
'%error'
=>
theme
(
'placeholder'
,
$error
))));
}
watchdog
(
'user'
,
t
(
'Login attempt failed for %user: %error.'
,
array
(
'%user'
=>
theme
(
'placeholder'
,
$edit
[
'name'
]),
'%error'
=>
theme
(
'placeholder'
,
$error
))));
}
}
...
...
modules/user/user.module
View file @
5365db7e
...
...
@@ -812,36 +812,38 @@ function user_login($edit = array(), $msg = '') {
drupal_goto
(
'user'
);
}
if
(
user_is_blocked
(
$edit
[
'name'
]))
{
// blocked in user administration
$error
=
t
(
'The username %name has been blocked.'
,
array
(
'%name'
=>
theme
(
'placeholder'
,
$edit
[
'name'
])));
}
else
if
(
drupal_is_denied
(
'user'
,
$edit
[
'name'
]))
{
// denied by access controls
$error
=
t
(
'The name %name is a reserved username.'
,
array
(
'%name'
=>
theme
(
'placeholder'
,
$edit
[
'name'
])));
}
else
if
(
$edit
[
'name'
]
&&
$edit
[
'pass'
])
{
if
(
!
$user
->
uid
)
{
$user
=
user_authenticate
(
$edit
[
'name'
],
trim
(
$edit
[
'pass'
]));
if
(
isset
(
$edit
[
'name'
]))
{
if
(
user_is_blocked
(
$edit
[
'name'
]))
{
// blocked in user administration
$error
=
t
(
'The username %name has been blocked.'
,
array
(
'%name'
=>
theme
(
'placeholder'
,
$edit
[
'name'
])));
}
else
if
(
drupal_is_denied
(
'user'
,
$edit
[
'name'
]))
{
// denied by access controls
$error
=
t
(
'The name %name is a reserved username.'
,
array
(
'%name'
=>
theme
(
'placeholder'
,
$edit
[
'name'
])));
}
else
if
(
$edit
[
'pass'
])
{
if
(
$user
->
uid
)
{
watchdog
(
'user'
,
t
(
'Session opened for %name.'
,
array
(
'%name'
=>
theme
(
'placeholder'
,
$user
->
name
))));
if
(
!
$user
->
uid
)
{
$user
=
user_authenticate
(
$edit
[
'name'
],
trim
(
$edit
[
'pass'
]));
}
// Update the user table timestamp noting user has logged in.
db_query
(
"UPDATE
{
users
}
SET login = '%d' WHERE uid = '%s'"
,
time
()
,
$user
->
uid
);
if
(
$user
->
uid
)
{
watchdog
(
'user'
,
t
(
'Session opened for %name.'
,
array
(
'%name'
=>
theme
(
'placeholder'
,
$user
->
name
)))
);
user_module_invoke
(
'login'
,
$edit
,
$user
);
// Update the user table timestamp noting user has logged in.
db_query
(
"UPDATE
{
users
}
SET login = '%d' WHERE uid = '%s'"
,
time
(),
$user
->
uid
);
// Redirect the user to the page he logged on from.
drupal_goto
();
}
else
{
if
(
!
$error
)
{
$error
=
t
(
'Sorry. Unrecognized username or password.'
)
.
' '
.
l
(
t
(
'Have you forgotten your password?'
),
'user/password'
);
user_module_invoke
(
'login'
,
$edit
,
$user
);
// Redirect the user to the page he logged on from.
drupal_goto
();
}
else
{
if
(
!
$error
)
{
$error
=
t
(
'Sorry. Unrecognized username or password.'
)
.
' '
.
l
(
t
(
'Have you forgotten your password?'
),
'user/password'
);
}
watchdog
(
'user'
,
t
(
'Login attempt failed for %user: %error.'
,
array
(
'%user'
=>
theme
(
'placeholder'
,
$edit
[
'name'
]),
'%error'
=>
theme
(
'placeholder'
,
$error
))));
}
watchdog
(
'user'
,
t
(
'Login attempt failed for %user: %error.'
,
array
(
'%user'
=>
theme
(
'placeholder'
,
$edit
[
'name'
]),
'%error'
=>
theme
(
'placeholder'
,
$error
))));
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment