X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fuser_functions.php;h=709369f4adcd1804a89d3ac407deb61f78c1516e;hb=fd4bf800943a932696a2d2c25f702a771c2c3cf9;hp=1c4bc867ccdc873b5cd0641fb33045f4f0b97244;hpb=ca378407a00fb80cafe270a4a4424f1e5636e08b;p=mailer.git diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 1c4bc867cc..709369f4ad 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -18,6 +18,7 @@ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * + * Copyright (c) 2009, 2010 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -43,22 +44,22 @@ if (!defined('__SECURITY')) { // Add links for selecting some users function alpha ($sortby, $colspan, $return=false) { - if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', 0); - $add = '&page='.getRequestElement('page').'&offset='.getRequestElement('offset'); - if (isGetRequestElementSet('mode')) $add .= '&mode='.getRequestElement('mode'); + if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', 0); + $add = '&page='.getRequestParameter('page').'&offset='.getRequestParameter('offset'); + if (isGetRequestParameterSet('mode')) $add .= '&mode='.getRequestParameter('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')); $num = count($alphabet) - 1; $OUT = ''; while (list($counter, $ltr) = each($alphabet)) { - if (getRequestElement('letter') == $ltr) { + if (getRequestParameter('letter') == $ltr) { // Current letter is letter from URL $OUT .= '' . $ltr . ''; } else { // Output link to letter $OUT .= '' . $ltr . ''; } @@ -83,15 +84,15 @@ function alpha ($sortby, $colspan, $return=false) { // Add links for sorting function addSortLinks ($letter, $sortby, $colspan, $return=false) { $OUT = ''; - if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', 0); - if (!isGetRequestElementSet('page')) setGetRequestElement('page' , 0); + if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', 0); + if (!isGetRequestParameterSet('page')) setGetRequestParameter('page' , 0); // Add page and offset - $add = '&page=' . getRequestElement('page') . '&offset=' . getRequestElement('offset'); + $add = '&page=' . getRequestParameter('page') . '&offset=' . getRequestParameter('offset'); // Add status or mode - if (isGetRequestElementSet('status')) $add .= '&mode=' . getRequestElement('status'); - elseif (isGetRequestElementSet('mode')) $add .= '&mode=' . getRequestElement('mode'); + if (isGetRequestParameterSet('status')) $add .= '&mode=' . getRequestParameter('status'); + elseif (isGetRequestParameterSet('mode')) $add .= '&mode=' . getRequestParameter('mode'); // Makes order by links.. if ($letter == 'front') $letter = getMessage('_ALL2'); @@ -133,9 +134,9 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) { } // Add page navigation -function addPageNavigation ($PAGES, $offset, $show_form, $colspan,$return=false) { +function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false) { // @TODO These two constants are no longer used, maybe we reactivate this code? - //if ($show_form === true) { + //if ($showForm === true) { // // Load form for changing number of lines // define('__FORM_HEADER', loadTemplate('admin_list_user_sort_form', true)); // define('__FORM_FOOTER', ' '); @@ -146,33 +147,33 @@ function addPageNavigation ($PAGES, $offset, $show_form, $colspan,$return=false) //} $OUT = ''; - for ($page = 1; $page <= $PAGES; $page++) { - if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) { + for ($page = 1; $page <= $pages; $page++) { + if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) { $OUT .= '-'; } else { - if (!isGetRequestElementSet('letter')) setGetRequestElement('letter', getMessage('_ALL2')); - if (!isGetRequestElementSet('sortby')) setGetRequestElement('sortby', 'userid'); + if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', getMessage('_ALL2')); + if (!isGetRequestParameterSet('sortby')) setGetRequestParameter('sortby', 'userid'); // Base link $OUT .= ''; + $OUT .= '&letter=' . getRequestParameter('letter') . '&sortby=' . getRequestParameter('sortby') . '&page=' . $page . '&offset=' . $offset . '%}">'; } $OUT .= $page; - if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) { + if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) { $OUT .= '-'; } else { $OUT .= ''; } - if ($page < $PAGES) $OUT .= ' | '; + if ($page < $pages) $OUT .= ' | '; } // END - for // Remember the list @@ -267,12 +268,6 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p $errorCode = '0'; $ext = ''; - // Add last_login if available - $lastOnline = ''; - if (getExtensionVersion('sql_patches') >= '0.2.8') { - $lastOnline = ', `last_login`'; - } // END - if - // Init array $content = array( 'password' => '', @@ -295,7 +290,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p fetchUserData($userid); } - // Load entry + // Get user data array and set userid (e.g. important if we login with nickname) $content = getUserDataArray(); if (!empty($content['userid'])) $userid = bigintval($content['userid']); @@ -336,15 +331,14 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p if ((getExtensionVersion('bonus') >= '0.3.5') && (getConfig('bonus_mode') != 'ADD')) handleBonusPoints('login_bonus'); } // END - if - // Calculate new hash with the secret key and master salt together - $content['hash'] = generatePassString($content['hash']); - - // Update global array // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON)); + + // Set member id setMemberId($userid); // Try to set session data (which shall normally always work!) - if ((setSession('userid', $userid )) && (setSession('u_hash', $content['hash']))) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',hash=' . $content['hash'] . '(' . strlen($content['hash']) . ')'); + if ((setSession('userid', $userid )) && (setSession('u_hash', encodeHashForCookie($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($userid), __FUNCTION__, __LINE__); @@ -352,7 +346,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p // Is a success URL set? if (empty($successUrl)) { // Procedure to checking for login data - if (($GLOBALS['bonus_payed']) && (isExtensionActive('bonus'))) { + if (($GLOBALS['bonus_payed'] === true) && (isExtensionActive('bonus'))) { // Bonus added (just displaying!) $URL = 'modules.php?module=chk_login&mode=bonus'; } else {