X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=show_bonus.php;h=0b418e67b0b3284a8af843be31d6eb8a314d0c0a;hp=c41dc5b5cd2bd73602232b0d9d2db76dcb24955b;hb=30986f637cd3c03951bdbfc880b9a420f7724ce0;hpb=a090e351c49fe021fb3064325694da03402332e0

diff --git a/show_bonus.php b/show_bonus.php
index c41dc5b5cd..0b418e67b0 100644
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -36,7 +36,7 @@
  * MA  02110-1301  USA                                                  *
  ************************************************************************/
 
-// Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
+// Load security stuff here
 require('inc/libs/security_functions.php');
 
 // Init "action" and "what"
@@ -49,15 +49,15 @@ $GLOBALS['module'] = 'show_bonus';
 $GLOBALS['output_mode'] = 0;
 
 // Load the required file(s)
-require('inc/config.php');
+require('inc/config-global.php');
 
 // Is the 'bonus' extension active?
-REDIRECT_ON_UNINSTALLED_EXTENSION('bonus');
+redirectOnUninstalledExtension('bonus');
 
 // List only rankings when script is installed
 if (isInstalled()) {
 	// Include header
-	LOAD_INC('inc/header.php');
+	loadIncludeOnce('inc/header.php');
 
 	if ((REQUEST_GET('uid') > 0) && (REQUEST_GET('d') > 0) && (REQUEST_ISSET_GET(('t')))) {
 		// Set row name
@@ -85,7 +85,7 @@ RIGHT JOIN `{!_MYSQL_PREFIX!}_bonus_turbo` AS b
 ON d.userid=b.userid
 WHERE d.`status`='CONFIRMED' AND d.userid=%s AND b.%s=%s
 LIMIT 1",
-				array(bigintval(REQUEST_GET('uid')), $t, bigintval(REQUEST_GET('d'))), __FILE__, __LINE__);
+			array(bigintval(REQUEST_GET('uid')), $t, bigintval(REQUEST_GET('d'))), __FILE__, __LINE__);
 
 			// Entry found?
 			if (SQL_NUMROWS($result) == 1) {
@@ -93,52 +93,49 @@ LIMIT 1",
 				$content = SQL_FETCHARRAY($result);
 
 				// Prepare constants for the pre-template
-				define('__GENDER'   , TRANSLATE_GENDER($content['gender']));
-				define('__SNAME'    , $content['surname']);
-				define('__FNAME'    , $content['family']);
-				define('__RANK'     , BIGINTVAL($content['level']));
-				define('__POINTS'   , TRANSLATE_COMMA($content['points']));
-				define('__MAILID'   , bigintval(REQUEST_GET('d')));
-				define('__RANK_ROWS', BONUS_MAKE_RANK_ROWS(bigintval(REQUEST_GET('d')), $t, bigintval(REQUEST_GET('uid'))));
+				$content['gender'] = translateGender($content['gender']);
+				$content['points'] = translateComma($content['points']);
+				$content['mailid'] = bigintval(REQUEST_GET('d'));
+				$content['rows']   = BONUS_MAKE_RANK_ROWS(bigintval(REQUEST_GET('d')), $t, bigintval(REQUEST_GET('uid')));
 
 				// Constant created within previous function which contains informations for current user's ranking position:
 				//   __YOUR_RANKING_LINE
 
 				// Load pre-template
-				define('__BONUS_MSG', LOAD_TEMPLATE('show_bonus_msg', true));
+				$content['msg'] = LOAD_TEMPLATE('show_bonus_msg', true, $content);
 			} else {
 				// No data found
-				define('__BONUS_MSG', "<span class=\"guest_failed\">{--BONUS_SHOW_NO_DATA--}</span>");
+				$content['msg'] = "<span class=\"guest_failed\">{--BONUS_SHOW_NO_DATA--}</span>";
 			}
 
 			// Free memory
 			SQL_FREERESULT($result);
 		} else {
 			// Wrong type entered
-			define('__BONUS_MSG', "<span class=\"guest_failed\">{--BONUS_SHOW_WRONG_TYPE--}</span>");
+			$content['msg'] = "<span class=\"guest_failed\">{--BONUS_SHOW_WRONG_TYPE--}</span>";
 		}
 	} else {
 		// Wrong call!
-		define('__BONUS_MSG', "<span class=\"guest_failed\">{--BONUS_SHOW_WRONG_CALL--}</span>");
+		$content['msg'] = "<span class=\"guest_failed\">{--BONUS_SHOW_WRONG_CALL--}</span>";
 	}
 
 	// Load send_bonus header template (for your banners, e.g.?)
-	define('__BONUS_HEADER', LOAD_TEMPLATE('show_bonus_header', true));
+	$content['header'] = LOAD_TEMPLATE('show_bonus_header', true);
 
 	// Load show_bonus footer template (for your banners, e.g.?)
-	define('__BONUS_FOOTER', LOAD_TEMPLATE('show_bonus_footer', true));
+	$content['footer'] = LOAD_TEMPLATE('show_bonus_footer', true);
 
 	// Total ranks who can win
-	define('__BONUS_TOTAL_RANKS', getConfig('bonus_ranks'));
+	$content['total_ranks'] = getConfig('bonus_ranks');
 
 	// Load final template
-	LOAD_TEMPLATE('show_bonus');
+	LOAD_TEMPLATE('show_bonus', false, $content);
 
 	// Include footer
-	LOAD_INC('inc/footer.php');
+	loadIncludeOnce('inc/footer.php');
 } else {
 	// You have to install first!
-	LOAD_URL('install.php');
+	redirectToUrl('install.php');
 }
 
 // Really all done here... ;-)