Fixes for sending pool

[mailer.git] / show_bonus.php

diff --git a/show_bonus.php b/show_bonus.php
index 7e83f9b096f05262f7d724fabc37ba1629198e94..45019b90f62f869f5f18aabb8397c099f5dd2f7c 100644 (file)
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -35,10 +35,9 @@
 require_once("inc/libs/security_functions.php");
 
 // Init "action" and "what"
-global $what, $action;
+global $what, $action, $startTime;
+$GLOBALS['startTime'] = microtime(true);
 $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
 
 // Set this because we have no module in URI
 $GLOBALS['module'] = "show_bonus"; $CSS = 0;
@@ -47,7 +46,7 @@ $GLOBALS['module'] = "show_bonus"; $CSS = 0;
 require ("inc/config.php");
 
 // List only rankings when script is installed
-if (defined('mxchange_installed') && (mxchange_installed))
+if (isBooleanConstantAndTrue('mxchange_installed'))
 {
        // Include header
        include(PATH."inc/header.php");
@@ -69,19 +68,19 @@ if (defined('mxchange_installed') && (mxchange_installed))
                if (!empty($t))
                {
                        // Check for data
-                       $result = SQL_QUERY_ESC("SELECT DISTINCT d.sex, d.surname, d.family, b.level, b.points
+                       $result = SQL_QUERY_ESC("SELECT DISTINCT d.gender, d.surname, d.family, b.level, b.points
 FROM "._MYSQL_PREFIX."_user_data AS d
 RIGHT JOIN "._MYSQL_PREFIX."_bonus_turbo AS b
 ON d.userid=b.userid
-WHERE d.status='CONFIRMED' AND d.userid=%d AND b.".$t."='%s' LIMIT 1",
+WHERE d.status='CONFIRMED' AND d.userid=%s AND b.".$t."='%s' LIMIT 1",
  array(bigintval($_GET['uid']), bigintval($_GET['d'])), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1)
                        {
                                // Load data
-                               list($sex, $sname, $fname, $level, $points) = SQL_FETCHROW($result);
+                               list($gender, $sname, $fname, $level, $points) = SQL_FETCHROW($result);
 
                                // Prepare constants for the pre-template
-                               define('__SALUT'    , TRANSLATE_SEX($sex));
+                               define('__GENDER'    , TRANSLATE_GENDER($gender));
                                define('__SNAME'    , $sname);
                                define('__FNAME'    , $fname);
                                define('__RANK'     , $level);
@@ -123,7 +122,7 @@ WHERE d.status='CONFIRMED' AND d.userid=%d AND b.".$t."='%s' LIMIT 1",
        define('__BONUS_FOOTER', LOAD_TEMPLATE("show_bonus_footer", true));
 
        // Total ranks who can win
-       define('__BONUS_TOTAL_RANKS', $CONFIG['bonus_ranks']);
+       define('__BONUS_TOTAL_RANKS', $_CONFIG['bonus_ranks']);
 
        // Load final template
        LOAD_TEMPLATE("show_bonus");
@@ -134,7 +133,7 @@ WHERE d.status='CONFIRMED' AND d.userid=%d AND b.".$t."='%s' LIMIT 1",
  else
 {
        // You have to configure first!
-       LOAD_URL(URL."/install.php");
+       LOAD_URL("install.php");
 }
 // Really all done here... ;-)
 ?>