New naming convention applied to many functions, see #118 for details

[mailer.git] / birthday_confirm.php

diff --git a/birthday_confirm.php b/birthday_confirm.php
index 3d71b7971e9280b479f4562a366feb29e6f36a04..ff57185dad0691d6157e012fd72e637917f068e9 100644 (file)
--- a/birthday_confirm.php
+++ b/birthday_confirm.php
@@ -68,7 +68,7 @@ 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__);
-       //* DEBUG: */ echo "uid=".$uid.",chk=".$chk." (".strlen($chk)."/".strlen(REQUEST_GET('check'))."/".SQL_NUMROWS($result).")<br />\n";
+       //* DEBUG: */ echo "uid=".$uid.",chk=".$chk." (".strlen($chk).'/'.strlen(REQUEST_GET('check')).'/'.SQL_NUMROWS($result).")<br />\n";
 
        // Is an entry there?
        if (SQL_NUMROWS($result) == 1) {
@@ -96,16 +96,16 @@ WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
                                array($uid, $chk), __FILE__, __LINE__);
 
                        // Transfer data to constants for the template
-                       define('__GENDER', TRANSLATE_GENDER($data['gender']));
+                       define('__GENDER', translateGender($data['gender']));
                        define('__SNAME' , $data['surname']);
                        define('__FNAME' , $data['family']);
-                       define('__GIFT'  , TRANSLATE_COMMA($data['points']));
+                       define('__GIFT'  , translateComma($data['points']));
 
                        // Load message from template
                        define('__MSG', LOAD_TEMPLATE('birthday_msg', true));
                } else {
                        // Unconfirmed / locked accounts cannot get points
-                       define('__MSG', sprintf(getMessage('BIRTHDAY_CANNOT_STATUS'), TRANSLATE_STATUS($data['status'])));
+                       define('__MSG', sprintf(getMessage('BIRTHDAY_CANNOT_STATUS'), translateUserStatus($data['status'])));
                }
        } else {
                // Cannot load data!
@@ -119,7 +119,7 @@ WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
        $GLOBALS['module'] = 'birthday_confirm';
 
        // Include header
-       LOAD_INC('inc/header.php');
+       loadInclude('inc/header.php');
 
        // Load birthday header template (for your banners, e.g.?)
        define('__BIRTHDAY_HEADER', LOAD_TEMPLATE('birthday_header', true));
@@ -131,10 +131,10 @@ WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
        LOAD_TEMPLATE('birthday_confirm');
 
        // Include footer
-       LOAD_INC('inc/footer.php');
+       loadInclude('inc/footer.php');
 } else {
        // You have to install first!
-       LOAD_URL('install.php');
+       redirectToUrl('install.php');
 }
 
 // Really all done here... ;-)