Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:

[mailer.git] / show_bonus.php

diff --git a/show_bonus.php b/show_bonus.php
index cf45a31fe1723037bf90ecb2ee90bebf753778c6..a6eb714ec53faae9e9585d5e49d6cb8d74ca0f49 100644 (file)
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 11/13/2004 *
- * ===============                              Last change: 11/14/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 11/13/2004 *
+ * ===================                          Last change: 11/14/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : show_bonus.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 *
@@ -44,7 +45,7 @@ $GLOBALS['startTime'] = microtime(true);
 
 // Set this because we have no module in URI
 $GLOBALS['module'] = 'show_bonus';
-$GLOBALS['output_mode'] = 0;
+$GLOBALS['output_mode'] = '0';
 
 // Load the required file(s)
 require('inc/config-global.php');
@@ -58,10 +59,10 @@ redirectOnUninstalledExtension('bonus');
 // Include header
 loadIncludeOnce('inc/header.php');
 
-if ((getRequestElement('userid') > 0) && (getRequestElement('d') > 0) && (isGetRequestElementSet('t'))) {
+if ((getRequestParameter('userid') > 0) && (getRequestParameter('d') > 0) && (isGetRequestParameterSet('t'))) {
        // Set row name
        $t = '';
-       switch (getRequestElement('t')) {
+       switch (getRequestParameter('t')) {
                case 'bonusid': // Bonus mail
                        $t = 'bonus_id';
                        break;
@@ -71,27 +72,30 @@ if ((getRequestElement('userid') > 0) && (getRequestElement('d') > 0) && (isGetR
                        break;
 
                default: // Invalid type
-                       logDebugMessage(__FILE__, __LINE__, sprintf("Invalid type %s detected.", getRequestElement('t')));
+                       logDebugMessage(__FILE__, __LINE__, sprintf("Invalid type %s detected.", getRequestParameter('t')));
                        break;
        } // END - switch
 
        // Valid type?
        if (!empty($t)) {
                // Check for data
-               $result = SQL_QUERY_ESC("SELECT d.gender, d.surname, d.family, b.level, b.points
+               $result = SQL_QUERY_ESC("SELECT
+       d.`gender`, d.`surname`, d.`family`, b.`level`, b.`points`
 FROM
        `{?_MYSQL_PREFIX?}_user_data` AS d
-RIGHT JOIN
+INNER JOIN
        `{?_MYSQL_PREFIX?}_bonus_turbo` AS b
 ON
-       d.userid=b.userid
+       d.`userid`=b.`userid`
 WHERE
-       d.`status`='CONFIRMED' AND d.userid=%s AND b.%s=%s
+       d.`status`='CONFIRMED' AND
+       d.`userid`=%s AND
+       b.`%s`=%s
 LIMIT 1",
                        array(
-                               bigintval(getRequestElement('userid')),
+                               bigintval(getRequestParameter('userid')),
                                $t,
-                               bigintval(getRequestElement('d'))
+                               bigintval(getRequestParameter('d'))
                        ), __FILE__, __LINE__);
 
                // Entry found?
@@ -100,10 +104,9 @@ LIMIT 1",
                        $content = SQL_FETCHARRAY($result);
 
                        // Prepare constants for the pre-template
-                       $content['gender'] = translateGender($content['gender']);
-                       $content['points'] = translateComma($content['points']);
-                       $content['mailid'] = bigintval(getRequestElement('d'));
-                       $content['rows']   = addBonusRanks(bigintval(getRequestElement('d')), $t, bigintval(getRequestElement('userid')));
+                       // @TODO No more needed? $content['points'] = translateComma($content['points']);
+                       $content['mailid'] = bigintval(getRequestParameter('d'));
+                       $content['rows']   = addBonusRanks(bigintval(getRequestParameter('d')), $t, bigintval(getRequestParameter('userid')));
 
                        // Get some prepared content
                        $content = merge_array($content, $GLOBALS['ranking_content']);
@@ -112,18 +115,18 @@ LIMIT 1",
                        $content['message'] = loadTemplate('show_bonus_msg', true, $content);
                } else {
                        // No data found
-                       $content['message'] = "<span class=\"guest_failed\">{--BONUS_SHOW_NO_DATA--}</span>";
+                       $content['message'] = '<span class="guest_failed">{--BONUS_SHOW_NO_DATA--}</span>';
                }
 
                // Free memory
                SQL_FREERESULT($result);
        } else {
                // Wrong type entered
-               $content['message'] = "<span class=\"guest_failed\">{--BONUS_SHOW_WRONG_TYPE--}</span>";
+               $content['message'] = '<span class="guest_failed">{--BONUS_SHOW_WRONG_TYPE--}</span>';
        }
 } else {
        // Wrong call!
-       $content['message'] = "<span class=\"guest_failed\">{--BONUS_SHOW_WRONG_CALL--}</span>";
+       $content['message'] = '<span class="guest_failed">{--BONUS_SHOW_WRONG_CALL--}</span>';
 }
 
 // Load send_bonus header template (for your banners, e.g.?)