Naming convention, internal TODOs solved:

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

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 4da3b6027045d2d148f2708923aaa9bd99600fab..665a4b7873fdd09c5722ac56952747e918634f61 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -87,14 +87,12 @@ function registerGenerateCategoryTable ($mode, $return=false) {
        $result = SQL_QUERY("SELECT `id`, `cat`, `visible` FROM `{?_MYSQL_PREFIX?}_cats` ".$AND." ORDER BY `sort` ASC",
                __FUNCTION__, __LINE__);
 
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // 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' => '',
@@ -110,8 +108,7 @@ 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
@@ -277,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') . '/' .
@@ -379,26 +376,8 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        } // END - if
 
        // Write his welcome-points
-       // @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), __FUNCTION__, __LINE__);
-       if (SQL_HASZERONUMS($result)) {
-               // Add only when the line was not found (maybe some more secure?)
-               $locked = 'points';
-
-               // Pay him later. First he has to confirm some mails!
-               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), __FUNCTION__, __LINE__);
-
-               // Update mediadata as well
-               if ((isExtensionInstalledAndNewer('mediadata', '0.0.4')) && ($locked == 'points')) {
-                       // Update database
-                       updateMediadataEntry(array('total_points'), 'add', getConfig('points_register'));
-               } // END - if
-       } // END - if
+       addPointsDirectly('register_welcome', $userid, getConfig('points_register'));
 
        // Write catgories
        if ((is_array(postRequestParameter('cat'))) && (count(postRequestParameter('cat')))) {
@@ -412,7 +391,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        } // 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')) {
@@ -421,7 +400,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')),
@@ -437,7 +416,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')),
@@ -466,11 +445,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'], '{--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]