Possible final fixes for user login, debug lines rewritten to logfile, some old lost...

[mailer.git] / inc / libs / user_functions.php

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 8a0ede3f2971e6964e21455db252627efc260413..5ba0d3f8d912e6b360256d5da0924700922b1980 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -43,22 +43,22 @@ if (!defined('__SECURITY')) {
 
 // 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');
+       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 .= '<strong>' . $ltr . '</strong>';
                } else {
                        // Output link to letter
                        $OUT .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat();
-                       if (isGetRequestElementSet('mode')) $OUT .= '&amp;mode=' . getRequestElement('mode');
+                       if (isGetRequestParameterSet('mode')) $OUT .= '&amp;mode=' . getRequestParameter('mode');
                        $OUT .= '&amp;letter=' . $ltr . '&amp;sortby=' . $sortby . $add . '%}">' . $ltr . '</a>';
                }
 
@@ -83,15 +83,15 @@ function alpha ($sortby, $colspan, $return=false) {
 // Add links for sorting
 function addSortLinks ($letter, $sortby, $colspan, $return=false) {
        $OUT = '';
-       if (!isGetRequestElementSet('offset')) setRequestGetElement('offset', 0);
-       if (!isGetRequestElementSet('page'))   setRequestGetElement('page'  , 0);
+       if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', 0);
+       if (!isGetRequestParameterSet('page'))   setGetRequestParameter('page'  , 0);
 
        // Add page and offset
-       $add = '&amp;page=' . getRequestElement('page') . '&amp;offset=' . getRequestElement('offset');
+       $add = '&amp;page=' . getRequestParameter('page') . '&amp;offset=' . getRequestParameter('offset');
 
        // Add status or mode
-       if (isGetRequestElementSet('status'))   $add .= '&amp;mode=' . getRequestElement('status');
-       elseif (isGetRequestElementSet('mode')) $add .= '&amp;mode=' . getRequestElement('mode');
+       if (isGetRequestParameterSet('status'))   $add .= '&amp;mode=' . getRequestParameter('status');
+       elseif (isGetRequestParameterSet('mode')) $add .= '&amp;mode=' . getRequestParameter('mode');
 
        // Makes order by links..
        if ($letter == 'front') $letter = getMessage('_ALL2');
@@ -133,9 +133,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', '<tr><td colspan="'.$colspan.'" class="seperator bottom">&nbsp;</td></tr>');
@@ -146,33 +146,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 .= '<strong>-';
                } else {
-                       if (!isGetRequestElementSet('letter')) setRequestGetElement('letter', getMessage('_ALL2'));
-                       if (!isGetRequestElementSet('sortby')) setRequestGetElement('sortby', 'userid');
+                       if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', getMessage('_ALL2'));
+                       if (!isGetRequestParameterSet('sortby')) setGetRequestParameter('sortby', 'userid');
 
                        // Base link
                        $OUT .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat();
 
                        // Add status or mode
-                       if (isGetRequestElementSet('status'))    $OUT .= '&amp;mode=' . getRequestElement('status');
-                        elseif (isGetRequestElementSet('mode')) $OUT .= '&amp;mode=' . getRequestElement('mode');
+                       if (isGetRequestParameterSet('status'))    $OUT .= '&amp;mode=' . getRequestParameter('status');
+                        elseif (isGetRequestParameterSet('mode')) $OUT .= '&amp;mode=' . getRequestParameter('mode');
 
                        // Letter and so on
-                       $OUT .= '&amp;letter=' . getRequestElement('letter') . '&amp;sortby=' . getRequestElement('sortby') . '&amp;page=' . $page . '&amp;offset=' . $offset . '%}">';
+                       $OUT .= '&amp;letter=' . getRequestParameter('letter') . '&amp;sortby=' . getRequestParameter('sortby') . '&amp;page=' . $page . '&amp;offset=' . $offset . '%}">';
                }
 
                $OUT .= $page;
 
-               if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
+               if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
                        $OUT .= '-</strong>';
                } else  {
                        $OUT .= '</a>';
                }
 
-               if ($page < $PAGES) $OUT .= '&nbsp;|&nbsp;';
+               if ($page < $pages) $OUT .= '&nbsp;|&nbsp;';
        } // END - for
 
        // Remember the list
@@ -267,12 +267,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 +289,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 +330,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 +345,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&amp;mode=bonus';
                                                } else {