More variables renamed to , install/admin_WriteData() is now generic (with open TODO)

[mailer.git] / birthday_confirm.php

diff --git a/birthday_confirm.php b/birthday_confirm.php
index a29859a8d6a348a582cd728c180a6ef39d8e4e3c..cfbbb60f2de45073fbcac36e6ba69e68f39f6283 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require_once("inc/libs/security_functions.php");
+require("inc/libs/security_functions.php");
 
 // Init "action" and "what"
 global $what, $action;
@@ -45,10 +45,7 @@ $GLOBALS['module'] = "birthday_confirm"; $CSS = -1;
 require("inc/config.php");
 
 // Is the "birthday" extension active?
-if (!EXT_IS_ACTIVE("birthday")) {
-       // Redirect to index
-       LOAD_URL("modules.php?module=index&msg=".CODE_EXTENSION_PROBLEM."&ext=birthday");
-} // END - if
+REDIRECT_ON_UNINSTALLED_EXTENSION("birthday");
 
 // Is the script installed?
 if (isBooleanConstantAndTrue('mxchange_installed')) {
@@ -60,8 +57,8 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 
        // Check if link is not clicked so far
        $result = SQL_QUERY_ESC("SELECT b.points, d.gender, d.surname, d.family, d.status, d.ref_payout
-FROM "._MYSQL_PREFIX."_user_birthday AS b
-INNER JOIN `"._MYSQL_PREFIX."_user_data` AS d
+FROM `{!_MYSQL_PREFIX!}_user_birthday` AS b
+INNER JOIN `{!_MYSQL_PREFIX!}_user_data` AS d
 ON b.userid=d.userid
 WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
  array($uid, $chk), __FILE__, __LINE__);
@@ -76,27 +73,27 @@ WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
                if ($data['status'] == "CONFIRMED") {
                        // Set mode depending on how many mails the member has to confirm
                        $locked = false;
-                       if (($data['ref_payout'] > 0) && (getConfig('allow_direct_pay') == "N")) $locked = true;
+                       if (($data['ref_payout'] > 0) && (getConfig('allow_direct_pay') != "Y")) $locked = true;
 
                        // Add points to account
-                       unset($DEPTH);
+                       unset($GLOBALS['ref_level']);
                        ADD_POINTS_REFSYSTEM("birthday_confirm", $uid, $data['points'], false, "0", $locked, strtolower(getConfig('birthday_mode')));
 
-                       // Remove entry from table
-                       $result = 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__);
-
                        // Update mediadata if version is 0.0.4 or newer
                        if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
                                // Update database
                                MEDIA_UPDATE_ENTRY(array("total_points"), "add", $data['points']);
                        }
 
+                       // Remove entry from table
+                       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', TRANSLATE_GENDER($data['gender']));
-                       define('__SNAME', $data['surname']);
-                       define('__FNAME', $data['family']);
-                       define('__GIFT' , $data['points']);
+                       define('__SNAME' , $data['surname']);
+                       define('__FNAME' , $data['family']);
+                       define('__GIFT'  , TRANSLATE_COMMA($data['points']));
 
                        // Load message from template
                        define('__MSG', LOAD_TEMPLATE("birthday_msg", true));
@@ -106,7 +103,7 @@ WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
                }
        } else {
                // Cannot load data!
-               define('__MSG', BIRTHDAY_CANNOT_LOAD_DATA);
+               define('__MSG', getMessage('BIRTHDAY_CANNOT_LOAD_DATA'));
        }
 
        // Free memory
@@ -116,7 +113,7 @@ WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
        $GLOBALS['module'] = "birthday_confirm";
 
        // Include header
-       include(PATH."inc/header.php");
+       LOAD_INC("inc/header.php");
 
        // Load birthday header template (for your banners, e.g.?)
        define('__BIRTHDAY_HEADER', LOAD_TEMPLATE("birthday_header", true));
@@ -128,9 +125,9 @@ WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
        LOAD_TEMPLATE("birthday_confirm");
 
        // Include footer
-       include(PATH."inc/footer.php");
+       LOAD_INC("inc/footer.php");
 } else {
-       // You have to configure first!
+       // You have to install first!
        LOAD_URL("install.php");
 }
 // Really all done here... ;-)