Convention applied

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index de8018f6bca925c267dcbb8204e140b0f334fd4e..eeea089cf86659620bc32e113a2fd5f48bda274d 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -48,11 +48,11 @@ $GLOBALS['module'] = 'mailid';
 $GLOBALS['output_mode'] = -1;
 
 // Load the required file(s)
-require('inc/config.php');
+require('inc/config-global.php');
 
 if (isInstalled()) {
        // Is the extension active?
-       REDIRECT_ON_UNINSTALLED_EXTENSION('mailid');
+       redirectOnUninstalledExtension('mailid');
 
        // Init
        $url_uid = 0; $url_bid = 0; $url_mid = 0;
@@ -68,12 +68,12 @@ if (isInstalled()) {
                if ($url_mid > 0) {
                        // Normal-Mails
                        $result = SQL_QUERY_ESC("SELECT link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE stats_id=%s AND `userid`=%s LIMIT 1",
-                               array($url_mid, $url_uid), __FILE__, __LINE__);
+                       array($url_mid, $url_uid), __FILE__, __LINE__);
                        $type = 'mailid'; $urlId = $url_mid;
                } elseif ($url_bid > 0) {
                        // Bonus-Mail
                        $result = SQL_QUERY_ESC("SELECT link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE bonus_id=%s AND `userid`=%s LIMIT 1",
-                               array($url_bid, $url_uid), __FILE__, __LINE__);
+                       array($url_bid, $url_uid), __FILE__, __LINE__);
                        $type = 'bonusid'; $urlId = $url_bid;
                } else {
                        // Problem: No ID entered
@@ -89,35 +89,38 @@ if (isInstalled()) {
 
                        switch ($ltype)
                        {
-                       case 'NORMAL':
-                               // Is the stats ID valid?
-                               $result = SQL_QUERY_ESC("SELECT pool_id, url, subject FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE `id`=%s LIMIT 1",
+                               case 'NORMAL':
+                                       // Is the stats ID valid?
+                                       $result = SQL_QUERY_ESC("SELECT pool_id, url, subject FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE `id`=%s LIMIT 1",
                                        array($url_mid), __FILE__, __LINE__);
-                               break;
+                                       break;
 
-                       case 'BONUS':
-                               // Is the bonus extension active?
-                               REDIRECT_ON_UNINSTALLED_EXTENSION('bonus');
+                               case 'BONUS':
+                                       // Is the bonus extension active?
+                                       redirectOnUninstalledExtension('bonus');
 
-                               // Bonus-Mails
-                               $result = SQL_QUERY_ESC("SELECT id, url, subject FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1",
+                                       // Bonus-Mails
+                                       $result = SQL_QUERY_ESC("SELECT id, url, subject FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1",
                                        array($url_bid), __FILE__, __LINE__);
-                               break;
+                                       break;
                        }
 
                        if (SQL_NUMROWS($result) == 1) {
                                // Load data
-                               list($pool, $URL, $EXTRA_TITLE) = SQL_FETCHROW($result);
+                               list($pool, $URL, $title) = SQL_FETCHROW($result);
 
                                // Free result
                                SQL_FREERESULT($result);
 
                                // Compile extra title
-                               $EXTRA_TITLE = COMPILE_CODE($EXTRA_TITLE);
+                               $title = COMPILE_CODE($title);
+
+                               // Set it
+                               setExtraTitle($title);
 
                                // Is the user's ID unlocked?
                                $result = SQL_QUERY_ESC("SELECT status, gender, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-                                       array($url_uid), __FILE__, __LINE__);
+                               array($url_uid), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) == 1) {
                                        list($status, $gender, $sname, $fname) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
@@ -125,32 +128,32 @@ if (isInstalled()) {
                                                // User has confirmed his account so we can procede...
                                                switch ($ltype)
                                                {
-                                               case 'NORMAL':
-                                                       $result = SQL_QUERY_ESC("SELECT payment_id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
+                                                       case 'NORMAL':
+                                                               $result = SQL_QUERY_ESC("SELECT payment_id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
                                                                array(bigintval($pool)), __FILE__, __LINE__);
-                                                       if (SQL_NUMROWS($result) == 1) {
-                                                               list($pay) = SQL_FETCHROW($result);
-                                                               $time      = getPaymentPoints($pay, 'time');
-                                                               $payment   = getPaymentPoints($pay, 'payment');
-                                                               $isValid   = true;
-                                                       }
-
-                                                       // Free memory
-                                                       SQL_FREERESULT($result);
-                                                       break;
-
-                                               case 'BONUS':
-                                                       $result = SQL_QUERY_ESC("SELECT points, time FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1",
+                                                               if (SQL_NUMROWS($result) == 1) {
+                                                                       list($pay) = SQL_FETCHROW($result);
+                                                                       $time      = getPaymentPoints($pay, 'time');
+                                                                       $payment   = getPaymentPoints($pay, 'payment');
+                                                                       $isValid   = true;
+                                                               }
+
+                                                               // Free memory
+                                                               SQL_FREERESULT($result);
+                                                               break;
+
+                                                       case 'BONUS':
+                                                               $result = SQL_QUERY_ESC("SELECT points, time FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1",
                                                                array($url_bid), __FILE__, __LINE__);
-                                                       if (SQL_NUMROWS($result) == 1) {
-                                                               list($points, $time) = SQL_FETCHROW($result);
-                                                               $payment = '0.00000';
-                                                               $isValid = true;
-                                                       }
-
-                                                       // Free memory
-                                                       SQL_FREERESULT($result);
-                                                       break;
+                                                               if (SQL_NUMROWS($result) == 1) {
+                                                                       list($points, $time) = SQL_FETCHROW($result);
+                                                                       $payment = '0.00000';
+                                                                       $isValid = true;
+                                                               }
+
+                                                               // Free memory
+                                                               SQL_FREERESULT($result);
+                                                               break;
                                                }
 
                                                // Add header
@@ -204,7 +207,7 @@ if (isInstalled()) {
                                break;
 
                        case 'REJECT': // Redirect to rejection page
-                               LOAD_CONFIGURED_URL('reject_url');
+                               redirectToConfiguredUrl('reject_url');
                                break;
 
                        default: