Complete rewrite and debug message surpressed:

[mailer.git] / inc / modules / member / what-beg2.php

diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php
index b5c9fc92dc9c9ad34449869393ff49795b68a966..f6ab9f729a446cba959c0be956916a21b22b18a1 100644 (file)
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.php
@@ -38,23 +38,23 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!IS_MEMBER()) {
-       LOAD_URL("modules.php[5~?module=index");
-} elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "beg");
+       redirectToUrl('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('beg')) && (!IS_ADMIN())) {
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('beg'));
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", __FILE__);
+ADD_DESCR('member', __FILE__);
 
 // Autopurge installed?
-$lastOnline = "%s"; $ONLINE = "";
-if (EXT_IS_ACTIVE("autopurge")) {
+$lastOnline = "%s"; $ONLINE = '';
+if (EXT_IS_ACTIVE('autopurge')) {
        // Use last online timestamp to keep inactive members away from here
-       $lastOnline   = " AND last_online >= (UNIX_TIMESTAMP() - %s)";
+       $lastOnline   = " AND `last_online` >= (UNIX_TIMESTAMP() - %s)";
        $ONLINE = getConfig('ap_inactive_since');
 }
 
@@ -62,10 +62,10 @@ if (EXT_IS_ACTIVE("autopurge")) {
 $result = SQL_QUERY_ESC("SELECT userid, beg_points AS beg, last_online FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE beg_points > 0 AND `status`='CONFIRMED'".$lastOnline."
 ORDER BY beg_points DESC, last_online DESC, userid LIMIT %s",
-       array($ONLINE, getConfig('beg_ranks')), __FILE__, __LINE__);
+array($ONLINE, getConfig('beg_ranks')), __FILE__, __LINE__);
 
 // Reset temporary variable and check for users
-$OUT = "";
+$OUT = '';
 if (SQL_NUMROWS($result) > 0) {
        // Load our winners...
        $SW = 2; $cnt = 1;
@@ -75,8 +75,8 @@ if (SQL_NUMROWS($result) > 0) {
                        'sw'     => $SW,
                        'cnt'    => $cnt,
                        'uid'    => bigintval($content['userid']),
-                       'points' => TRANSLATE_COMMA($content['beg']),
-                       'last'   => MAKE_DATETIME($content['last_online'], "2"),
+                       'points' => translateComma($content['beg']),
+                       'last'   => generateDateTime($content['last_online'], '2'),
                );
 
                // Load row template