A lot texts rewritten and exclamation signs removed

[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 39cd91546eb6c1ef1e0d51f099c6487a9366f684..144b1e1833271e49c992af614daca1a62d0cb340 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -198,7 +198,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 +207,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 +216,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`';
@@ -290,11 +290,11 @@ 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';
 
                // @TODO Rewrite this to addPointsDirectly()
-               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`, `ref_depth`, `".$locked."`) VALUES (%s,0,'%s')",
-                       array(bigintval($userid), getConfig('points_register')), __FILE__, __LINE__);
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`, `ref_depth`, `".$locked."`) VALUES (%s,0,'{?points_register?}')",
+                       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,7 +314,7 @@ 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
+       // ... rewrite a zero referal id to the main title
        if (postRequestElement('refid') == 0) setRequestPostElement('refid', getConfig('MAIN_TITLE'));
 
        // Is ZIP code set?