function alpha ($sortby, $colspan, $return=false) {
if (!REQUEST_ISSET_GET('offset')) REQUEST_SET_GET('offset', 0);
$add = "&page=".REQUEST_GET('page')."&offset=".REQUEST_GET('offset');
- if (REQUEST_ISSET_GET(('mode'))) $add .= "&mode=".REQUEST_GET(('mode'));
+ if (REQUEST_ISSET_GET('mode')) $add .= "&mode=".REQUEST_GET('mode');
/* Creates the list of letters and makes them a link. */
$alphabet = explode(',', getMessage('_ALL2') . 'A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z' . getMessage('_OTHERS'));
$OUT .= "<strong>".$ltr."</strong>";
} else {
// Output link to letter
- $OUT .= "<a href=\"{!URL!}/modules.php?module=admin&what=".$GLOBALS['what'];
- if (REQUEST_ISSET_GET(('mode'))) $OUT .= "&mode=".REQUEST_GET(('mode'));
+ $OUT .= "<a href=\"{?URL?}/modules.php?module=admin&what=".getWhat();
+ if (REQUEST_ISSET_GET('mode')) $OUT .= "&mode=".REQUEST_GET('mode');
$OUT .= "&letter=".$ltr."&sortby=".$sortby.$add."\">".$ltr."</a>";
}
$add = "&page=".REQUEST_GET('page')."&offset=".REQUEST_GET('offset');
// Add status or mode
- if (REQUEST_ISSET_GET(('status'))) $add .= "&mode=".REQUEST_GET(('status'));
- elseif (REQUEST_ISSET_GET(('mode'))) $add .= "&mode=".REQUEST_GET(('mode'));
+ if (REQUEST_ISSET_GET('status')) $add .= '&mode=' . REQUEST_GET('status');
+ elseif (REQUEST_ISSET_GET('mode')) $add .= '&mode=' . REQUEST_GET('mode');
// Makes order by links..
if ($letter == "front") $letter = getMessage('_ALL2');
// Prepare array with all possible sorters
$list = array(
- 'userid' => getMessage('_UID'),
- 'family' => getMessage('FAMILY_NAME'),
- 'email' => getMessage('ADDY'),
- 'REMOTE_ADDR' => getMessage('REMOTE_IP')
+ 'userid' => getMessage('_UID'),
+ 'family' => getMessage('FAMILY_NAME'),
+ 'email' => getMessage('ADDY'),
+ 'REMOTE_ADDR' => getMessage('REMOTE_IP')
);
// Add nickname if extension is installed
foreach ($list as $sort => $title) {
if ($sortby == $sort) {
- $OUT .= "<strong>".$title."</strong> | ";
+ $OUT .= "<strong>" . $title . "</strong> | ";
} else {
- $OUT .= "<a href=\"{!URL!}/modules.php?module=admin&what=list_user&letter=".$letter."&sortby=".$sort.$add."\">".$title."</a> | ";
+ $OUT .= "<a href=\"{?URL?}/modules.php?module=admin&what=list_user&letter=" . $letter . "&sortby=" . $sort.$add . "\">" . $title . "</a> | ";
}
} // END - foreach
define('__SORT_LIST', substr($OUT, 0, -13));
// Load template
- $OUT = LOAD_TEMPLATE("admin_list_user_sort", true);
+ $OUT = LOAD_TEMPLATE('admin_list_user_sort', true);
if ($return === true) {
// Return code
return $OUT;
// Add page navigation
function ADD_PAGENAV ($PAGES, $offset, $show_form, $colspan,$return=false) {
- if (!$show_form) {
- // Empty row
- define('__FORM_HEADER', "<tr><td colspan=\"".$colspan."\" class=\"seperator\"> </td></tr>");
- } else {
+ if ($show_form) {
// Load form for changing number of lines
- define('__FORM_HEADER', LOAD_TEMPLATE("admin_list_user_sort_form", true));
- }
-
- if (!$show_form) {
- // Add line with bottom border
- define('__FORM_FOOTER', "<tr><td colspan=\"{!__COLSPAN2!}\" class=\"seperator bottom2\"> </td></tr>");
+ define('__FORM_HEADER', LOAD_TEMPLATE('admin_list_user_sort_form', true));
+ define('__FORM_FOOTER', '<tr><td colspan="{!__COLSPAN2!}" class="seperator bottom2"> </td></tr>');
} else {
- // Add line without bottom border
- define('__FORM_FOOTER', "<tr><td colspan=\"{!__COLSPAN2!}\" class=\"seperator bottom2\"> </td></tr>");
+ // Empty row
+ define('__FORM_HEADER', '<tr><td colspan="' . $colspan . '" class="seperator"> </td></tr>');
+ define('__FORM_FOOTER', '<tr><td colspan="{!__COLSPAN2!}" class="seperator bottom2"> </td></tr>');
}
$OUT = '';
for ($page = 1; $page <= $PAGES; $page++) {
if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == '1'))) {
- $OUT .= "<strong>-";
+ $OUT .= '<strong>-';
} else {
- if (!REQUEST_ISSET_GET(('letter'))) REQUEST_SET_GET('letter', getMessage('_ALL2'));
- if (!REQUEST_ISSET_GET(('sortby'))) REQUEST_SET_GET('sortby', 'userid');
+ if (!REQUEST_ISSET_GET('letter')) REQUEST_SET_GET('letter', getMessage('_ALL2'));
+ if (!REQUEST_ISSET_GET('sortby')) REQUEST_SET_GET('sortby', 'userid');
// Base link
- $OUT .= "<a href=\"{!URL!}/modules.php?module=admin&what=".$GLOBALS['what'];
+ $OUT .= '<a href="{?URL?}/modules.php?module=admin&what=' . getWhat();
// Add status or mode
- if (REQUEST_ISSET_GET(('status'))) $OUT .= "&mode=".REQUEST_GET(('status'));
- elseif (REQUEST_ISSET_GET(('mode'))) $OUT .= "&mode=".REQUEST_GET(('mode'));
+ if (REQUEST_ISSET_GET('status')) $OUT .= '&mode=' . REQUEST_GET('status');
+ elseif (REQUEST_ISSET_GET('mode')) $OUT .= '&mode=' . REQUEST_GET('mode');
- // Letter and so on
- $OUT .= "&letter=".REQUEST_GET(('letter'))."&sortby=".REQUEST_GET(('sortby'))."&page=".$page."&offset=".$offset."\">";
+ // Letter and so on
+ $OUT .= '&letter=' . REQUEST_GET('letter') . '&sortby=' . REQUEST_GET('sortby') . '&page=' . $page . '&offset=' . $offset . '">';
}
$OUT .= $page;
if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == '1'))) {
- $OUT .= "-</strong>";
+ $OUT .= '-</strong>';
} else {
- $OUT .= "</a>";
+ $OUT .= '</a>';
}
- if ($page < $PAGES) $OUT .= " | ";
+ if ($page < $PAGES) $OUT .= ' | ';
} // END - for
define('__PAGENAV_LIST', $OUT);
// Load template
- $OUT = LOAD_TEMPLATE("admin_list_user_pagenav", true);
+ $OUT = LOAD_TEMPLATE('admin_list_user_pagenav', true);
if ($return === true) {
// Return code
return $OUT;
}
// Create email link to user's account
-function USER_generateMemberEmailLink($email, $mod='admin') {
+function generateUserEmailLink($email, $mod = 'admin') {
// Show contact link only if user is confirmed by default
$locked = " AND `status`='CONFIRMED'";
// But admins shall always see it
if (IS_ADMIN()) $locked = '';
- $result = SQL_QUERY_ESC("SELECT userid
-FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE `email`='%s'".$locked." LIMIT 1",
- array($email), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT
+ `userid`
+FROM
+ `{!_MYSQL_PREFIX!}_user_data`
+WHERE
+ `email`='%s'" . $locked."
+LIMIT 1",
+ array($email), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Load userid
list($uid) = SQL_FETCHROW($result);
// Rewrite email address to contact link
- $email = '{!URL!}/modules.php?module=' . $mod . '&what=user_contct&uid=' . bigintval($uid);
+ $email = '{?URL?}/modules.php?module=' . $mod . '&what=user_contct&uid=' . bigintval($uid);
} // END - if
// Free memory
list($refid) = SQL_FETCHROW($result);
// Reset this user's counter
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `rand_confirmed`=0 WHERE userid=%s LIMIT 1",
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `rand_confirmed`=0 WHERE `userid`=%s LIMIT 1",
array($refid), __FUNCTION__, __LINE__);
} // END - if
}
// Do the user login
-function USER_DO_LOGIN ($uid, $passwd) {
+function USER_DO_LOGIN ($uid, $passwd, $successUrl = '') {
// Init variables
- $dmy = '';
+ $dmy = ''; $add = '';
// Add last_login if available
- $lastOnline = '';
+ $lastOnline = '';
if (GET_EXT_VERSION('sql_patches') >= '0.2.8') {
- $lastOnline = ', last_login';
+ $lastOnline = ', `last_login`';
} // END - if
// Init array
);
// Check login data
- if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_PROBE_ON_USERID($uid))) {
+ if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_IS_ACTIVE($uid))) {
// Nickname entered
- $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$lastOnline." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' AND `status`='CONFIRMED' LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT `userid`, `password`, `last_online`" . $lastOnline . " FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `nickname`='%s' AND `status`='CONFIRMED' LIMIT 1",
array($uid), __FUNCTION__, __LINE__);
} else {
// Direct userid entered
- $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$lastOnline." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT `userid`, `password`, `last_online`" . $lastOnline . " FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
array($uid, $content['hash']), __FUNCTION__, __LINE__);
}
if (!empty($content['userid'])) $uid = bigintval($content['userid']);
// Is there an entry?
- if ((SQL_NUMROWS($result) == 1) && ((($probe_nickname) && (!empty($content['userid']))) || ($content['userid'] == $uid))) {
+ if ((SQL_NUMROWS($result) == 1) && ((isNicknameUsed($content['userid'] === true) && (!empty($content['userid']))) || ($content['userid'] == $uid))) {
// Free result
SQL_FREERESULT($result);
// ... and update database
// @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET password='%s' WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `password`='%s' WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
array($content['hash'], $uid), __FUNCTION__, __LINE__);
// No login bonus by default
if (!empty($content['last_login'])) $probe = time() - $content['last_login'];
if ((GET_EXT_VERSION('bonus') >= '0.2.2') && ($probe >= getConfig('login_timeout'))) {
// Add login bonus to user's account
- $add = sprintf(", login_bonus=login_bonus+%s",
+ $add = sprintf(", `login_bonus`=`login_bonus`+%s",
(float)getConfig('login_bonus')
);
$GLOBALS['bonus_payed'] = true;
// Subtract login bonus from userid's account or jackpot
- if ((GET_EXT_VERSION('bonus') >= '0.3.5') && (getConfig('bonus_mode') != "ADD")) BONUS_POINTS_HANDLER('login_bonus');
+ if ((GET_EXT_VERSION('bonus') >= '0.3.5') && (getConfig('bonus_mode') != 'ADD')) BONUS_POINTS_HANDLER('login_bonus');
} // END - if
// Calculate new hash with the secret key and master salt together
// Try to set session data (which shall normally always work!)
if ((setSession('userid', $uid )) && (setSession('u_hash', $content['hash']))) {
// Update database records
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET total_logins=total_logins+1".$add." WHERE userid=%s LIMIT 1",
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `total_logins`=`total_logins`+1" . $add . " WHERE `userid`=%s LIMIT 1",
array($uid), __FUNCTION__, __LINE__);
if (SQL_AFFECTEDROWS() == 1) {
- // Procedure to checking for login data
- if (($GLOBALS['bonus_payed']) && (EXT_IS_ACTIVE('bonus'))) {
- // Bonus added (just displaying!)
- $URL = 'modules.php?module=chk_login&mode=bonus';
+ // Is a success URL set?
+ if (empty($successUrl)) {
+ // Procedure to checking for login data
+ if (($GLOBALS['bonus_payed']) && (EXT_IS_ACTIVE('bonus'))) {
+ // Bonus added (just displaying!)
+ $URL = 'modules.php?module=chk_login&mode=bonus';
+ } else {
+ // Bonus not added
+ $URL = 'modules.php?module=chk_login&mode=login';
+ }
} else {
- // Bonus not added
- $URL = 'modules.php?module=chk_login&mode=login';
+ // Use this URL
+ $URL = $successUrl;
}
} else {
// Cannot update counter!
}
} elseif (GET_EXT_VERSION('sql_patches') >= '0.6.1') {
// Update failture counter
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET login_failures=login_failures+1,last_failure=NOW() WHERE userid=%s LIMIT 1",
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `login_failures`=`login_failures`+1,`last_failure`=NOW() WHERE `userid`=%s LIMIT 1",
array($uid), __FUNCTION__, __LINE__);
// Wrong password!
$URL = 'modules.php?module=index&what=login&login='.getCode('WRONG_PASS');
}
- } elseif ((($probe_nickname) && (!empty($content['userid']))) || ($content['userid'] == $uid)) {
+ } elseif (((isNicknameUsed($content['userid'])) && (!empty($content['userid']))) || ($content['userid'] == $uid)) {
// Other account status?
// @TODO Can this query be merged with above query?
- $result = SQL_QUERY_ESC("SELECT status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
array($uid), __FUNCTION__, __LINE__);
// Entry found?
$result = false;
// Probe userid/nickname
- if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_PROBE_ON_USERID($uid))) {
+ if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_IS_ACTIVE($uid))) {
// Nickname entered
- $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' OR email='%s' LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `nickname`='%s' OR `email`='%s' LIMIT 1",
array($uid, $email), __FUNCTION__, __LINE__);
} elseif (($uid > 0) && (empty($email))) {
// Direct userid entered
- $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
array(bigintval($uid)), __FUNCTION__, __LINE__);
} elseif (!empty($email)) {
// Email entered
- $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE email='%s' LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `email`='%s' LIMIT 1",
array($email), __FUNCTION__, __LINE__);
} else {
// Userid not set!
if ($status == 'CONFIRMED') {
// Ooppps, this was missing! ;-) We should update the database...
$NEW_PASS = generatePassword();
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET password='%s' WHERE userid=%s LIMIT 1",
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `password`='%s' WHERE `userid`=%s LIMIT 1",
array(generateHash($NEW_PASS), $uid), __FUNCTION__, __LINE__);
// Prepare data and message for email
- $msg = LOAD_EMAIL_TEMPLATE('new-pass', array('new_pass' => $NEW_PASS), $uid);
+ $message = LOAD_EMAIL_TEMPLATE('new-pass', array('new_pass' => $NEW_PASS), $uid);
// ... and send it away
- sendEmail($uid, getMessage('GUEST_NEW_PASSWORD'), $msg);
+ sendEmail($uid, getMessage('GUEST_NEW_PASSWORD'), $message);
// Output note to user
LOAD_TEMPLATE('admin_settings_saved', false, getMessage('GUEST_NEW_PASSWORD_SEND'));
projects / mailer.git / blobdiff