Huge script change, see http://forum.mxchange.org/topic-458.html for details:

[mailer.git] / inc / modules / admin / what-list_beg.php

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 0ffdfb9a074ded4aa4ccc7796d0850aec9f7e608..fa28e4411d601cd7d321e3a33d49b90082849db3 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.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 *
@@ -37,26 +37,26 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
 }
+
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addMenuDescription('admin', __FILE__);
 
 if (getConfig('beg_rallye') == 'Y') {
        // Shall I withdraw now?
-       if (REQUEST_ISSET_POST(('withdraw'))) {
+       if (isPostRequestElementSet(('withdraw'))) {
                // Okay, let's prepare...
                $curr = date('m', time()) - 1;
                if (strlen($curr) == 1) $curr = '0'.$curr;
                updateConfiguration('last_month', $curr);
-               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BEG_WITHDRAW_PREPARED'));
+               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BEG_WITHDRAW_PREPARED'));
        } // 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 +64,7 @@ if (getConfig('beg_rallye') == 'Y') {
 
        // Check if at least one is in the active rallye
        $result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, beg_points, last_online
-FROM `{!_MYSQL_PREFIX!}_user_data`
+FROM `{?_MYSQL_PREFIX?}_user_data`
 WHERE `status`='CONFIRMED' AND beg_points > 0".$lastOnline."
 ORDER BY beg_points DESC, last_online DESC, userid",
        array($ONLINE), __FILE__, __LINE__);
@@ -82,16 +82,16 @@ ORDER BY beg_points DESC, last_online DESC, userid",
                        } // END - if
 
                        // Prepare content
-                       // @TODO Rewrite templates so s/fname will be replaced by surname/family
-                       // @TODO to shorten this block. Please also do so with uid->userid
+                       // @TODO Rewrite templates so s/family will be replaced by surname/family
+                       // @TODO to shorten this block. Please also do so with userid->userid
                        $content = array(
-                               'uid'    => $content['userid'],
+                               'userid'    => $content['userid'],
                                'email'  => generateEmailLink($content['email'], 'user_data'),
                                'gender' => translateGender($content['gender']),
-                               'sname'  => $content['surname'],
-                               'fname'  => $content['family'],
+                               'surname'  => $content['surname'],
+                               'family'  => $content['family'],
                                'turbo'  => translateComma($content['beg_points']),
-                               'last'   => generateDateTime($content['last_online'], '2'),
+                               'last_online'   => generateDateTime($content['last_online'], '2'),
                                'sw'     => $SW,
                                'win1'   => $WIN1,
                                'win2'   => $WIN2,
@@ -99,38 +99,39 @@ ORDER BY beg_points DESC, last_online DESC, userid",
                        );
 
                        // Load template and add it
-                       $OUT .= LOAD_TEMPLATE("admin_list_beg_rows", true, $content);
+                       $OUT .= loadTemplate('admin_list_beg_rows', true, $content);
                        $SW = 3 - $SW; $cnt++; $total += $content['beg_points'];
                }
-               define('__BEG_ROWS', $OUT);
-               define('__TOTAL', translateComma($total));
+
+               $content['rows']  = $OUT;
+               $content['total'] = translateComma($total);
 
                // Check if we need to display form or not with manuel withdraw
                if (getConfig('last_month') == date('m', time())) {
                        // Load form
-                       define('__BEG_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_beg_form", true));
+                       $content['withdraw_form'] = loadTemplate('admin_list_beg_form', true);
                } else {
                        // Display message "no manual withdraw possible"
-                       define('__BEG_WITHDRAW_FORM', "<div class=\"admin_failed\">{--ADMIN_BEG_ALREADY_WITHDRAW--}</div>");
+                       $content['withdraw_form'] = loadTemplate('admin_settings_saved', true, "<div class=\"admin_failed\">{--ADMIN_BEG_ALREADY_WITHDRAW--}</div>");
                }
 
                // Prepare constant for timemark
-               if (EXT_IS_ACTIVE('autopurge')) {
-                       define('__AUTOPURGE_TIMEOUT', generateDateTime(time() - getConfig('ap_inactive_since'), '2'));
+               if (isExtensionActive('autopurge')) {
+                       $content['autopurge_timeout'] = generateDateTime(time() - getConfig('ap_inactive_since'), '2');
                } else {
-                       define('__AUTOPURGE_TIMEOUT', sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'autopurge'));
+                       $content['autopurge_timeout'] = loadTemplate('admin_settings_saved', true, sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'autopurge'));
                }
 
                // Load final template
-               LOAD_TEMPLATE("admin_list_beg");
+               loadTemplate('admin_list_beg', false, $content);
        } else {
                // No one has joined the begging rallye...
-               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BEG_NO_RALLYE'));
+               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BEG_NO_RALLYE'));
        }
 } else {
        // Rallye deactivated
-       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BEG_RALLYE_DEACTIVATED'));
+       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BEG_RALLYE_DEACTIVATED'));
 }
 
-//
+// [EOF]
 ?>