Huge rewrite of default parameters, ext-network continued:

[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 79a408a4d926548dc81bd693a5e33e4498e618d0..e6bd332db9912ea378ae57e7691c64b47980d32d 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
@@ -67,21 +67,14 @@ if (isPostRequestElementSet('notify')) $mode = 'notify'; // Switch off notificat
 
 switch ($mode) {
        case 'show': // Show his data
-               if (isExtensionActive('country', true)) {
-                       // New way                          1          2            3             4         5      6        7           8            9              10         11         12               13            14
-                       $result = SQL_QUERY_ESC("SELECT `surname`, `family`, `street_nr`, `country_code`, `zip`, `city`, `email`, `birth_day`, `birth_month`, `birth_year`, `gender`, `max_mails`, `receive_mails`, `last_update` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-                               array(getUserId()), __FILE__, __LINE__);
-               } else {
-                       // Old way                          1          2            3        4         5      6        7           8            9              10         11         12               13            14
-                       $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` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-                               array(getUserId()), __FILE__, __LINE__);
-               }
+               // Get user data
+               if (!fetchUserData(getMemberId())) {
+                       // Something really bad happended
+                       debug_report_bug('No user account ' . getMemberId() . ' found.');
+               } // END - if
 
                // Get line
-               $content = merge_array($content, SQL_FETCHARRAY($result, 0, false));
-
-               // Free result
-               SQL_FREERESULT($result);
+               $content = merge_array($content, getUserDataArray());
 
                // Translate some things
                $content['gender']      = translateGender($content['gender']);
@@ -96,8 +89,8 @@ switch ($mode) {
                        $content['change'] = loadTemplate('member_mydata_button', true);
                }
 
-               if (strlen($content['birth_day'])   == 1) $content['birth_day']   = 0 . $content['birth_day'];
-               if (strlen($content['birth_month']) == 1) $content['birth_month'] = 0 . $content['birth_month'];
+               if (strlen($content['birth_day'])   == 1) $content['birth_day']   = '0' . $content['birth_day'];
+               if (strlen($content['birth_month']) == 1) $content['birth_month'] = '0' . $content['birth_month'];
 
                switch (getLanguage()) {
                        case 'de': $content['dob'] = $content['birth_day']   . '.' . $content['birth_month'] . '.' . $content['birth_year']; break;
@@ -122,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`
@@ -131,7 +124,7 @@ FROM
 WHERE
        `userid`=%s
 LIMIT 1",
-                               array(getUserId()), __FILE__, __LINE__);
+                               array(getMemberId()), __FILE__, __LINE__);
                }
 
                // Get line
@@ -202,16 +195,16 @@ LIMIT 1",
                break;
 
        case 'save': // Save entered data
-               // Load old email / password:      0          1           2
-               $result = SQL_QUERY_ESC("SELECT `email`, `password`, `last_update` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-                       array(getUserId()), __FILE__, __LINE__);
+               // Load old email / password
+               if (!fetchUserData(getMemberId())) {
+                       // Something really bad happened
+                       debug_report_bug('No user account ' . getMemberId() . ' found.');
+               } // END - if
 
                // Get line
-               $content = merge_array($content, SQL_FETCHARRAY($result, 0, false));
-
-               // Free result
-               SQL_FREERESULT($result);
+               $content = merge_array($content, getUserDataArray());
 
+               // Calculate time to check
                $content['update_check'] = $content['last_update'] + getConfig('profile_lock');
 
                // How far is last change on his profile away from now?
@@ -274,7 +267,7 @@ LIMIT 1",
                                                        bigintval(postRequestElement('month')),
                                                        bigintval(postRequestElement('year')),
                                                        bigintval(postRequestElement('max_mails')),
-                                                       getUserId()
+                                                       getMemberId()
                                                ), __FILE__, __LINE__);
                                } else {
                                        // Old way
@@ -306,7 +299,7 @@ LIMIT 1",
                                                        bigintval(postRequestElement('month')),
                                                        bigintval(postRequestElement('year')),
                                                        bigintval(postRequestElement('max_mails')),
-                                                       getUserId()
+                                                       getMemberId()
                                                ), __FILE__, __LINE__);
                                }
 
@@ -330,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