A lot calls saved, expression language rewritten:

[mailer.git] / inc / libs / register_functions.php

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index d73f86568fe9d32b1e0f5aa40e7611e26cfb8d02..e34ccd2b503ccd57c68a7184df3e46d6c15e1021 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -48,8 +48,10 @@ function ifRequiredRegisterFieldsAreSet (&$array) {
        $ret = true;
        foreach ($array as $key => $value) {
                // Check all fields that must register
-               $result = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_must_register` WHERE `field_name`='".$key."' AND `field_required`='Y' LIMIT 1",
-                       __FUNCTION__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_must_register` WHERE `field_name`='%s' AND `field_required`='Y' LIMIT 1",
+                       array($key), __FUNCTION__, __LINE__);
+
+               // Entry found?
                if (SQL_NUMROWS($result) == 1) {
                        // Check if extension country is not found (you have to enter the 2-chars long country code) or
                        // if extensions is present check if country code was selected
@@ -87,12 +89,10 @@ function registerGenerateCategoryTable ($mode, $return=false) {
 
        if (SQL_NUMROWS($result) > 0) {
                // List alle visible modules (or all to the admin)
-               $SW = 2;
                $OUT .= '<table border="0" cellspacing="0" cellpadding="0" width="100%">';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Prepare array for the template
                        $content = array(
-                               'sw'    => $SW,
                                'cat'   => $content['cat'],
                                'def_y' => '',
                                'def_n' => '',
@@ -108,15 +108,14 @@ function registerGenerateCategoryTable ($mode, $return=false) {
 
                        // Load template and switch color
                        $OUT .= loadTemplate('guest_cat_row', true, $content);
-                       $SW = 3 - $SW;
-               }
+               } // END - while
                $OUT .= '</table>';
 
                // Free memory
                SQL_FREERESULT($result);
        } else {
                // No categories setted up so far...
-               $OUT .= loadTemplate('admin_settings_saved', true, getMessage('NO_CATEGORIES_VISIBLE'));
+               $OUT .= loadTemplate('admin_settings_saved', true, '{--NO_CATEGORIES_VISIBLE--}');
        }
 
        if ($return === true) {
@@ -275,14 +274,14 @@ function doRegistration () {
 
        // Generate hash which will be inserted into confirmation mail
        $hash = generateHash(sha1(
-               $confirmedUsers . getConfig('ENCRYPT_SEPERATOR') .
-               $unconfirmedUsers . getConfig('ENCRYPT_SEPERATOR') .
-               $lockedUsers . getConfig('ENCRYPT_SEPERATOR') .
+               $confirmedUsers . getEncryptSeperator() .
+               $unconfirmedUsers . getEncryptSeperator() .
+               $lockedUsers . getEncryptSeperator() .
                postRequestParameter('month') . '-' .
                postRequestParameter('day') . '-' .
-               postRequestParameter('year') . getConfig('ENCRYPT_SEPERATOR') .
-               detectServerName() . getConfig('ENCRYPT_SEPERATOR') .
-               detectRemoteAddr() . getConfig('ENCRYPT_SEPERATOR') .
+               postRequestParameter('year') . getEncryptSeperator() .
+               detectServerName() . getEncryptSeperator() .
+               detectRemoteAddr() . getEncryptSeperator() .
                detectUserAgent() . '/' .
                getConfig('SITE_KEY') . '/' .
                getConfig('DATE_KEY') . '/' .
@@ -306,19 +305,19 @@ function doRegistration () {
        // Check if I shall disable sending mail to newly registered members out about active/begging rallye
        //
        // First comes first: begging rallye
-       if (isExtensionInstalledAndNewer('beg', '0.1.7')) {
+       if (isExtensionInstalledAndNewer('beg', '0.2.8')) {
                // Okay, shall I disable now?
-               if (getConfig('beg_new_mem_notify') != 'Y') {
-                       $GLOBALS['register_sql_columns'] .= ', `beg_ral_notify`, `beg_ral_en_notify`';
+               if (getConfig('beg_new_member_notify') != 'Y') {
+                       $GLOBALS['register_sql_columns'] .= ', `beg_rallye_notify`, `beg_rallye_enable_notify`';
                        $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
                } // END - if
        } // END - if
 
        // Second: active rallye
-       if (isExtensionInstalledAndNewer('bonus', '0.7.7')) {
+       if (isExtensionInstalledAndNewer('bonus', '0.9.2')) {
                // Okay, shall I disable now?
-               if (getConfig('bonus_new_mem_notify') != 'Y') {
-                       $GLOBALS['register_sql_columns'] .= ', `bonus_ral_notify`, `bonus_ral_en_notify`';
+               if (getConfig('bonus_new_member_notify') != 'Y') {
+                       $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_notify`, `bonus_rallye_enable_notify`';
                        $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
                } // END - if
        } // END - if
@@ -355,7 +354,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
                bigintval(postRequestParameter('refid')),
                $hash,
                detectRemoteAddr(),
-       ), __FILE__, __LINE__);
+       ), __FUNCTION__, __LINE__);
 
        // Get his userid
        $userid = bigintval(SQL_INSERTID());
@@ -363,7 +362,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        // Did this work?
        if ($userid == '0') {
                // Something bad happened!
-               loadTemplate('admin_settings_saved', false, getMessage('USER_NOT_REGISTERED'));
+               loadTemplate('admin_settings_saved', false, '{--USER_NOT_REGISTERED--}');
 
                // Stop here
                return;
@@ -380,7 +379,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        // @TODO Rewrite this whole if() block to addPointsThroughReferalSystem(). This will also make following if() block obsolete
        // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s AND `ref_depth`=0 LIMIT 1",
-               array($userid), __FILE__, __LINE__);
+               array($userid), __FUNCTION__, __LINE__);
        if (SQL_HASZERONUMS($result)) {
                // Add only when the line was not found (maybe some more secure?)
                $locked = 'points';
@@ -389,7 +388,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
                if (getConfig('ref_payout') > 0) $locked = 'locked_points';
 
                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`, `ref_depth`, `%s`) VALUES (%s,0,'{?points_register?}')",
-                       array($locked, $userid), __FILE__, __LINE__);
+                       array($locked, $userid), __FUNCTION__, __LINE__);
 
                // Update mediadata as well
                if ((isExtensionInstalledAndNewer('mediadata', '0.0.4')) && ($locked == 'points')) {
@@ -404,13 +403,13 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
                        if ($joined == 'Y') {
                                // Insert category entry
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (`userid`, `cat_id`) VALUES (%s, %s)",
-                                       array($userid, bigintval($cat)), __FILE__, __LINE__);
+                                       array($userid, bigintval($cat)), __FUNCTION__, __LINE__);
                        } // END - if
                } // END - foreach
        } // END - if
 
        // ... rewrite a zero referal id to the main title
-       if (postRequestParameter('refid') == '0') setPostRequestParameter('refid', getConfig('MAIN_TITLE'));
+       if (postRequestParameter('refid') == '0') setPostRequestParameter('refid', getMainTitle());
 
        // Is ZIP code set?
        if (isPostRequestParameterSet('zip')) {
@@ -419,7 +418,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
                $content = array(
                        'hash'    => $hash,
                        'userid'  => $userid,
-                       'gender'  => translateGender(postRequestParameter('gender')),
+                       'gender'  => SQL_ESCAPE(postRequestParameter('gender')),
                        'surname' => SQL_ESCAPE(postRequestParameter('surname')),
                        'family'  => SQL_ESCAPE(postRequestParameter('family')),
                        'email'   => SQL_ESCAPE(postRequestParameter('email')),
@@ -435,7 +434,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
                $content = array(
                        'hash'    => $hash,
                        'userid'  => $userid,
-                       'gender'  => translateGender(postRequestParameter('gender')),
+                       'gender'  => SQL_ESCAPE(postRequestParameter('gender')),
                        'surname' => SQL_ESCAPE(postRequestParameter('surname')),
                        'family'  => SQL_ESCAPE(postRequestParameter('family')),
                        'email'   => SQL_ESCAPE(postRequestParameter('email')),
@@ -464,11 +463,11 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 
        // Send mail to user (confirmation link!)
        $email = $content['email'];
-       sendEmail($content['email'], getMessage('GUEST_SUBJECT_CONFIRM_LINK'), $messageGuest);
+       sendEmail($content['email'], '{--GUEST_CONFIRM_LINK_SUBJECT--}', $messageGuest);
        $content['email'] = $email;
 
        // Send mail to admin
-       sendAdminNotification(getMessage('ADMIN_SUBJECT_NEW_ACCOUNT'), 'register-admin', $content, $userid);
+       sendAdminNotification('{--ADMIN_NEW_ACCOUNT_SUBJECT--}', 'register-admin', $content, $userid);
 }
 
 // [EOF]