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

[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..ba473bdc915d1c2b0c777e21cc864b4252d53ef3 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -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(getUserId())) {
+                       // Something really bad happended
+                       debug_report_bug('No user account ' . getUserId() . ' 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']);
@@ -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(getUserId())) {
+                       // Something really bad happened
+                       debug_report_bug('No user account ' . getUserId() . ' 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?