More usage of wrapper functions

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

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 21db407cb6e17c5e048ecb4999830992002255e7..c768ccfbbd44bb9c8cda82518e66dcdeae6569fe 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -82,7 +82,7 @@ function registerGenerateCategoryTable ($mode, $return=false) {
        if (isAdmin()) $AND = '';
 
        // Look for categories
-       $result = SQL_QUERY('SELECT `id`, `cat`, `visible` FROM `{?_MYSQL_PREFIX?}_cats` ' . $AND . ' ORDER BY `sort` ASC',
+       $result = SQL_QUERY('SELECT `id`,`cat`,`visible` FROM `{?_MYSQL_PREFIX?}_cats` ' . $AND . ' ORDER BY `sort` ASC',
                __FUNCTION__, __LINE__);
 
        if (!SQL_HASZERONUMS($result)) {
@@ -174,26 +174,6 @@ function isRegistrationDataComplete () {
        // Set it back in request
        setPostRequestArray($postArray);
 
-       // Did he enter his password twice?
-       if (((!isPostRequestParameterSet('pass1')) || (!isPostRequestParameterSet('pass2'))) || ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2')))) {
-               if ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2'))) {
-                       setPostRequestParameter('pass1', '!');
-                       setPostRequestParameter('pass2', '!');
-               } else {
-                       if (!isPostRequestParameterSet('pass1')) {
-                               setPostRequestParameter('pass1', '!');
-                       } else {
-                               setPostRequestParameter('pass1', '');
-                       }
-                       if (!isPostRequestParameterSet('pass2')) {
-                               setPostRequestParameter('pass2', '!');
-                       } else {
-                               setPostRequestParameter('pass2', '');
-                       }
-               }
-               $isOkay = false;
-       } // END - if
-
        // Are both passwords zero length?
        if ((strlen(postRequestParameter('pass1')) == 0) && (strlen(postRequestParameter('pass2')) == 0) && ($isOkay === true)) {
                // Is the extension 'register' newer or equal 0.5.5?
@@ -214,6 +194,26 @@ function isRegistrationDataComplete () {
                }
        } // END - if
 
+       // Did he enter his password twice?
+       if (((!isPostRequestParameterSet('pass1')) || (!isPostRequestParameterSet('pass2'))) || ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2')))) {
+               if ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2'))) {
+                       setPostRequestParameter('pass1', '!');
+                       setPostRequestParameter('pass2', '!');
+               } else {
+                       if (!isPostRequestParameterSet('pass1')) {
+                               setPostRequestParameter('pass1', '!');
+                       } else {
+                               setPostRequestParameter('pass1', '');
+                       }
+                       if (!isPostRequestParameterSet('pass2')) {
+                               setPostRequestParameter('pass2', '!');
+                       } else {
+                               setPostRequestParameter('pass2', '');
+                       }
+               }
+               $isOkay = false;
+       } // END - if
+
        // Is the password long enouth?
        if ((strlen(postRequestParameter('pass1')) < getPassLen()) && ($isOkay === true)) {
                $GLOBALS['registration_short_password'] = true;
@@ -286,27 +286,27 @@ function doRegistration () {
        $countryRow = '`country`';
        $countryData = substr(postRequestParameter('cntry'), 0, 2);
 
-       // Add design when extension sql_patches is v0.2.7 or greater
+       // Add design when extension ext-theme is v0.0.8 or greater
        // @TODO Rewrite these all to a single filter
        $GLOBALS['register_sql_columns'] = '';
        $GLOBALS['register_sql_data'] = '';
        if (isExtensionInstalledAndNewer('theme', '0.0.8')) {
                // Okay, add design here
                $GLOBALS['register_sql_columns'] .= ', `curr_theme`';
-               $GLOBALS['register_sql_data']    .= ", '" . getCurrentTheme() . "'";
+               $GLOBALS['register_sql_data']    .= ", '{%%pipe,getCurrentTheme%%}'";
        } // END - if
 
        // 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.2.7')) && (!isBegNewMemberNotifyEnabled())) {
-               $GLOBALS['register_sql_columns'] .= ', `beg_rallye_enable_notify`, `beg_rallye_disable_notify`';
+               $GLOBALS['register_sql_columns'] .= ', `beg_rallye_enable_notify`,`beg_rallye_disable_notify`';
                $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
        } // END - if
 
        // Second: active rallye
        if ((isExtensionActive('bonus')) && (!isBonusNewMemberNotifyEnabled())) {
-               $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`, `bonus_rallye_disable_notify`';
+               $GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`,`bonus_rallye_disable_notify`';
                $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
        } // END - if
 
@@ -320,9 +320,9 @@ 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'].")
+(`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`,`ref_payout`".$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'].")",
+('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','{%%pipe,detectRemoteAddr%%}', UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), {?ref_payout?}".$GLOBALS['register_sql_data'].")",
        array(
                $countryRow,
                substr(postRequestParameter('gender'), 0, 1),
@@ -340,8 +340,7 @@ function doRegistration () {
                bigintval(postRequestParameter('max_mails')),
                bigintval(postRequestParameter('max_mails')),
                makeZeroToNull(postRequestParameter('refid')),
-               $hash,
-               detectRemoteAddr(),
+               $hash
        ), __FUNCTION__, __LINE__);
 
        // Get his userid
@@ -356,23 +355,25 @@ function doRegistration () {
                return;
        } // END - if
 
-       // Is the refback extension there?
-       // @TODO Rewrite this to a filter
-       if (isExtensionActive('refback')) {
-               // Update refback table
-               updateRefbackTable($userid);
+       // Shall we reset random refid? Only possible with latest ext-user
+       if (isExtensionInstalledAndNewer('user', '0.3.4')) {
+               // Reset all accounts, registration is done
+               SQL_QUERY('UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `rand_confirmed`=0', __FUNCTION__, __LINE__);
        } // END - if
 
+       // Update referal table
+       updateReferalCounter($userid);
+
        // Write his welcome-points
-       // @TODO Wether the registration bonus should only be added to user directly or through referal system should be configurable
-       addPointsDirectly('register_welcome', $userid, getPointsRegister());
+       initReferalSystem();
+       addPointsThroughReferalSystem('register_welcome', $userid, getPointsRegister());
 
        // Write catgories
        if ((is_array(postRequestParameter('cat'))) && (count(postRequestParameter('cat')))) {
                foreach (postRequestParameter('cat') as $categoryId => $joined) {
                        if ($joined == 'Y') {
                                // Insert category entry
-                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (`userid`, `cat_id`) VALUES (%s, %s)",
+                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (`userid`,`cat_id`) VALUES (%s, %s)",
                                        array(
                                                $userid,
                                                bigintval($categoryId)