Naming inconsistencies for userid fixed

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

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index ba473bdc915d1c2b0c777e21cc864b4252d53ef3..3ae5495f1ff970340eda9e3f82eaa1a2d5ea618a 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -53,7 +53,7 @@ if ((!isExtensionActive('mydata')) && (!isAdmin())) {
 
 // Add userid
 $content = array(
-       'userid' => getUserId()
+       'userid' => getMemberId()
 );
 
 // Init variable to prevent notices
@@ -68,9 +68,9 @@ if (isPostRequestElementSet('notify')) $mode = 'notify'; // Switch off notificat
 switch ($mode) {
        case 'show': // Show his data
                // Get user data
-               if (!fetchUserData(getUserId())) {
+               if (!fetchUserData(getMemberId())) {
                        // Something really bad happended
-                       debug_report_bug('No user account ' . getUserId() . ' found.');
+                       debug_report_bug('No user account ' . getMemberId() . ' found.');
                } // END - if
 
                // Get line
@@ -115,7 +115,7 @@ FROM
 WHERE
        `userid`=%s
 LIMIT 1",
-                       array(getUserId()), __FILE__, __LINE__);
+                       array(getMemberId()), __FILE__, __LINE__);
                } else {
                        // Old way                          0          1            2          3       4       5       6           7            8              9          10         11               12            13
                        $result = SQL_QUERY_ESC("SELECT `surname`, `family`, `street_nr`, `country`, `zip`, `city`, `email`, `birth_day`, `birth_month`, `birth_year`, `gender`, `max_mails`, `receive_mails`, `last_update`
@@ -124,7 +124,7 @@ FROM
 WHERE
        `userid`=%s
 LIMIT 1",
-                               array(getUserId()), __FILE__, __LINE__);
+                               array(getMemberId()), __FILE__, __LINE__);
                }
 
                // Get line
@@ -196,9 +196,9 @@ LIMIT 1",
 
        case 'save': // Save entered data
                // Load old email / password
-               if (!fetchUserData(getUserId())) {
+               if (!fetchUserData(getMemberId())) {
                        // Something really bad happened
-                       debug_report_bug('No user account ' . getUserId() . ' found.');
+                       debug_report_bug('No user account ' . getMemberId() . ' found.');
                } // END - if
 
                // Get line
@@ -267,7 +267,7 @@ LIMIT 1",
                                                        bigintval(postRequestElement('month')),
                                                        bigintval(postRequestElement('year')),
                                                        bigintval(postRequestElement('max_mails')),
-                                                       getUserId()
+                                                       getMemberId()
                                                ), __FILE__, __LINE__);
                                } else {
                                        // Old way
@@ -299,7 +299,7 @@ LIMIT 1",
                                                        bigintval(postRequestElement('month')),
                                                        bigintval(postRequestElement('year')),
                                                        bigintval(postRequestElement('max_mails')),
-                                                       getUserId()
+                                                       getMemberId()
                                                ), __FILE__, __LINE__);
                                }
 
@@ -323,7 +323,7 @@ LIMIT 1",
 
        case 'notify': // Switch off notfication
                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `notified`='N', `last_update`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
-                       array(getUserId()), __FILE__, __LINE__);
+                       array(getMemberId()), __FILE__, __LINE__);
                $URL = 'modules.php?module=login&what=welcome&code=' . urlencode(getMessage('PROFILE_UPDATED'));
                break;
 } // END - switch