Even more rewrites/fixes from EL branch (please report any broken part after you...

[mailer.git] / inc / monthly / monthly_beg.php

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index f9949262771bccc73fb1287a3d7c25b34c081927..370f3fddcc59c4ac41972157572640b5564dc12f 100644 (file)
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/22/2005 *
- * ===============                              Last change: 10/22/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 10/22/2005 *
+ * ===================                          Last change: 10/22/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : monthly_beg.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 *
@@ -58,7 +59,7 @@ if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getC
        // Shall we exclude webmaster's own userid?
        if ((getConfig('beg_include_own') != 'Y') && (getConfig('beg_userid') > 0)) {
                // Exclude it
-               $whereStatement1 = sprintf(" AND `userid` != %s", getConfig('beg_userid'));
+               $whereStatement1 = " AND `userid` != {?beg_userid?}";
        } // END - if
 
        // Let's check if there are some points left we can 'pay'...
@@ -66,7 +67,7 @@ if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getC
                // Use last online stamp only when autopurge for inactive members is activated
                if ((getConfig('ap_inactive_since') > 0) && (getConfig('beg_active') == 'Y')) {
                        // Okay, include last online timestamp
-                       $whereStatement1 .= sprintf(" AND `last_online` >= (UNIX_TIMESTAMP() - %s)", getConfig('ap_inactive_since'));
+                       $whereStatement1 .= " AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
                } // END - if
        } // END - if
 
@@ -76,9 +77,11 @@ if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getC
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       `status`='CONFIRMED'" . $whereStatement1 . " AND `beg_points` > 0
+       `status`='CONFIRMED'" . $whereStatement1 . " AND
+       `beg_points` > 0
 ORDER BY
-       `beg_points` DESC, `userid` ASC
+       `beg_points` DESC,
+       `userid` ASC
 LIMIT {?beg_ranks?}", __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result_main) > 0) {
@@ -87,10 +90,6 @@ LIMIT {?beg_ranks?}", __FILE__, __LINE__);
                        // Add points to user's account directly
                        addPointsDirectly('monthly_beg', $content['userid'], $content['points']);
 
-                       // Translate gender/points
-                       $content['gender'] = translateGender($content['gender']);
-                       $content['points'] = translateComma($content['points']);
-
                        // Load email template and email it away
                        $message = loadEmailTemplate('member_beg', $content, bigintval($content['userid']));
                        sendEmail($content['email'], getMessage('BEG_MONTHLY_RALLYE'), $message);