config.php partly solved, see #117

[mailer.git] / beg.php

diff --git a/beg.php b/beg.php
index 6d4e6c5cc6344665dc3054eb3818d905757d544d..669afcf88efcc9f450bb435c407fa5a2c4e4b60a 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -51,7 +51,7 @@ $GLOBALS['output_mode'] = -1;
 $msg = null;
 
 // Load the required file(s)
-require('inc/config.php');
+require('inc/config-global.php');
 
 // Is the 'beg' extension active?
 REDIRCT_ON_UNINSTALLED_EXTENSION('beg');
@@ -69,7 +69,7 @@ if (isInstalled()) {
                $pay = false;
 
                // Validate if it is not a number
-               if ("".(REQUEST_GET('uid') + 0)."" !== "".REQUEST_GET('uid')."") {
+               if (''.(REQUEST_GET('uid') + 0).'' !== ''.REQUEST_GET('uid').'') {
                        if (EXT_IS_ACTIVE('nickname')) {
                                // Maybe we have found a nickname?
                                $result = SQL_QUERY_ESC("SELECT userid, beg_clicks, ref_payout, status, last_online FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",
@@ -86,7 +86,7 @@ if (isInstalled()) {
                }
 
                // Check if locked in so don't pay points
-               $status = "failed";
+               $status = 'failed';
 
                // Check if account was found
                if (SQL_NUMROWS($result) == 1) {
@@ -106,7 +106,7 @@ if (isInstalled()) {
                                // Set nickname / userid for the template(s
                                define('__BEG_UID'   , REQUEST_GET('uid'));
                                define('__BEG_CLICKS', ($clicks + 1));
-                               define('__BEG_BANNER', LOAD_TEMPLATE("beg_banner", true));
+                               define('__BEG_BANNER', LOAD_TEMPLATE('beg_banner', true));
                                define('__BEG_POINTS', translateComma($points));
                        } else {
                                // Other status
@@ -128,7 +128,7 @@ if (isInstalled()) {
                                array($uid, detectRemoteAddr(), session_id()), __FILE__, __LINE__);
 
                        // Entry not found, points set and not logged in?
-                       if (((SQL_NUMROWS($result) == 0) || (IS_ADMIN())) && ($points > 0) && (!IS_MEMBER()) && (getConfig('beg_pay_mode') == "NONE")) {
+                       if (((SQL_NUMROWS($result) == 0) || (IS_ADMIN())) && ($points > 0) && (!IS_MEMBER()) && (getConfig('beg_pay_mode') == 'NONE')) {
 
                                // Admin is testing?
                                if (!IS_ADMIN()) {
@@ -139,10 +139,7 @@ if (isInstalled()) {
                                                array($uid, detectRemoteAddr(), session_id()), __FILE__, __LINE__);
 
                                        // Was is successfull?
-                                       if (SQL_AFFECTEDROWS() == 1) {
-                                               // Okay!
-                                               $pay = true;
-                                       } // END - if
+                                       $pay (SQL_AFFECTEDROWS() == 1);
                                } else {
                                        // Is admin!
                                        $pay = true;
@@ -153,19 +150,19 @@ if (isInstalled()) {
                                        // Add points to user or begging rallye account
                                        if (BEG_ADD_POINTS($uid, $points)) {
                                                // Set 'done' message
-                                               define('__BEG_MSG', LOAD_TEMPLATE("beg_done", true));
+                                               $content['msg'] = LOAD_TEMPLATE('beg_done', true));
                                        } else {
                                                // Error!
-                                               define('__BEG_MSG', LOAD_TEMPLATE("beg_failed", true));
+                                               $content['msg'] = LOAD_TEMPLATE('beg_failed', true));
                                        }
                                } else {
                                        // Error!
-                                       define('__BEG_MSG', LOAD_TEMPLATE("beg_failed", true));
+                                       $content['msg'] = LOAD_TEMPLATE('beg_failed', true));
                                }
                        } elseif (IS_MEMBER()) {
                                // Logged in user found!
-                               define('__BEG_MSG', LOAD_TEMPLATE("beg_login", true));
-                       } elseif (getConfig('beg_pay_mode') != "NONE") { // Other pay-mode active!
+                               $content['msg'] = LOAD_TEMPLATE('beg_login', true));
+                       } elseif (getConfig('beg_pay_mode') != 'NONE') { // Other pay-mode active!
                                // Prepare content for template
                                $content = array(
                                        'clicks' => constant('__BEG_CLICKS'),
@@ -174,11 +171,11 @@ if (isInstalled()) {
                                );
 
                                // Load message template depending on pay-mode
-                               define('__BEG_MSG', LOAD_TEMPLATE("beg_pay_mode_".strtolower(getConfig('beg_pay_mode')), true, $content));
+                               $content['msg'] = LOAD_TEMPLATE('beg_pay_mode_'.strtolower(getConfig('beg_pay_mode')), true, $content));
                                $pay = true;
                        } else {
                                // Clicked received while reload lock is active
-                               define('__BEG_MSG', LOAD_TEMPLATE("beg_failed", true));
+                               $content['msg'] = LOAD_TEMPLATE('beg_failed', true));
                        }
 
                        // Free memory
@@ -188,28 +185,28 @@ if (isInstalled()) {
                        loadIncludeOnce('inc/header.php');
 
                        // Load final template
-                       LOAD_TEMPLATE("beg_link");
+                       LOAD_TEMPLATE('beg_link', false, $content);
 
                        // Tracker code enabled? (We don't track users here!
-                       if ((getConfig('beg_pay_mode') != "NONE") && ($pay)) {
+                       if ((getConfig('beg_pay_mode') != 'NONE') && ($pay === true)) {
                                // Prepare content for template
                                // @TODO Opps, what is missing here???
                                $content = array(
                                );
 
                                // Include config-depending template
-                               LOAD_TEMPLATE("beg_pay_code_".strtolower(getConfig('beg_pay_mode')), false, $content);
-                       } elseif ((!$pay) && (!defined('__BEG_MSG'))) {
+                               LOAD_TEMPLATE('beg_pay_code_'.strtolower(getConfig('beg_pay_mode')), false, $content);
+                       } elseif ((!$pay) && (!isset($content['msg']))) {
                                // Cannot pay! :-(
-                               define('__BEG_MSG', LOAD_TEMPLATE("beg_failed", true));
+                               $content['msg'] = LOAD_TEMPLATE('beg_failed', true));
                        }
 
                        // Include footer
                        loadIncludeOnce('inc/footer.php');
-               } elseif (($status != 'CONFIRMED') && ($status != "failed")) {
+               } elseif (($status != 'CONFIRMED') && ($status != 'failed')) {
                        // Maybe locked/unconfirmed account?
                        $msg = generateErrorCodeFromUserStatus($status);
-               } elseif (($uid == '0') || ($status == "failed")) {
+               } elseif (($uid == '0') || ($status == 'failed')) {
                        // Inalid or locked account, so let's find out
                        $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' LIMIT 1",
                                array(REQUEST_GET('uid')), __FILE__, __LINE__);