X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=8d9d74d72fef61c4537ca1a68923a9eb7ab81cc7;hb=7618bd22d09e9bddab2ca39308f6523c06dd1521;hp=a3772fa4f5e5597897f8ef7aa54f5a51c38cb863;hpb=f51be78aa682f22b29fcfcfcd4331d6b3b47a552;p=mailer.git
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index a3772fa4f5..8d9d74d72f 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 *
@@ -63,14 +64,20 @@ function alpha ($sortby, $colspan, $return=false) {
}
if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) {
- $OUT .= ' ]
[ ';
+ $OUT .= ']
[';
} elseif ( $counter != $num ) {
- $OUT .= ' | ';
+ $OUT .= '|';
}
} // END - while
+ // Prepare content
+ $content = array (
+ 'colspan2' => $colspan,
+ 'alpha_selection' => $OUT
+ );
+
// Load template
- $OUT = loadTemplate('admin_list_user_alpha', true, $OUT);
+ $OUT = loadTemplate('admin_list_user_alpha', true, $content);
if ($return === true) {
// Return generated code
return $OUT;
@@ -111,13 +118,15 @@ 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
+ // Add list and colspan
$content['list'] = substr($OUT, 0, -13);
+ $content['colspan2'] = $colspan;
// Load template
$OUT = loadTemplate('admin_list_user_sort', true, $content);
@@ -133,7 +142,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
}
// Add page navigation
-function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false) {
+function addPageNavigation ($numPages, $offset, $showForm, $colspan, $return=false) {
// @TODO These two constants are no longer used, maybe we reactivate this code?
//if ($showForm === true) {
// // Load form for changing number of lines
@@ -146,7 +155,7 @@ function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false)
//}
$OUT = '';
- for ($page = 1; $page <= $pages; $page++) {
+ for ($page = 1; $page <= $numPages; $page++) {
if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
$OUT .= '-';
} else {
@@ -172,11 +181,12 @@ function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false)
$OUT .= '';
}
- if ($page < $pages) $OUT .= ' | ';
+ if ($page < $numPages) $OUT .= '|';
} // END - for
- // Remember the list
- $content['list'] = $OUT;
+ // Remember the list and colspan
+ $content['list'] = $OUT;
+ $content['colspan2'] = $colspan;
// Load template
$OUT = loadTemplate('admin_list_user_pagenav', true, $content);
@@ -227,9 +237,9 @@ function determineRandomReferalId () {
$refid = '0';
// Is the extension version fine?
- if (getExtensionVersion('user') >= '0.3.4') {
+ if (isExtensionInstalledAndNewer('user', '0.3.4')) {
// Get all user ids
- $totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, " AND `rand_confirmed` >= ".getConfig('user_min_confirmed')."");
+ $totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, " AND `rand_confirmed` >= {?user_min_confirmed?}");
// Do we have at least one?
if ($totalUsers > 0) {
@@ -289,9 +299,12 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
fetchUserData($userid);
}
- // 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']);
+ // No error found?
+ if ($errorCode == '0') {
+ // 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']);
+ } // END - if
// Is there an entry?
if ((isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) {
@@ -327,19 +340,17 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
$GLOBALS['bonus_payed'] = true;
// Subtract login bonus from userid's account or jackpot
- if ((getExtensionVersion('bonus') >= '0.3.5') && (getConfig('bonus_mode') != 'ADD')) handleBonusPoints('login_bonus');
+ if ((isExtensionInstalledAndNewer('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'] = encodeHashForCookie($content['hash']);
-
- // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
+ // @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__);
@@ -349,14 +360,14 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
// Procedure to checking for login data
if (($GLOBALS['bonus_payed'] === true) && (isExtensionActive('bonus'))) {
// Bonus added (just displaying!)
- $URL = 'modules.php?module=chk_login&mode=bonus';
+ $url = 'modules.php?module=chk_login&mode=bonus';
} else {
// Bonus not added
- $URL = 'modules.php?module=chk_login&mode=login';
+ $url = 'modules.php?module=chk_login&mode=login';
}
} else {
// Use this URL
- $URL = $successUrl;
+ $url = $successUrl;
}
} else {
// Cannot update counter!
@@ -366,7 +377,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
// Cookies not setable!
$errorCode = getCode('COOKIES_DISABLED');
}
- } elseif (getExtensionVersion('sql_patches') >= '0.6.1') {
+ } elseif (isExtensionInstalledAndNewer('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($userid), __FUNCTION__, __LINE__);
@@ -391,14 +402,14 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
// Error code provided?
if ($errorCode > 0) {
// Then reconstruct the URL
- $URL = $errorUrl . $errorCode;
+ $url = $errorUrl . $errorCode;
// Extension set? Then add it as well.
- if (!empty($ext)) $URL .= '&ext=' . $ext;
+ if (!empty($ext)) $url .= '&ext=' . $ext;
} // END - if
// Return URL
- return $URL;
+ return $url;
}
// Try to send a new password for the given user account
@@ -445,7 +456,7 @@ function doNewUserPassword ($email, $userid) {
sendEmail($userid, getMessage('GUEST_NEW_PASSWORD'), $message);
// Output note to user
- loadTemplate('admin_settings_saved', false, getMessage('GUEST_NEW_PASSWORD_SEND'));
+ loadTemplate('admin_settings_saved', false, '{--GUEST_NEW_PASSWORD_SEND--}');
} else {
// Account is locked or unconfirmed
$errorCode = generateErrorCodeFromUserStatus($status);
@@ -462,5 +473,69 @@ function doNewUserPassword ($email, $userid) {
return $errorCode;
}
+// Get timestamp for given stats type and data
+function getTimestampFromUserStats ($statsType, $statsData, $userid = '0') {
+ // Default timestamp is zero
+ $data['inserted'] = '0';
+
+ // User id set?
+ if ((isMemberIdSet()) && ($userid == '0')) {
+ $userid = getMemberId();
+ } // END - if
+
+ // Is the extension installed and updated?
+ if ((!isExtensionActive('sql_patches')) || (isExtensionOlder('sql_patches', '0.5.6'))) {
+ // Return zero here
+ return $data['inserted'];
+ } // END - if
+
+ // Try to find the entry
+ $result = SQL_QUERY_ESC("SELECT
+ UNIX_TIMESTAMP(`inserted`) AS inserted
+FROM
+ `{?_MYSQL_PREFIX?}_user_stats_data`
+WHERE
+ `userid`=%s AND
+ `stats_type`='%s' AND
+ `stats_data`='%s'
+LIMIT 1",
+ array(
+ bigintval($userid),
+ $statsType,
+ $statsData
+ ), __FUNCTION__, __LINE__);
+
+ // Is the entry there?
+ if (SQL_NUMROWS($result) == 1) {
+ // Get this stamp
+ $data = SQL_FETCHARRAY($result);
+ } // END - if
+
+ // Free result
+ SQL_FREERESULT($result);
+
+ // Return stamp
+ return $data['inserted'];
+}
+
+// Inserts user stats
+function insertUserStatsRecord ($userid, $statsType, $statsData) {
+ // Is the extension installed and updated?
+ if ((!isExtensionActive('sql_patches')) || (isExtensionOlder('sql_patches', '0.5.6'))) {
+ // Return zero here
+ return false;
+ } // END - if
+
+ // Does it exist?
+ if ((!getTimestampFromUserStats($statsType, $statsData, $userid)) && (!is_array($statsData))) {
+ // Then insert it!
+ SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_stats_data` (`userid`,`stats_type`,`stats_data`) VALUES (%s,'%s','%s')",
+ array(bigintval($userid), $statsType, $statsData), __FUNCTION__, __LINE__);
+ } elseif (is_array($statsData)) {
+ // Invalid data!
+ logDebugMessage(__FUNCTION__, __LINE__, "userid={$userid},type={$statsType},data={".gettype($statsData).": Invalid statistics data type!");
+ }
+}
+
// [EOF]
?>