Migration of stelzi's commit 1022 with some changes so we have a nicer code. See...

[mailer.git] / birthday_confirm.php

diff --git a/birthday_confirm.php b/birthday_confirm.php
index ff57185dad0691d6157e012fd72e637917f068e9..efbb4a55cbc773ad9fdf72c0eedfc1692e22a0c7 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.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"
@@ -48,10 +48,10 @@ $GLOBALS['module'] = 'birthday_confirm';
 $GLOBALS['output_mode'] = -1;
 
 // Load the required file(s)
-require('inc/config.php');
+require('inc/config-global.php');
 
 // Is the 'birthday' extension active?
-REDIRECT_ON_UNINSTALLED_EXTENSION('birthday');
+redirectOnUninstalledExtension('birthday');
 
 // Is the script installed?
 if (isInstalled()) {
@@ -70,6 +70,9 @@ WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
  array($uid, $chk), __FILE__, __LINE__);
        //* DEBUG: */ echo "uid=".$uid.",chk=".$chk." (".strlen($chk).'/'.strlen(REQUEST_GET('check')).'/'.SQL_NUMROWS($result).")<br />\n";
 
+       // Prepare content
+       $content = array();
+
        // Is an entry there?
        if (SQL_NUMROWS($result) == 1) {
                // Ok, congratulation again! Here's your gift from us...
@@ -95,21 +98,19 @@ WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_birthday` WHERE userid=%s AND chk_value='%s' LIMIT 1",
                                array($uid, $chk), __FILE__, __LINE__);
 
-                       // Transfer data to constants for the template
-                       define('__GENDER', translateGender($data['gender']));
-                       define('__SNAME' , $data['surname']);
-                       define('__FNAME' , $data['family']);
-                       define('__GIFT'  , translateComma($data['points']));
+                       // "Translate" some data
+                       $data['gender'] = translateGender($data['gender']);
+                       $data['points'] = translateComma($data['points']);
 
                        // Load message from template
-                       define('__MSG', LOAD_TEMPLATE('birthday_msg', true));
+                       $content['msg'] = LOAD_TEMPLATE('birthday_msg', true, $data);
                } else {
                        // Unconfirmed / locked accounts cannot get points
-                       define('__MSG', sprintf(getMessage('BIRTHDAY_CANNOT_STATUS'), translateUserStatus($data['status'])));
+                       $content['msg'] = sprintf(getMessage('BIRTHDAY_CANNOT_STATUS'), translateUserStatus($data['status']));
                }
        } else {
                // Cannot load data!
-               define('__MSG', getMessage('BIRTHDAY_CANNOT_LOAD_DATA'));
+               $content['msg'] = getMessage('BIRTHDAY_CANNOT_LOAD_DATA');
        }
 
        // Free memory
@@ -119,19 +120,19 @@ WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
        $GLOBALS['module'] = 'birthday_confirm';
 
        // Include header
-       loadInclude('inc/header.php');
+       loadIncludeOnce('inc/header.php');
 
        // Load birthday header template (for your banners, e.g.?)
-       define('__BIRTHDAY_HEADER', LOAD_TEMPLATE('birthday_header', true));
+       $content['header'] =  LOAD_TEMPLATE('birthday_header', true);
 
        // Load birthday footer template (for your banners, e.g.?)
-       define('__BIRTHDAY_FOOTER', LOAD_TEMPLATE('birthday_footer', true));
+       $content['footer'] =  LOAD_TEMPLATE('birthday_footer', true);
 
        // Load final template and output it
-       LOAD_TEMPLATE('birthday_confirm');
+       LOAD_TEMPLATE('birthday_confirm', false, $content);
 
        // Include footer
-       loadInclude('inc/footer.php');
+       loadIncludeOnce('inc/footer.php');
 } else {
        // You have to install first!
        redirectToUrl('install.php');