Moved surfbar-related functions, unnessary array element removed

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

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 89539ff5461a68658e4522d65f5888a0b97d1303..13be207a739286c5286cce380f0d5b55667d5bc1 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -87,7 +87,7 @@ 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)
                $OUT .= '<table border="0" cellspacing="0" cellpadding="0" width="100%">';
                while ($content = SQL_FETCHARRAY($result)) {
@@ -274,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') . '/' .
@@ -308,7 +308,7 @@ function doRegistration () {
        if (isExtensionInstalledAndNewer('beg', '0.2.8')) {
                // Okay, shall I disable now?
                if (getConfig('beg_new_member_notify') != 'Y') {
-                       $GLOBALS['register_sql_columns'] .= ', `beg_rallye_notify`, `beg_rallye_enable_notify`';
+                       $GLOBALS['register_sql_columns'] .= ', `beg_rallye_enable_notify`, `beg_rallye_disable_notify`';
                        $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
                } // END - if
        } // END - if
@@ -317,7 +317,7 @@ function doRegistration () {
        if (isExtensionInstalledAndNewer('bonus', '0.9.2')) {
                // Okay, shall I disable now?
                if (getConfig('bonus_new_member_notify') != 'Y') {
-                       $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_notify`, `bonus_rallye_enable_notify`';
+                       $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`, `bonus_rallye_disable_notify`';
                        $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
                } // END - if
        } // END - if
@@ -333,8 +333,11 @@ function doRegistration () {
        // Create user's account... //
        //////////////////////////////
        //
-       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_data` (gender, surname, family, street_nr,%s, zip, city, email, birth_day, birth_month, birth_year, password, max_mails, receive_mails, refid, status, user_hash, REMOTE_ADDR, joined, last_update".$GLOBALS['register_sql_columns'].")
-VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$GLOBALS['register_sql_data'].")",
+       SQL_QUERY_ESC("INSERT INTO
+       `{?_MYSQL_PREFIX?}_user_data`
+(`gender`, `surname`, `family`, `street_nr`,%s, `zip`, `city`, `email`, `birth_day`, `birth_month`, `birth_year`, `password`, `max_mails`, `receive_mails`, `refid`, `status`, `user_hash`, `REMOTE_ADDR`, `joined`, `last_update`".$GLOBALS['register_sql_columns'].")
+       VALUES
+('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$GLOBALS['register_sql_data'].")",
        array(
                $countryRow,
                substr(postRequestParameter('gender'), 0, 1),
@@ -376,26 +379,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, getPointsRegister());
 
        // Write catgories
        if ((is_array(postRequestParameter('cat'))) && (count(postRequestParameter('cat')))) {
@@ -409,7 +394,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')) {
@@ -418,7 +403,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')),
@@ -434,7 +419,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')),