New function fetchUserData() introduced to API, total rewrite (not all)

[mailer.git] / inc / modules / member / what-primera.php

diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php
index 83b76264eb492b4d937bbe812467f6f10ce9f68c..b602530b3bace7210e1108e8a79229f734af06da 100644 (file)
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -69,19 +69,12 @@ if (!isGetRequestElementSet('mode')) {
        // Get referal id
        $content['refid'] = getConfig(('primera_refid'));
 
-       // Get Primus id
-       $result = SQL_QUERY_ESC("SELECT `primera_userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-               array(getUserId()), __FILE__, __LINE__);
-
        // Are there some entries?
-       if (SQL_NUMROWS($result) == 1) {
+       if (fetchUserData(getUserId())) {
                // Fetch id
-               list($content['primera_nickname']) = SQL_FETCHROW($result);
+               $content['primera_nickname'] = getUserData('primera_nickname');
        } // END - if
 
-       // Free result
-       SQL_FREERESULT($result);
-
        // Is there an id?
        if ((!empty($content['primera_nickname'])) && (!isGetRequestElementSet('mode'))) {
                // Then use an other "mode"
@@ -141,17 +134,12 @@ if (getRequestElement('mode') == 'pay') {
 
        // Get Primera id
        $content['primera_nickname'] = '';
-       $result = SQL_QUERY_ESC("SELECT `primera_userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-               array(getUserId()), __FILE__, __LINE__);
 
-       // Are there some entries?
-       if (SQL_NUMROWS($result) == 1) {
+       // Do we have a user account? (should be!)
+       if (fetchUserData(getUserId())) {
                // Fetch id
-               list($content['primera_nickname']) = SQL_FETCHROW($result);
-       }
-
-       // Free result
-       SQL_FREERESULT($result);
+               $content['primera_nickname'] = getUserData('primera_nickname');
+       } // END - if
 } else {
        // Invalid mode!
        loadTemplate('admin_settings_saved', false, sprintf(getMessage('PRIMERA_MEMBER_MODE_INVALID'), getRequestElement('mode')));
@@ -199,7 +187,7 @@ if ((isFormSent()) && (isGetRequestElementSet('mode'))) {
                                        subtractPoints('primera_payout', getUserId(), postRequestElement('amount'));
 
                                        // Update primera nickname
-                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `primera_userid`=%s WHERE `userid`=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `primera_nickname`=%s WHERE `userid`=%s LIMIT 1",
                                                array(postRequestElement('primera_nickname'), getUserId()), __FILE__, __LINE__);
 
                                        // All done!