X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=8e913f21ae3d51c9a9c228e4ff060f5f35951c4b;hp=03fbfae67bde258e1171b40b07427051ac61ee51;hb=b29dab42eab7c64ca1945eb70fa7713f8898f6ae;hpb=c47144dd555bbab4acdf9085e4623900dedb0e7c diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 03fbfae67b..8e913f21ae 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -10,7 +10,12 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Spezielle Funktionen fuer die user-Erweiterung * * -------------------------------------------------------------------- * - * * + * $Revision:: $ * + * $Date:: $ * + * $Tag:: 0.2.1-FINAL $ * + * $Author:: $ * + * Needs to be in all Files and every File needs "svn propset * + * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * @@ -39,24 +44,23 @@ if (!defined('__SECURITY')) { // Add links for selecting some users function alpha ($sortby, $colspan, $return=false) { - global $_CONFIG; - if (empty($_GET['offset'])) $_GET['offset'] = 0; - $ADD = "&page=".SQL_ESCAPE($_GET['page'])."&offset=".SQL_ESCAPE($_GET['offset']); - if (!empty($_GET['mode'])) $ADD .= "&mode=".SQL_ESCAPE($_GET['mode']); + 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')); /* Creates the list of letters and makes them a link. */ - $alphabet = array(_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",_OTHERS); + $alphabet = array(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')); $num = count($alphabet) - 1; $OUT = ""; while (list($counter, $ltr) = each($alphabet)) { - if ($_GET['letter'] == $ltr) { + if (REQUEST_GET('letter') == $ltr) { // Current letter is letter from URL $OUT .= "".$ltr.""; } else { // Output link to letter $OUT .= "".$ltr.""; + if (REQUEST_ISSET_GET(('mode'))) $OUT .= "&mode=".REQUEST_GET(('mode')); + $OUT .= "&letter=".$ltr."&sortby=".$sortby.$add."\">".$ltr.""; } if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) { @@ -70,7 +74,7 @@ function alpha ($sortby, $colspan, $return=false) { // Load template $OUT = LOAD_TEMPLATE("admin_list_user_alpha", true); - if ($return) { + if ($return === true) { // Return generated code return $OUT; } else { @@ -80,39 +84,39 @@ function alpha ($sortby, $colspan, $return=false) { } // Add links for sorting -function SortLinks($letter, $sortby, $colspan, $return=false) { +function SortLinks ($letter, $sortby, $colspan, $return=false) { $OUT = ""; - if (empty($_GET['offset'])) $_GET['offset'] = 0; - if (empty($_GET['page'])) $_GET['page'] = 0; + if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_GET('offset', 0); + if (!REQUEST_ISSET_GET(('page'))) REQUEST_SET_GET('page' , 0); // Add page and offset - $ADD = "&page=".SQL_ESCAPE($_GET['page'])."&offset=".SQL_ESCAPE($_GET['offset']); + $add = "&page=".REQUEST_GET(('page'))."&offset=".REQUEST_GET(('offset')); // Add status or mode - if (!empty($_GET['status'])) $ADD .= "&mode=".SQL_ESCAPE($_GET['status']); - elseif (!empty($_GET['mode'])) $ADD .= "&mode=".SQL_ESCAPE($_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 = _ALL2; + if ($letter == "front") $letter = getMessage('_ALL2'); // Prepare array with all possible sorters $list = array( - 'userid' => _UID, - 'family' => FAMILY_NAME, - 'email' => ADDY, - 'REMOTE_ADDR' => REMOTE_IP + 'userid' => getMessage('_UID'), + 'family' => getMessage('FAMILY_NAME'), + 'email' => getMessage('ADDY'), + 'REMOTE_ADDR' => getMessage('REMOTE_IP') ); // Add nickname if extension is installed if (EXT_IS_ACTIVE("nickname")) { - $list['nickname'] = NICKNAME; - } + $list['nickname'] = getMessage('NICKNAME'); + } // END - if foreach ($list as $sort => $title) { if ($sortby == $sort) { $OUT .= "".$title." | "; } else { - $OUT .= "".$title." | "; + $OUT .= "".$title." | "; } } // END - foreach @@ -120,7 +124,7 @@ function SortLinks($letter, $sortby, $colspan, $return=false) { // Load template $OUT = LOAD_TEMPLATE("admin_list_user_sort", true); - if ($return) { + if ($return === true) { // Return code return $OUT; } else { @@ -130,7 +134,7 @@ function SortLinks($letter, $sortby, $colspan, $return=false) { } // Add page navigation -function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) { +function ADD_PAGENAV ($PAGES, $offset, $show_form, $colspan,$return=false) { if (!$show_form) { // Empty row define('__FORM_HEADER', " "); @@ -141,34 +145,34 @@ function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) { if (!$show_form) { // Add line with bottom border - define('__FORM_FOOTER', " "); + define('__FORM_FOOTER', " "); } else { // Add line without bottom border - define('__FORM_FOOTER', " "); + define('__FORM_FOOTER', " "); } $OUT = ""; for ($page = 1; $page <= $PAGES; $page++) { - if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1"))) { + if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET(('page'))) && ($page == "1"))) { $OUT .= "-"; } else { - if (empty($_GET['letter'])) $_GET['letter'] = _ALL2; - if (empty($_GET['sortby'])) $_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 .= ""; + $OUT .= "&letter=".REQUEST_GET(('letter'))."&sortby=".REQUEST_GET(('sortby'))."&page=".$page."&offset=".$offset."\">"; } $OUT .= $page; - if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1"))) { + if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET(('page'))) && ($page == "1"))) { $OUT .= "-"; } else { $OUT .= ""; @@ -181,7 +185,7 @@ function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) { // Load template $OUT = LOAD_TEMPLATE("admin_list_user_pagenav", true); - if ($return) { + if ($return === true) { // Return code return $OUT; } else { @@ -200,14 +204,14 @@ function USER_CREATE_EMAIL_LINK($email, $mod="admin") { $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` -WHERE email='%s'".$locked." LIMIT 1", - array($email), __FILE__, __LINE__); +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&u_id=".bigintval($uid); + $email = "{!URL!}/modules.php?module=".$mod."&what=user_contct&uid=".bigintval($uid); } // END - if // Free memory @@ -219,8 +223,6 @@ WHERE email='%s'".$locked." LIMIT 1", // Selects a random user id as the new referal id if they have at least X confirmed mails in this run function SELECT_RANDOM_REFID () { - global $_CONFIG; - // Default is zero refid $refid = 0; @@ -236,7 +238,7 @@ function SELECT_RANDOM_REFID () { // Look for random user $result = SQL_QUERY_ESC("SELECT `userid` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' AND `rand_confirmed` >= %s ORDER BY `rand_confirmed` DESC LIMIT %s, 1", - array(getConfig('user_min_confirmed'), $randNum), __FILE__, __LINE__); + array(getConfig('user_min_confirmed'), $randNum), __FUNCTION__, __LINE__); // Do we have one entry there? if (SQL_NUMROWS($result) == 1) { @@ -245,7 +247,7 @@ function SELECT_RANDOM_REFID () { // Reset this user's counter SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `rand_confirmed`=0 WHERE userid=%s LIMIT 1", - array($refid), __FILE__, __LINE__); + array($refid), __FUNCTION__, __LINE__); } // END - if // Free result @@ -259,88 +261,95 @@ function SELECT_RANDOM_REFID () { // Do the user login function USER_DO_LOGIN ($uid, $passwd) { + // Init variables + $dmy = ""; + // Add last_login if available - $LAST = ""; + $lastOnline = ""; if (GET_EXT_VERSION("sql_patches") >= "0.2.8") { - $LAST = ", last_login"; + $lastOnline = ", last_login"; } // END - if + // Init array + $content = array( + 'password' => "", + 'userid' => "", + 'last_online' => 0, + 'last_login' => 0, + 'hash' => "" + ); + // Check login data - $password = ""; $uid2 = ""; $dmy = ""; $online = 0; $login = 0; if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID($uid))) { // Nickname entered - $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$LAST." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' AND `status`='CONFIRMED' LIMIT 1", - array($uid), __FILE__, __LINE__); - list($uid2, $password, $online, $login) = SQL_FETCHROW($result); - if (!empty($uid2)) $uid = bigintval($uid2); + $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".$LAST." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1", - array($uid, $hash), __FILE__, __LINE__); - list($uid2, $password, $online, $login) = SQL_FETCHROW($result); + $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__); } + // Load entry + $content = SQL_FETCHARRAY($result); + if (!empty($content['userid'])) $uid = bigintval($content['userid']); + // Is there an entry? - if ((SQL_NUMROWS($result) == 1) && ((($probe_nickname) && (!empty($uid2))) || ($uid2 == $uid))) { + if ((SQL_NUMROWS($result) == 1) && ((($probe_nickname) && (!empty($content['userid']))) || ($content['userid'] == $uid))) { // Free result SQL_FREERESULT($result); - // By default the hash is empty - $hash = ""; - // Check for old MD5 passwords - if ((strlen($password) == 32) && (md5($passwd) == $password)) { + if ((strlen($content['password']) == 32) && (md5($passwd) == $content['password'])) { // Just set the hash to the password from DB... :) - $hash = $password; + $content['hash'] = $content['password']; } else { // Hash password with improved way for comparsion - $hash = generateHash($passwd, substr($password, 0, -40)); + $content['hash'] = generateHash($passwd, substr($content['password'], 0, -40)); } - if ($hash == $password) { + // Does the password match the hash? + if ($content['hash'] == $content['password']) { // New hashed password found so let's generate a new one - $hash = generateHash($passwd); + $content['hash'] = generateHash($passwd); // ... 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", - array($hash, $uid), __FILE__, __LINE__); + array($content['hash'], $uid), __FUNCTION__, __LINE__); // No login bonus by default - // @TODO Make this filter working: $ADDON = RUN_FILTER('post_login_update', array('login' => $login, 'online' => $online)); - $BONUS = false; + $GLOBALS['bonus_payed'] = false; // Probe for last online timemark - $probe = time() - $online; - if (!empty($login)) $probe = time() - $login; + $probe = time() - $content['last_online']; + 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') ); - $BONUS = true; + $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'); } // END - if - // Init variables - $login = false; - // Calculate new hash with the secret key and master salt together - $hash = generatePassString($hash); + $content['hash'] = generatePassString($content['hash']); // Update global array - // @TODO Make this filter working: $URL = RUN_FILTER('do_login', array('uid' => $uid, 'hash' => $hash, 'addon' => $ADDON)); - $GLOBALS['userid'] = $uid; + // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON)); + setUserId($uid); // Try to set session data (which shall normally always work!) - if ((set_session('userid', $uid )) && (set_session('u_hash', $hash))) { + if ((set_session('userid', $uid )) && (set_session('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", - array($uid), __FILE__, __LINE__); + 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 (($BONUS) && (EXT_IS_ACTIVE("bonus"))) { + if (($GLOBALS['bonus_payed']) && (EXT_IS_ACTIVE("bonus"))) { // Bonus added (just displaying!) $URL = "modules.php?module=chk_login&mode=bonus"; } else { @@ -349,25 +358,25 @@ function USER_DO_LOGIN ($uid, $passwd) { } } else { // Cannot update counter! - $URL = "modules.php?module=index&what=login&login=".CODE_CNTR_FAILED; + $URL = "modules.php?module=index&what=login&login=".getCode('CNTR_FAILED'); } } else { // Cookies not setable! - $URL = "modules.php?module=index&what=login&login=".CODE_NO_COOKIES; + $URL = "modules.php?module=index&what=login&login=".getCode('NO_COOKIES'); } } 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", - array($uid), __FILE__, __LINE__); + array($uid), __FUNCTION__, __LINE__); // Wrong password! - $URL = "modules.php?module=index&what=login&login=".CODE_WRONG_PASS; + $URL = "modules.php?module=index&what=login&login=".getCode('WRONG_PASS'); } - } elseif ((($probe_nickname) && (!empty($uid2))) || ($uid2 == $uid)) { + } elseif ((($probe_nickname) && (!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", - array($uid), __FILE__, __LINE__); + array($uid), __FUNCTION__, __LINE__); // Entry found? if (SQL_NUMROWS($result) == 1) { @@ -378,14 +387,14 @@ function USER_DO_LOGIN ($uid, $passwd) { $ERROR = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status); } else { // ID not found! - $ERROR = CODE_WRONG_ID; + $ERROR = getCode('WRONG_ID'); } // Construct URL $URL = "modules.php?module=index&what=login&login=".$ERROR; } else { // ID not found! - $URL = "modules.php?module=index&what=login&login=".CODE_WRONG_ID; + $URL = "modules.php?module=index&what=login&login=".getCode('WRONG_ID'); } // Return URL @@ -405,19 +414,19 @@ function USER_DO_NEW_PASSWORD ($email, $uid) { if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID($uid))) { // Nickname entered $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' OR email='%s' LIMIT 1", - array($uid, $email), __FILE__, __LINE__); + 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", - array(bigintval($uid)), __FILE__, __LINE__); + 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", - array($email), __FILE__, __LINE__); + array($email), __FUNCTION__, __LINE__); } else { // Userid not set! DEBUG_LOG(__FUNCTION__, __LINE__, "Userid is not set! BUG!"); - $ERROR = CODE_WRONG_ID; + $ERROR = getCode('WRONG_ID'); } // Any entry found? @@ -429,7 +438,7 @@ function USER_DO_NEW_PASSWORD ($email, $uid) { // Ooppps, this was missing! ;-) We should update the database... $NEW_PASS = GEN_PASS(); SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET password='%s' WHERE userid=%s LIMIT 1", - array(generateHash($NEW_PASS), $uid), __FILE__, __LINE__); + 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); @@ -448,7 +457,7 @@ function USER_DO_NEW_PASSWORD ($email, $uid) { } } else { // ID or email is wrong - LOAD_TEMPLATE("admin_settings_saved", false, "".GUEST_WRONG_ID_EMAIL.""); + LOAD_TEMPLATE("admin_settings_saved", false, "{--GUEST_WRONG_ID_EMAIL--}"); } // Return the error code