More queries and language constants rewritten

[mailer.git] / birthday_confirm.php

diff --git a/birthday_confirm.php b/birthday_confirm.php
index 25e737196b7b3c451850cb8feb9a2afbd02d3825..cfbbb60f2de45073fbcac36e6ba69e68f39f6283 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -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=".constant('CODE_EXTENSION_PROBLEM')."&ext=birthday");
-} // END - if
+REDIRECT_ON_UNINSTALLED_EXTENSION("birthday");
 
 // Is the script installed?
 if (isBooleanConstantAndTrue('mxchange_installed')) {
@@ -82,21 +79,21 @@ WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
                        unset($GLOBALS['ref_level']);
                        ADD_POINTS_REFSYSTEM("birthday_confirm", $uid, $data['points'], false, "0", $locked, strtolower(getConfig('birthday_mode')));
 
-                       // 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__);
-
                        // 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