From: Roland Häder Date: Mon, 1 Dec 2008 22:56:10 +0000 (+0000) Subject: Missing column 'active_bonus' fixed, some while() loops rewritten X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=ee715f8d4c903b61f943df392b93acb6ad9c2602 Missing column 'active_bonus' fixed, some while() loops rewritten --- diff --git a/inc/databases.php b/inc/databases.php index 13ef62e381..963f18b87c 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -114,7 +114,7 @@ define('USAGE_BASE', "usage"); define('SERVER_URL', "http://www.mxchange.org"); // This current patch level -define('CURR_SVN_REVISION', "580"); +define('CURR_SVN_REVISION', "581"); // Take a prime number which is long (if you know a longer one please try it out!) define('_PRIME', 591623); diff --git a/inc/extensions/ext-surfbar.php b/inc/extensions/ext-surfbar.php index 723662b98f..e9bc3d7f79 100644 --- a/inc/extensions/ext-surfbar.php +++ b/inc/extensions/ext-surfbar.php @@ -225,6 +225,8 @@ case "update": // Update an extension break; default: // Do stuff when extension is loaded + // Set some constants we need??? + define('edit', "edit"); break; } diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index b7c91c62ca..fbdea104d5 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -370,10 +370,10 @@ ORDER BY d.userid"; $LAST = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']); } - $SQLs[] = "SELECT ".$USE." AS active_bonus + $SQLs[] = "SELECT ".$USE." AS points FROM "._MYSQL_PREFIX."_user_data WHERE status='CONFIRMED' AND ".$USE.">0".$LAST." -ORDER BY active_bonus DESC, userid"; +ORDER BY points DESC, userid"; $WHATs[] = "list_bonus"; $DESCRs[] = TASK_ADMIN_LIST_BONUS; $TITLEs[] = TASK_ADMIN_LIST_BONUS_TITLE; diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php index d235486004..c6b44cf930 100644 --- a/inc/modules/admin/what-list_bonus.php +++ b/inc/modules/admin/what-list_bonus.php @@ -74,16 +74,19 @@ if ($_CONFIG['bonus_active'] == "Y") { } // Check if at least one is in the active rallye - $result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, ".$USE." AS active_bonus, last_online + $result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, ".$USE." AS points, last_online FROM "._MYSQL_PREFIX."_user_data WHERE status='CONFIRMED' AND ".$USE." > 0".$LAST." -ORDER BY active_bonus DESC, last_online DESC, userid", +ORDER BY points DESC, last_online DESC, userid", array($ONLINE), __FILE__, __LINE__); if (SQL_NUMROWS($result) > 0) { // List users $OUT = "";$SW = 2; $cnt = 1; $total = 0; - while(list($uid, $email, $gender, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result)) { + while ($content = SQL_FETCHARRAY($result)) { + // Add total points + $total += $content['points']; + // Generate array fore the dynamic template $WIN1 = ""; $WIN2 = ""; if ($cnt <= $_CONFIG['bonus_ranks']) { @@ -93,23 +96,18 @@ ORDER BY active_bonus DESC, last_online DESC, userid", } // Prepare content - $content = array( - 'uid' => $uid, - 'email' => CREATE_EMAIL_LINK($email, "user_data"), - 'gender' => TRANSLATE_GENDER($gender), - 'sname' => $sname, - 'fname' => $fname, - 'turbo' => TRANSLATE_COMMA($turbo), - 'last' => MAKE_DATETIME($last, "2"), - 'sw' => $SW, - 'win1' => $WIN1, - 'win2' => $WIN2, - 'cnt' => $cnt, - ); + $content['email'] = CREATE_EMAIL_LINK($content['email'], "user_data"); + $content['gender'] = TRANSLATE_GENDER($content['gender']); + $content['points'] = TRANSLATE_COMMA($content['points']); + $content['last'] = MAKE_DATETIME($content['last'], "2"); + $content['sw'] = $SW; + $content['win1'] = $WIN1; + $content['win2'] = $WIN2; + $content['cnt' = $cnt; // Load template and add it $OUT .= LOAD_TEMPLATE("admin_list_bonus_rows", true, $content); - $SW = 3 - $SW; $cnt++; $total += $turbo; + $SW = 3 - $SW; $cnt++; } define('__BONUS_ROWS', $OUT); define('__TOTAL', TRANSLATE_COMMA($total)); diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php index 9a223e9a20..1c20685a78 100644 --- a/inc/modules/member/what-bonus.php +++ b/inc/modules/member/what-bonus.php @@ -71,27 +71,25 @@ if (EXT_IS_ACTIVE("autopurge")) { } // Let's check if there are some points left we can "pay"... -$result = SQL_QUERY_ESC("SELECT userid, ".$USE." AS active_bonus, last_online FROM "._MYSQL_PREFIX."_user_data +$result = SQL_QUERY_ESC("SELECT userid, ".$USE." AS points, last_online FROM "._MYSQL_PREFIX."_user_data WHERE ".$USE." > 0 AND status='CONFIRMED'".$LAST." -ORDER BY active_bonus DESC, last_online DESC, userid LIMIT %s", +ORDER BY points DESC, last_online DESC, userid +LIMIT %s", array($ONLINE, $_CONFIG['bonus_ranks']), __FILE__, __LINE__); // Reset temporary variable and check for users $OUT = ""; -if (SQL_NUMROWS($result) > 0) -{ +if (SQL_NUMROWS($result) > 0) { // Load our winners... $SW = 2; $cnt = 1; - while(list($uid, $turbo, $last) = SQL_FETCHROW($result)) - { + while ($content = SQL_FETCHARRAY($result)) { // Prepare data for the template $content = array( - 'sw' => $SW, - 'cnt' => $cnt, - 'uid' => bigintval($uid), - 'points' => TRANSLATE_COMMA($turbo), - 'last' => MAKE_DATETIME($last, "2"), - ); + $content['sw'] = $SW; + $content['cnt'] = $cnt; + $content['uid'] = bigintval($content['uid']); + $content['points'] = TRANSLATE_COMMA($content['points']); + $content['last'] = MAKE_DATETIME($content['last'], "2"); // Load row template $OUT .= LOAD_TEMPLATE("member_bonus_row", true, $content); @@ -99,9 +97,7 @@ if (SQL_NUMROWS($result) > 0) // Count one up and switch colors $cnt++;$SW = 3 - $SW; } -} - else -{ +} else { // No one is interested in our "active rallye" ! :-( $OUT = LOAD_TEMPLATE("member_bonus_404", true); } diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php index 281c08a043..1ac1f05ea0 100644 --- a/inc/monthly/monthly_bonus.php +++ b/inc/monthly/monthly_bonus.php @@ -78,7 +78,8 @@ if (($curr != $_CONFIG['last_month']) && ($_CONFIG['bonus_ranks'] > 0) && ($CSS $result_main = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, (0".$ADD.") AS points FROM "._MYSQL_PREFIX."_user_data ".$whereStatement1."".$ADD." -ORDER BY active_bonus DESC, userid LIMIT %s", +ORDER BY points DESC, userid +LIMIT %s", array($whereStatement2), __FILE__, __LINE__); // Some entries were found? @@ -91,7 +92,7 @@ ORDER BY active_bonus DESC, userid LIMIT %s", ADD_POINTS_REFSYSTEM("monthly_bonus", $content['uid'], $content['points'], false, "0", false, "direct"); // Translate gender/points - $content['gender'] = TRANSLATE_GENDER($content['gender']); + $content['gender'] = TRANSLATE_GENDER($content['gender']); $content['points'] = TRANSLATE_COMMA($content['points']); // Load email template and email it away