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

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

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 8978037e586c6d693931934721061a4c72834b91..9e3167b567516feff326271b66ed095b0a9b8a9c 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.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,25 +37,24 @@
  ************************************************************************/
 
 // 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('bonus_active') == '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_BONUS_WITHDRAW_PREPARED'));
+               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_WITHDRAW_PREPARED'));
        } // END - if
 
-       if (GET_EXT_VERSION('bonus') >= '0.6.9') {
+       if (getExtensionVersion('bonus') >= '0.6.9') {
                // Add more bonus points here
                $USE = '(0';
                if (getConfig('bonus_click_yn') == 'Y') $USE .= " + `turbo_bonus`";
@@ -71,17 +70,17 @@ if (getConfig('bonus_active') == 'Y') {
 
        // 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');
        }
 
        // Check if at least one is in the active rallye
-       $result = SQL_QUERY_ESC("SELECT userid AS uid, email, gender, surname, family, ".$USE." AS points, last_online AS last
-FROM `{!_MYSQL_PREFIX!}_user_data`
+       $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".$lastOnline."
-ORDER BY points DESC, last_online DESC, userid",
+ORDER BY `points` DESC, `last_online` DESC, `userid` ASC",
        array($ONLINE), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result) > 0) {
@@ -100,49 +99,50 @@ ORDER BY points DESC, last_online DESC, userid",
                        }
 
                        // Prepare content
-                       $content['uid']    = generateUserProfileLink($content['uid']);
+                       $content['userid']    = generateUserProfileLink($content['userid']);
                        $content['email']  = generateEmailLink($content['email'], 'user_data');
                        $content['gender'] = translateGender($content['gender']);
                        $content['points'] = translateComma($content['points']);
-                       $content['last']   = generateDateTime($content['last'], '2');
+                       $content['last_online']   = generateDateTime($content['last_online'], '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);
+                       $OUT .= loadTemplate('admin_list_bonus_rows', true, $content);
                        $SW = 3 - $SW; $cnt++;
-               }
-               define('__BONUS_ROWS', $OUT);
-               define('__TOTAL', translateComma($total));
+               } // END - while
+
+               $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('__BONUS_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_bonus_form", true));
+                       $content['withdraw_form'] = loadTemplate('admin_list_bonus_form', true);
                } else {
                        // Display message "no manual withdraw possible"
-                       define('__BONUS_WITHDRAW_FORM', "<div class=\"admin_failed\">{--ADMIN_BONUS_ALREADY_WITHDRAW--}</div>");
+                       $content['withdraw_form'] = loadTemplate('admin_settings_saved', true, "<div class=\"admin_failed\">{--ADMIN_BONUS_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_bonus");
+               loadTemplate('admin_list_bonus', false, $content);
        } else {
                // No one has become an "activity bonus"...
-               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BONUS_NO_ACTIVE_RALLYE'));
+               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_NO_ACTIVE_RALLYE'));
        }
 } else {
        // Aktive-Rallye not activated
-       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BONUS_RALLYE_DEACTIVATED'));
+       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_RALLYE_DEACTIVATED'));
 }
 
-//
+// [EOF]
 ?>