Caching again rewritten, admin functions fixed:

[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 99ffbfe1cc581cbeb2c7b585a70430508d5bb3b7..b37ce184463f3864f713a15acaeed21b90e464ff 100644 (file)
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,23 +38,24 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
-} elseif (!IS_MEMBER()) {
-       redirectToUrl('modules.php?module=index');
-} elseif ((!EXT_IS_ACTIVE('beg')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('beg'));
-       return;
+       die();
+} elseif (!isMember()) {
+       redirectToIndexMemberOnlyModule();
 }
 
 // Add description as navigation point
-ADD_DESCR('member', __FILE__);
+addMenuDescription('member', __FILE__);
+
+if ((!isExtensionActive('beg')) && (!isAdmin())) {
+       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('beg'));
+       return;
+} // END - if
 
 // Autopurge installed?
 $lastOnline = "%s";
 $ONLINE = '';
 
-if (EXT_IS_ACTIVE('autopurge')) {
+if (isExtensionActive('autopurge')) {
        // Use last online timestamp to keep inactive members away from here
        $lastOnline   = " AND `last_online` >= (UNIX_TIMESTAMP() - %s)";
        $ONLINE = getConfig('ap_inactive_since');
@@ -64,7 +65,7 @@ if (EXT_IS_ACTIVE('autopurge')) {
 $result = SQL_QUERY_ESC("SELECT
        `userid`, `beg_points` AS beg, `last_online`
 FROM
-       `{!_MYSQL_PREFIX!}_user_data`
+       `{?_MYSQL_PREFIX?}_user_data`
 WHERE
        `beg_points` > 0 AND `status`='CONFIRMED'".$lastOnline."
 ORDER BY
@@ -84,30 +85,30 @@ if (SQL_NUMROWS($result) > 0) {
                $content = array(
                        'sw'     => $SW,
                        'cnt'    => $cnt,
-                       'uid'    => bigintval($content['userid']),
+                       'userid'    => bigintval($content['userid']),
                        'points' => translateComma($content['beg']),
-                       'last'   => generateDateTime($content['last_online'], '2'),
+                       'last_online'   => generateDateTime($content['last_online'], '2'),
                );
 
                // Load row template
-               $OUT .= LOAD_TEMPLATE('member_list_beg_row', true, $content);
+               $OUT .= loadTemplate('member_list_beg_row', true, $content);
 
                // Count one up and switch colors
                $cnt++; $SW = 3 - $SW;
        }
 } else {
        // No one is interested in our "active rallye" ! :-(
-       $OUT = LOAD_TEMPLATE('member_beg_404', true);
+       $OUT = loadTemplate('member_beg_404', true);
 }
 
+// Prepare content
+$content['rows'] = $OUT;
+
 // Free memory
 SQL_FREERESULT($result);
 
-// Remeber row(s) for the template
-define('__BEG_ROWS', $OUT);
-
 // Load final template
-LOAD_TEMPLATE('member_list_beg');
+loadTemplate('member_list_beg', false, $content);
 
 //
 ?>