X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-points.php;h=563eab9f39e225bf86089a8da62c64400a19c0d2;hb=f6014bce7255a915872f2f463247440c0d58f9a9;hp=d83e597a0b820624b68c4a1d973287f129e5feab;hpb=6797270f78974371c16533a0cf2f450bef362c88;p=mailer.git diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php index d83e597a0b..563eab9f39 100644 --- a/inc/modules/member/what-points.php +++ b/inc/modules/member/what-points.php @@ -17,7 +17,7 @@ * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * * Copyright (c) 2009 - 2011 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -45,8 +45,8 @@ if (!defined('__SECURITY')) { // Add description as navigation point addYouAreHereLink('member', __FILE__); -// Query for referal levels and percents -$result_depths = SQL_QUERY("SELECT `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC", __FILE__, __LINE__); +// Query for referral levels and percents +$result_depths = SQL_QUERY('SELECT `level`,`percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY `level` ASC', __FILE__, __LINE__); // Get total depths $numDepths = SQL_NUMROWS($result_depths); @@ -60,41 +60,55 @@ if (isExtensionInstalledAndNewer('bonus', '0.4.4')) $numDepths += 4; // Remember row count in constant $content['rowspan'] = ($numDepths * 2 + 15); -// Init some vars... -$content['total_points'] = '0'; -$content['total_referals'] = '0'; -$content['total_locked'] = '0'; +// Initialize array elements +$content['part_points'] = '0.00000'; +$content['part_referrals'] = '0'; +$content['part_locked'] = '0.00000'; +$content['part_order'] = '0.00000'; +$content['part_locked_order'] = '0.00000'; + +// And output variable $OUT = ''; // Load ref levels while ($data = SQL_FETCHARRAY($result_depths)) { + // Init points and counter here + $content['counter'] = '0'; + $content['points'] = '0.00000'; + $content['order_points'] = '0.00000'; + $content['locked_points'] = '0.00000'; + $content['locked_order_points'] = '0.00000'; + // Merge it together $content = merge_array($content, $data); - // Initialize array elements - $content['counter'] = '0'; - $content['points'] = '0.00000'; - $content['locked_points'] = '0.00000'; + // Default for referral level > 0 + $depth = 'p.`ref_depth`=%s'; + if (is_null($content['level'])) { + $depth = 'p.`ref_depth` IS NULL'; + } // END - if - // Load referal points + // Load referral points $result_points = SQL_QUERY_ESC("SELECT p.`points`, + p.`order_points`, p.`locked_points`, + p.`locked_order_points`, r.`counter` FROM `{?_MYSQL_PREFIX?}_user_points` AS p -INNER JOIN +LEFT JOIN `{?_MYSQL_PREFIX?}_refsystem` AS r ON p.`userid`=r.`userid` AND p.`ref_depth`=r.`level` WHERE p.`userid`=%s AND - p.`ref_depth`='%s' + ".$depth." LIMIT 1", array( getMemberId(), - bigintval($content['level']) + convertZeroToNull($content['level']) ), __FILE__, __LINE__); // Do we have an entry? @@ -103,13 +117,15 @@ LIMIT 1", $content = merge_array($content, SQL_FETCHARRAY($result_points)); // Add all entries - $content['total_points'] += $content['points']; - $content['total_locked'] += $content['locked_points']; - $content['total_referals'] += $content['counter']; + $content['part_points'] += $content['points']; + $content['part_order'] += $content['order_points']; + $content['part_locked'] += $content['locked_points']; + $content['part_locked_order'] += $content['locked_order_points']; + $content['part_referrals'] += $content['counter']; } // END - if // Free result - SQL_FREERESULT($result_refs); + SQL_FREERESULT($result_points); // Output row $OUT .= loadTemplate('member_points_row', true, $content); @@ -118,12 +134,12 @@ LIMIT 1", // Free memory SQL_FREERESULT($result_depths); +// Add userid +$content['userid'] = getMemberId(); + // Put rows to constant for the main template $content['rows'] = $OUT; -// Remember several values in constants -$content['total_points'] = ($content['total_points'] - getUserData('used_points')); - // Fixes a bug when there is no bonus extension installed if (isExtensionInstalledAndOlder('bonus', '0.4.4')) { setConfigEntry('bonus_active', 'X'); @@ -135,14 +151,14 @@ $content['special_rows'] = ''; // Display login bonus and turbo-click bonus if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && (isExtensionActive('bonus')) && (isBonusRallyeActive())) { // Total bonus points - $content['total'] = getUserData('turbo_bonus') + getUserData('login_bonus') + getUserData('bonus_ref') + getUserData('bonus_order') + getUserData('bonus_stats'); + $content['bonus_total_points'] = getUserData('turbo_bonus') + getUserData('login_bonus') + getUserData('bonus_ref') + getUserData('bonus_order') + getUserData('bonus_stats'); // Output rows $content['special_rows'] = loadTemplate('member_points_bonus_rows', true, $content); } elseif ((isExtensionActive('bonus')) && (!isBonusRallyeActive())) { // Bonus active rallye deactivated $content['special_rows'] = loadTemplate('member_points_bonus_disabled', true); -} elseif ((isAdmin()) && (isExtensionOlder('bonus', '0.2.2')) && (isExtensionActive('bonus'))) { +} elseif ((isAdmin()) && (isExtensionInstalledAndOlder('bonus', '0.2.2')) && (isExtensionActive('bonus'))) { // Please upgrade your bonus extension to v0.2.2 or newer! $content['special_rows'] = loadTemplate('member_points_upgrade'); } @@ -153,7 +169,7 @@ if (isExtensionActive('user')) { loadTemplate('member_points', false, $content); } elseif (isAdmin()) { // Missing extension - displayMessage(generateExtensionInactiveNotInstalledMessage('user')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}'); } else { // Message for user displayMessage('{--PROBLEM_POINTS_OVERVIEW_UNAVAILABLE--}'); @@ -161,7 +177,7 @@ if (isExtensionActive('user')) { if (isExtensionActive('payout')) { // Payput extension is installed and active so we can check if the user has enougth points - outputPayoutList($content['total_points'] - getUserData('used_points')); + outputPayoutList($content['part_points'] - getUserData('used_points')); } // END - if // [EOF]