More rewrites, and output-mode fixed (we should documentate this)

[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 c18d46bc839925ed5696947f104624148d095660..adbd169537aa0b8ac910311360359708a7a2faf4 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -51,8 +51,10 @@ if ((!isExtensionActive('mydata')) && (!isAdmin())) {
        return;
 } // END - if
 
-// Remember userid
-$content['userid'] = getUserId();
+// Add userid
+$content = array(
+       'userid' => getUserId()
+);
 
 // Init variable to prevent notices
 $URL = '';
@@ -66,32 +68,36 @@ if (isPostRequestElementSet('notify')) $mode = 'notify'; // Switch off notificat
 switch ($mode) {
        case 'show': // Show his data
                if (isExtensionActive('country', true)) {
-                       // New 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_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",
+                       // 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                         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 FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
+                       // 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__);
                }
-               $content = SQL_FETCHARRAY($result, 0, false);
+
+               // Get line
+               $content = merge_array($content, SQL_FETCHARRAY($result, 0, false));
+
+               // Free result
                SQL_FREERESULT($result);
 
                // Translate some things
                $content['gender']      = translateGender($content['gender']);
-               $content['last_update'] = generateDateTime($content['last_update'], '0');
+               $content['last_update'] = generateDateTime($content['last_update'], 0);
 
                // How far is last change on his profile away from now?
                if ((($content['last_update'] + getConfig('profile_lock')) > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
                        // You cannot change your account
-                       $content['change'] = loadTemplate('admin_settings_saved', true, "<div class=\"member_failed\">".sprintf(getMessage('MEMBER_PROFILE_LOCKED'), generateDateTime($content['last_update'] + getConfig('profile_lock'), '0'))."</div>");
+                       $content['change'] = loadTemplate('admin_settings_saved', true, "<div class=\"member_failed\">".sprintf(getMessage('MEMBER_PROFILE_LOCKED'), generateDateTime($content['last_update'] + getConfig('profile_lock'), 0))."</div>");
                } else {
                        // He is allowed to change his profile
                        $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;
@@ -103,9 +109,6 @@ switch ($mode) {
                        $content['country'] = generateCountryInfo($content['country_code']);
                } // END - if
 
-               // Merge data in
-               $content = merge_array($content, $content);
-
                // Load template
                loadTemplate('member_mydata_overview', false, $content);
                break;
@@ -131,13 +134,17 @@ LIMIT 1",
                                array(getUserId()), __FILE__, __LINE__);
                }
 
-               $content = SQL_FETCHARRAY($result, 0, false);
+               // Get line
+               $content = merge_array($content, SQL_FETCHARRAY($result, 0, false));
+
+               // Free result
                SQL_FREERESULT($result);
+
                $content['update_check'] = $content['last_update'] + getConfig('profile_lock');
 
                // How far is last change on his profile away from now?
                if (($content['update_check'] > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
-                       $content['update_check'] = generateDateTime($content['update_check'] + getConfig('profile_lock'), '0');
+                       $content['update_check'] = generateDateTime($content['update_check'] + getConfig('profile_lock'), 0);
                        // You cannot change your account
                        loadTemplate('member_mydata_locked', false, $content);
                } else {
@@ -188,9 +195,6 @@ LIMIT 1",
                                $content['country'] = "<input type=\"text\" name=\"cntry\" class=\"member_normal\" size=\"2\" maxlength=\"3\" value=\"".$content['country']."\" />";
                        }
 
-                       // Merge data in
-                       $content = merge_array($content, $content);
-
                        // Load template
                        loadTemplate('member_mydata_edit', false, $content);
                }
@@ -200,13 +204,18 @@ LIMIT 1",
                // 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__);
-               $content = SQL_FETCHARRAY($result, 0, false);
+
+               // Get line
+               $content = merge_array($content, SQL_FETCHARRAY($result, 0, false));
+
+               // Free result
                SQL_FREERESULT($result);
+
                $content['last_change'] = $content['last_update'] + getConfig('profile_lock');
 
                // How far is last change on his profile away from now?
                if (($content['last_change'] > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
-                       $content['last_change'] = generateDateTime($content['last_change'] + getConfig('profile_lock'), '0');
+                       $content['last_change'] = generateDateTime($content['last_change'] + getConfig('profile_lock'), 0);
                        // You cannot change your account
                        loadTemplate('member_mydata_locked');
                } elseif ((!isEmailValid(postRequestElement('email'))) && (!isAdmin())) {