Even more rewrites/fixes from EL branch (please report any broken part after you...
[mailer.git] / inc / modules / member / what-mydata.php
index c18d46bc839925ed5696947f104624148d095660..28a0f11ad17e9ce30c0bb68ab711534a091b217a 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/16/2003 *
- * ===============                              Last change: 06/30/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/16/2003 *
+ * ===================                          Last change: 06/30/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-mydata.php                                  *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -51,40 +52,32 @@ if ((!isExtensionActive('mydata')) && (!isAdmin())) {
        return;
 } // END - if
 
-// Remember userid
-$content['userid'] = getUserId();
+// Add userid
+$content = array(
+       'userid' => getMemberId()
+);
 
 // Init variable to prevent notices
-$URL = '';
+$url = '';
 
 // Detect what the member wants to do
 $mode = 'show'; // Show his data
-if (isPostRequestElementSet('save'))   $mode = 'save';   // Save entered data
-if (isPostRequestElementSet('edit'))   $mode = 'edit';   // Edit data
-if (isPostRequestElementSet('notify')) $mode = 'notify'; // Switch off notification
+if (isPostRequestParameterSet('save'))   $mode = 'save';   // Save entered data
+if (isFormSent('edit'))   $mode = 'edit';   // Edit data
+if (isPostRequestParameterSet('notify')) $mode = 'notify'; // Switch off notification
 
 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",
-                               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",
-                               array(getUserId()), __FILE__, __LINE__);
-               }
-               $content = SQL_FETCHARRAY($result, 0, false);
-               SQL_FREERESULT($result);
+               // Get line
+               $content = merge_array($content, getUserDataArray());
 
                // 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">' . getMaskedMessage('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);
