projects
/
mailer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0da4efc
)
ext was missing, fixed error message
author
Roland Häder
<roland@mxchange.org>
Mon, 9 Nov 2009 03:08:40 +0000
(
03:08
+0000)
committer
Roland Häder
<roland@mxchange.org>
Mon, 9 Nov 2009 03:08:40 +0000
(
03:08
+0000)
inc/libs/user_functions.php
patch
|
blob
|
history
diff --git
a/inc/libs/user_functions.php
b/inc/libs/user_functions.php
index e967ca4cf21580c678c1255b0ce80d6e33875a53..6fc8006e05938e2d0e3498c5d5aefdfccf38a9b5 100644
(file)
--- a/
inc/libs/user_functions.php
+++ b/
inc/libs/user_functions.php
@@
-264,6
+264,7
@@
function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
$dmy = '';
$add = '';
$errorCode = '0';
$dmy = '';
$add = '';
$errorCode = '0';
+ $ext = '';
// Add last_login if available
$lastOnline = '';
// Add last_login if available
$lastOnline = '';
@@
-287,6
+288,7
@@
function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
} elseif (isNicknameUsed($userid)) {
// No nickname installed
$errorCode = getCode('EXTENSION_PROBLEM');
} elseif (isNicknameUsed($userid)) {
// No nickname installed
$errorCode = getCode('EXTENSION_PROBLEM');
+ $ext = 'nickname';
} else {
// Direct userid entered
fetchUserData($userid);
} else {
// Direct userid entered
fetchUserData($userid);
@@
-384,7
+386,7
@@
function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
// id not found!
$errorCode = getCode('WRONG_ID');
}
// id not found!
$errorCode = getCode('WRONG_ID');
}
- } else {
+ } else
if ($errorCode == '0')
{
// id not found!
$errorCode = getCode('WRONG_ID');
}
// id not found!
$errorCode = getCode('WRONG_ID');
}
@@
-393,6
+395,9
@@
function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
if ($errorCode > 0) {
// Then reconstruct the URL
$URL = $errorUrl . $errorCode;
if ($errorCode > 0) {
// Then reconstruct the URL
$URL = $errorUrl . $errorCode;
+
+ // Extension set? Then add it as well.
+ if (!empty($ext)) $URL .= '&ext=' . $ext;
} // END - if
// Return URL
} // END - if
// Return URL