X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=d837789fe8b07b16b95e17c368fd1c8e3056abbc;hp=3fd3570e6c1ba9207889046c1d18ef453fe388cf;hb=d897dae9f3b01f17fb59f2b96ba067b1a0f417b0;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60 diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 3fd3570e6c..d837789fe8 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -39,13 +39,13 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Add links for selecting some users function alpha ($sortby, $colspan, $return=false) { if (!isGetRequestElementSet('offset')) setRequestGetElement('offset', 0); - $add = "&page=".getRequestElement('page')."&offset=".getRequestElement('offset'); - if (isGetRequestElementSet('mode')) $add .= "&mode=".getRequestElement('mode'); + $add = '&page='.getRequestElement('page').'&offset='.getRequestElement('offset'); + if (isGetRequestElementSet('mode')) $add .= '&mode='.getRequestElement('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')); @@ -54,18 +54,18 @@ function alpha ($sortby, $colspan, $return=false) { while (list($counter, $ltr) = each($alphabet)) { if (getRequestElement('letter') == $ltr) { // Current letter is letter from URL - $OUT .= "".$ltr.""; + $OUT .= '' . $ltr . ''; } else { // Output link to letter - $OUT .= "".$ltr.""; + $OUT .= '' . $ltr . ''; } if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) { - $OUT .= " ]
[ "; + $OUT .= ' ]
[ '; } elseif ( $counter != $num ) { - $OUT .= " | "; + $OUT .= ' | '; } } // END - while @@ -99,8 +99,8 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) { // Prepare array with all possible sorters $list = array( 'userid' => getMessage('_UID'), - 'family' => getMessage('FAMILY_NAME'), - 'email' => getMessage('EMAIL_ADDRESS'), + 'family' => getMessage('FAMILY'), + 'email' => getMessage('EMAIL'), 'REMOTE_ADDR' => getMessage('REMOTE_IP') ); @@ -111,9 +111,9 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) { foreach ($list as $sort => $title) { if ($sortby == $sort) { - $OUT .= "" . $title . " | "; + $OUT .= '' . $title . ' | '; } else { - $OUT .= "" . $title . " | "; + $OUT .= '' . $title . ' | '; } } // END - foreach @@ -138,11 +138,11 @@ function addPageNavigation ($PAGES, $offset, $show_form, $colspan,$return=false) //if ($show_form === true) { // // Load form for changing number of lines // define('__FORM_HEADER', loadTemplate('admin_list_user_sort_form', true)); - // define('__FORM_FOOTER', ' '); + // define('__FORM_FOOTER', ' '); //} else { // // Empty row // define('__FORM_HEADER', ' '); - // define('__FORM_FOOTER', ' '); + // define('__FORM_FOOTER', ' '); //} $OUT = ''; @@ -154,14 +154,14 @@ function addPageNavigation ($PAGES, $offset, $show_form, $colspan,$return=false) if (!isGetRequestElementSet('sortby')) setRequestGetElement('sortby', 'userid'); // Base link - $OUT .= ''; + $OUT .= '&letter=' . getRequestElement('letter') . '&sortby=' . getRequestElement('sortby') . '&page=' . $page . '&offset=' . $offset . '%}">'; } $OUT .= $page; @@ -210,7 +210,7 @@ LIMIT 1", list($userid) = SQL_FETCHROW($result); // Rewrite email address to contact link - $email = '{?URL?}/modules.php?module=' . $mod . '&what=user_contct&userid=' . bigintval($userid); + $email = '{%url=modules.php?module=' . $mod . '&what=user_contct&userid=' . bigintval($userid) . '%}'; } // END - if // Free memory @@ -221,6 +221,7 @@ LIMIT 1", } // Selects a random user id as the new referal id if they have at least X confirmed mails in this run +// @TODO Double-check configuration entry here function determineRandomReferalId () { // Default is zero refid $refid = '0'; @@ -264,6 +265,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p $dmy = ''; $add = ''; $errorCode = '0'; + $ext = ''; // Add last_login if available $lastOnline = ''; @@ -281,9 +283,13 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p ); // Check login data - if ((isExtensionActive('nickname')) && (isNicknameOrUserid($userid))) { + if ((isExtensionActive('nickname')) && (isNicknameUsed($userid))) { // Nickname entered fetchUserData($userid, 'nickname'); + } elseif (isNicknameUsed($userid)) { + // No nickname installed + $errorCode = getCode('EXTENSION_PROBLEM'); + $ext = 'nickname'; } else { // Direct userid entered fetchUserData($userid); @@ -294,7 +300,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p if (!empty($content['userid'])) $userid = bigintval($content['userid']); // Is there an entry? - if ((isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && ((isNicknameUsed($content['userid'] === true) && (!empty($content['userid']))) || ($content['userid'] == $userid))) { + if (((isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) || ($content['userid'] == $userid)) { // Check for old MD5 passwords if ((strlen($content['password']) == 32) && (md5($passwd) == $content['password'])) { // Just set the hash to the password from DB... :) @@ -320,7 +326,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p // Probe for last online timemark $probe = time() - $content['last_online']; if (!empty($content['last_login'])) $probe = time() - $content['last_login']; - if ((getExtensionVersion('bonus') >= '0.2.2') && ($probe >= getConfig('login_timeout'))) { + if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && ($probe >= getConfig('login_timeout'))) { // Add login bonus to user's account $add = ', `login_bonus`=`login_bonus`+{?login_bonus?}'; $GLOBALS['bonus_payed'] = true; @@ -362,7 +368,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p } } else { // Cookies not setable! - $errorCode = getCode('NO_COOKIES'); + $errorCode = getCode('COOKIES_DISABLED'); } } elseif (getExtensionVersion('sql_patches') >= '0.6.1') { // Update failture counter @@ -372,7 +378,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p // Wrong password! $errorCode = getCode('WRONG_PASS'); } - } elseif (((isNicknameUsed($content['userid'])) && (!empty($content['userid']))) || ($content['userid'] == $userid)) { + } elseif (((isExtensionActive('nickname')) && (isNicknameUsed($content['userid'])) && (!empty($content['userid']))) || ($content['userid'] == $userid)) { // Other account status? if (fetchUserData($userid)) { // Create an error code from given status @@ -381,7 +387,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p // id not found! $errorCode = getCode('WRONG_ID'); } - } else { + } elseif ($errorCode == '0') { // id not found! $errorCode = getCode('WRONG_ID'); } @@ -390,6 +396,9 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p 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 @@ -398,16 +407,17 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p // Try to send a new password for the given user account function doNewUserPassword ($email, $userid) { - // Compile email when found in address (only secure chars!) - if (!empty($email)) $email = str_replace('{DOT}', '.', $email); - // Init result and error $errorCode = ''; $result = false; // Probe userid/nickname // @TODO We should try to rewrite this to fetchUserData() somehow - if ((isExtensionActive('nickname')) && (isNicknameOrUserid($userid))) { + if (!empty($email)) { + // Email entered + $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `email`='%s' OR `email`='%s' LIMIT 1", + array($email, str_replace('.', '{DOT}', $email)), __FUNCTION__, __LINE__); + } elseif ((isExtensionActive('nickname')) && (isNicknameOrUserid($userid))) { // Nickname entered $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `nickname`='%s' OR `userid`='%s' OR `email`='%s' LIMIT 1", array($userid, $userid, $email), __FUNCTION__, __LINE__); @@ -415,10 +425,6 @@ function doNewUserPassword ($email, $userid) { // Direct userid entered $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __FUNCTION__, __LINE__); - } elseif (!empty($email)) { - // Email entered - $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! logDebugMessage(__FUNCTION__, __LINE__, 'Userid is not set! BUG!');