@@ -103,9 +96,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;
@@ -119,7 +109,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`
@@ -128,18 +118,23 @@ FROM
 WHERE
        `userid`=%s
 LIMIT 1",
-                               array(getUserId()), __FILE__, __LINE__);
+                               array(getMemberId()), __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'] = getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['update_check'] + getConfig('profile_lock'), 0));
+
                        // You cannot change your account
-                       loadTemplate('member_mydata_locked', false, $content);
+                       loadTemplate('admin_settings_saved', false, $content['update_check']);
                } else {
                        // He is allowed to change his profile
                        foreach (array('gender_m','gender_f','gender_c') as $entry) {
@@ -185,52 +180,53 @@ LIMIT 1",
                                $content['country'] = $OUT;
                        } else {
                                // Ouput default input box
-                               $content['country'] = "<input type=\"text\" name=\"cntry\" class=\"member_normal\" size=\"2\" maxlength=\"3\" value=\"".$content['country']."\" />";
+                               $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);
                }
                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__);
-               $content = SQL_FETCHARRAY($result, 0, false);
-               SQL_FREERESULT($result);
-               $content['last_change'] = $content['last_update'] + getConfig('profile_lock');
+               // Get line
+               $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?
-               if (($content['last_change'] > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
-                       $content['last_change'] = generateDateTime($content['last_change'] + getConfig('profile_lock'), '0');
+               if (($content['update_check'] > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
+                       $content['update_check'] = generateDateTime($content['update_check'] + getConfig('profile_lock'), 0);
+
                        // You cannot change your account
-                       loadTemplate('member_mydata_locked');
-               } elseif ((!isEmailValid(postRequestElement('email'))) && (!isAdmin())) {
+                       loadTemplate('admin_settings_saved', false, $content['update_check']);
+               } elseif ((!isEmailValid(postRequestParameter('email'))) && (!isAdmin())) {
                        // Invalid email address!
-                       loadTemplate('admin_settings_saved', false, getMessage('INVALID_EMAIL_ADDRESS_ENTERED'));
+                       loadTemplate('admin_settings_saved', false, getMessage('INVALID_EMAIL_ENTERED'));
                } else {
                        // Generate hash
-                       $hash = generateHash(postRequestElement('pass1'), substr($content['password'], 0, -40));
-                       if ((($hash == $content['password']) || (postRequestElement('pass1') == postRequestElement('pass2'))) && (isPostRequestElementSet('pass1'))) {
+                       $hash = generateHash(postRequestParameter('pass1'), substr($content['password'], 0, -40));
+                       if ((($hash == $content['password']) || (postRequestParameter('pass1') == postRequestParameter('pass2'))) && (isPostRequestParameterSet('pass1'))) {
                                // Only on simple changes normal mode is active = no email or password changed
-                               $mode = 'normal'; $AND = '';
+                               $mode = 'normal';
+                               $AND = '';
 
                                // Did the user changed the password?
-                               if ($hash != $content['password']) { $AND = ", `password`='".$hash."'"; $mode = 'pass'; }
+                               if ($hash != $content['password']) {
+                                       $AND = ", `password`='" . $hash . "'";
+                                       $mode = 'pass';
+                               } // END - if
 
                                // Or did he changed his password?
-                               if (postRequestElement('email') != $content['email']) {
+                               if (postRequestParameter('email') != $content['email']) {
                                        // Jupp
                                        if ($mode == 'normal') {
                                                $mode = 'email';
                                        } else {
                                                $mode .= ';email';
                                        }
-                                       setRequestPostElement('old_email', $content['email']);
+                                       setPostRequestParameter('old_email', $content['email']);
                                } // END - if
 
                                // Update member's profile
@@ -252,19 +248,19 @@ WHERE
        `userid`=%s
 LIMIT 1",
                                                array(
-                                                       postRequestElement('gender'),
-                                                       postRequestElement('surname'),
-                                                       postRequestElement('family'),
-                                                       postRequestElement('street_nr'),
-                                                       bigintval(postRequestElement('country_code')),
-                                                       bigintval(postRequestElement('zip')),
-                                                       postRequestElement('city'),
-                                                       postRequestElement('email'),
-                                                       bigintval(postRequestElement('day')),
-                                                       bigintval(postRequestElement('month')),
-                                                       bigintval(postRequestElement('year')),
-                                                       bigintval(postRequestElement('max_mails')),
-                                                       getUserId()
+                                                       postRequestParameter('gender'),
+                                                       postRequestParameter('surname'),
+                                                       postRequestParameter('family'),
+                                                       postRequestParameter('street_nr'),
+                                                       bigintval(postRequestParameter('country_code')),
+                                                       bigintval(postRequestParameter('zip')),
+                                                       postRequestParameter('city'),
+                                                       postRequestParameter('email'),
+                                                       bigintval(postRequestParameter('day')),
+                                                       bigintval(postRequestParameter('month')),
+                                                       bigintval(postRequestParameter('year')),
+                                                       bigintval(postRequestParameter('max_mails')),
+                                                       getMemberId()
                                                ), __FILE__, __LINE__);
                                } else {
                                        // Old way
@@ -284,19 +280,19 @@ WHERE
        `userid`=%s
 LIMIT 1",
                                                array(
-                                                       postRequestElement('gender'),
-                                                       postRequestElement('surname'),
-                                                       postRequestElement('family'),
-                                                       postRequestElement('street_nr'),
-                                                       postRequestElement('cntry'),
-                                                       bigintval(postRequestElement('zip')),
-                                                       postRequestElement('city'),
-                                                       postRequestElement('email'),
-                                                       bigintval(postRequestElement('day')),
-                                                       bigintval(postRequestElement('month')),
-                                                       bigintval(postRequestElement('year')),
-                                                       bigintval(postRequestElement('max_mails')),
-                                                       getUserId()
+                                                       postRequestParameter('gender'),
+                                                       postRequestParameter('surname'),
+                                                       postRequestParameter('family'),
+                                                       postRequestParameter('street_nr'),
+                                                       postRequestParameter('cntry'),
+                                                       bigintval(postRequestParameter('zip')),
+                                                       postRequestParameter('city'),
+                                                       postRequestParameter('email'),
+                                                       bigintval(postRequestParameter('day')),
+                                                       bigintval(postRequestParameter('month')),
+                                                       bigintval(postRequestParameter('year')),
+                                                       bigintval(postRequestParameter('max_mails')),
+                                                       getMemberId()
                                                ), __FILE__, __LINE__);
                                }
 
@@ -320,14 +316,14 @@ 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__);
-               $URL = 'modules.php?module=login&amp;what=welcome&amp;code=' . urlencode(getMessage('PROFILE_UPDATED'));
+                       array(getMemberId()), __FILE__, __LINE__);
+               $url = 'modules.php?module=login&amp;what=welcome&amp;code=' . urlencode(getMessage('PROFILE_UPDATED'));
                break;
 } // END - switch
 
-if (!empty($URL)) {
+if (!empty($url)) {
        // Load generated URL
-       redirectToUrl($URL);
+       redirectToUrl($url);
 } // END - if
 
 // [EOF]