$ADD = "";
// Already logged in?
-if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash'))) {
+if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
// Maybe, then continue with it
- $uid = $GLOBALS['userid'];
+ $uid = getUserId();
} elseif ((REQUEST_ISSET_POST(('id'))) && (REQUEST_ISSET_POST(('password'))) && (IS_FORM_SENT())) {
// Set userid and crypt password when login data was submitted
if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID(REQUEST_POST('id')))) {