First batch of fixed language ids (renamed, see ticket #219)

[mailer.git] / show_bonus.php

diff --git a/show_bonus.php b/show_bonus.php
index e32f4c598ac274150fb23877dcc7e89a73cfbdda..525d5b498055f406e6e07f0efa126355d0cc366d 100644 (file)
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -14,11 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -43,7 +42,7 @@ require('inc/libs/security_functions.php');
 $GLOBALS['startTime'] = microtime(true);
 
 // Set this because we have no module in URI
-$GLOBALS['module'] = 'show_bonus';
+$GLOBALS['__module'] = 'show_bonus';
 $GLOBALS['output_mode'] = '0';
 
 // Load the required file(s)
@@ -58,7 +57,7 @@ redirectOnUninstalledExtension('bonus');
 // Include header
 loadIncludeOnce('inc/header.php');
 
-if ((getRequestElement('userid') > 0) && (getRequestElement('d') > 0) && (isGetRequestElementSet('t'))) {
+if ((isValidUserId(getRequestElement('userid'))) && (getRequestElement('d') > 0) && (isGetRequestElementSet('t'))) {
        // Set row name
        $t = '';
        switch (getRequestElement('t')) {
@@ -78,15 +77,18 @@ if ((getRequestElement('userid') > 0) && (getRequestElement('d') > 0) && (isGetR
        // 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.`userid`, 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')),
@@ -100,8 +102,6 @@ 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')));
 
@@ -112,18 +112,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="bad">{--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="bad">{--BONUS_SHOW_WRONG_TYPE--}</span>';
        }
 } else {
        // Wrong call!
-       $content['message'] = "<span class=\"guest_failed\">{--BONUS_SHOW_WRONG_CALL--}</span>";
+       $content['message'] = '<span class="bad">{--BONUS_SHOW_WRONG_CALL--}</span>';
 }
 
 // Load send_bonus header template (for your banners, e.g.?)