Huge rewrite of default parameters, ext-network continued:

[mailer.git] / inc / modules / guest / what-register.php

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index b53d0bdaedbb9d31c3163d716c566c41b02abd05..9065ccf701edaa5bc5d6800c9c54b79bdd00d78f 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -55,19 +55,14 @@ if (!isExtensionActive('register')) {
 // Initialize variables
 $isOkay     = true;
 $shortPass  = false;
-$cats       = 0;
+$cats       = '0';
 $ipTimedOut = false;
 
 // Default refid is zero
 setRequestPostElement('refid', 0);
 if (determineReferalId() > 0) {
        // Test if the refid is valid
-       $result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-               array(determineReferalId()), __FILE__, __LINE__);
-
-       // Userid found?
-       //* DEBUG: */ die("refid={determineReferalId()}/numRows=".SQL_NUMROWS($result)."");
-       if (SQL_NUMROWS($result) == 0) {
+       if (!fetchUserData(determineReferalId())) {
                // Not found so we set your refid!
                setRequestPostElement('refid', getConfig('def_refid'));
                setSession('refid', getConfig('def_refid'));
@@ -198,7 +193,7 @@ if ((isFormSent()) && (($isOkay === true) || (isAdmin()))) {
        // @TODO Rewrite these all to a single filter
        $ADD1 = '';
        $ADD2 = '';
-       if (getExtensionVersion('theme') >= '0.0.8') {
+       if (isExtensionInstalledAndNewer('theme', '0.0.8')) {
                // Okay, add design here
                $ADD1 = ', `curr_theme`';
                $ADD2 = ", '".getCurrentTheme()."'";
@@ -207,7 +202,7 @@ if ((isFormSent()) && (($isOkay === true) || (isAdmin()))) {
        // Check if I shall disable sending mail to newly registered members out about active/begging rallye
        //
        // First comes first: begging rallye
-       if (getExtensionVersion('beg') >= '0.1.7') {
+       if (isExtensionInstalledAndNewer('beg', '0.1.7')) {
                // Okay, shall I disable now?
                if (getConfig('beg_new_mem_notify') != 'Y') {
                        $ADD1 .= ', `beg_ral_notify`, `beg_ral_en_notify`';
@@ -216,7 +211,7 @@ if ((isFormSent()) && (($isOkay === true) || (isAdmin()))) {
        } // END - if
 
        // Second: active rallye
-       if (getExtensionVersion('bonus') >= '0.7.7') {
+       if (isExtensionInstalledAndNewer('bonus', '0.7.7')) {
                // Okay, shall I disable now?
                if (getConfig('bonus_new_mem_notify') != 'Y') {
                        $ADD1 .= ', `bonus_ral_notify`, `bonus_ral_en_notify`';
@@ -266,7 +261,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        $userid = SQL_INSERTID();
 
        // Did this work?
-       if ($userid == 0) {
+       if ($userid == '0') {
                // Something bad happened!
                loadTemplate('admin_settings_saved', false, getMessage('USER_NOT_REGISTERED'));
                return;
@@ -282,7 +277,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        // Write his welcome-points
        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s AND `ref_depth`=0 LIMIT 1",
                array(bigintval($userid)), __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) == 0) {
+       if (SQL_NUMROWS($result) == '0') {
                // Add only when the line was not found (maybe some more secure?)
                $locked = 'points';
 
@@ -294,7 +289,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
                        array(bigintval($userid)), __FILE__, __LINE__);
 
                // Update mediadata as well
-               if ((getExtensionVersion('mediadata') >= '0.0.4') && ($locked == 'points')) {
+               if ((isExtensionInstalledAndNewer('mediadata', '0.0.4')) && ($locked == 'points')) {
                        // Update database
                        updateMediadataEntry(array('total_points'), 'add', getConfig('points_register'));
                } // END - if
@@ -314,8 +309,8 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
        // Rewrite gender
        $gender = translateGender(postRequestElement('gender'));
 
-       // ... rewrite a zero referal ID to the main title
-       if (postRequestElement('refid') == 0) setRequestPostElement('refid', getConfig('MAIN_TITLE'));
+       // ... rewrite a zero referal id to the main title
+       if (postRequestElement('refid') == '0') setRequestPostElement('refid', getConfig('MAIN_TITLE'));
 
        // Is ZIP code set?
        if (isPostRequestElementSet('zip')) {