X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=a3772fa4f5e5597897f8ef7aa54f5a51c38cb863;hb=f51be78aa682f22b29fcfcfcd4331d6b3b47a552;hp=8a0ede3f2971e6964e21455db252627efc260413;hpb=039203d5428c9c6a3bed61fb3a9a16958c6fd44c;p=mailer.git
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 8a0ede3f29..a3772fa4f5 100644
--- 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 .= '' . $ltr . '';
} else {
// Output link to letter
$OUT .= '' . $ltr . '';
}
@@ -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 = '&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 +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', '| |
');
@@ -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 .= '-';
} 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 .= '';
+ $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 +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']);
@@ -337,10 +331,11 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
} // END - if
// Calculate new hash with the secret key and master salt together
- $content['hash'] = generatePassString($content['hash']);
+ $content['hash'] = encodeHashForCookie($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!)
@@ -352,7 +347,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 {