mailer project 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 0f21b5b461313087cca56fbfe1e161b8adc17230..4ed6637853b689e4d3897abd6039ffa1c2eb15fa 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } elseif (!isMember()) {
        redirectToIndexMemberOnlyModule();
 }
@@ -98,8 +98,22 @@ switch ($mode) {
 
        case 'edit': // Edit 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`
+                       // New way
+                       $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
@@ -107,8 +121,22 @@ WHERE
 LIMIT 1",
                        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`
+                       // Old way
+                       $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
@@ -118,7 +146,7 @@ LIMIT 1",
                }
 
                // Get line
-               $content = merge_array($content, SQL_FETCHARRAY($result, 0, false));
+               $content = merge_array($content, SQL_FETCHARRAY($result));
 
                // Free result
                SQL_FREERESULT($result);
@@ -127,6 +155,7 @@ LIMIT 1",
 
                // How far is last change on his profile away from now?
                if (($content['update_check'] > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
+                       // Profile is locked, so output propper message
                        $content['update_check'] = '{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['update_check'] + getProfileLock(), '0') . '%}';
 
                        // You cannot change your account
@@ -168,7 +197,7 @@ LIMIT 1",
 
                                // Generate selection box
                                $OUT  = '<select name="country_code" class="form_select" size="1">';
-                               $OUT .= generateOptionList('countries', 'id', 'descr', $content['country_code'], 'code', $whereStatement);
+                               $OUT .= generateOptions('countries', 'id', 'descr', $content['country_code'], 'code', $whereStatement);
                                $OUT .= '</select>';
                                $content['country'] = $OUT;
                        } else {
@@ -210,7 +239,7 @@ LIMIT 1",
 
                                // Did the user changed the password?
                                if ($hash != $content['password']) {
-                                       $AND = ", `password`='" . $hash . "'";
+                                       $AND = ",`password`='" . $hash . "'";
                                        $mode = 'password';
                                } // END - if
 
@@ -231,11 +260,17 @@ LIMIT 1",
                                        SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
-       `gender`='%s', `surname`='%s', `family`='%s',
+       `gender`='%s',
+       `surname`='%s',
+       `family`='%s',
        `street_nr`='%s',
-       `country_code`=%s, `zip`=%s, `city`='%s',
+       `country_code`=%s,
+       `zip`=%s,
+       `city`='%s',
        `email`='%s',
-       `birth_day`=%s, `birth_month`=%s, `birth_year`=%s,
+       `birth_day`=%s,
+       `birth_month`=%s,
+       `birth_year`=%s,
        `max_mails`='%s',
        `last_update`=UNIX_TIMESTAMP()".$AND.",
        `notified`='N',
@@ -263,11 +298,17 @@ LIMIT 1",
                                        SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
-       `gender`='%s', `surname`='%s', `family`='%s',
+       `gender`='%s',
+       `surname`='%s',
+       `family`='%s',
        `street_nr`='%s',
-       `country`='%s', `zip`=%s, `city`='%s',
+       `country`='%s',
+       `zip`=%s,
+       `city`='%s',
        `email`='%s',
-       `birth_day`=%s, `birth_month`=%s, `birth_year`=%s,
+       `birth_day`=%s,
+       `birth_month`=%s,
+       `birth_year`=%s,
        `max_mails`='%s',
        `last_update`=UNIX_TIMESTAMP()".$AND.",
        `notified`='N',
@@ -311,7 +352,7 @@ LIMIT 1",
                break;
 
        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",
+               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `notified`='N',`last_update`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
                        array(getMemberId()), __FILE__, __LINE__);
                $url = 'modules.php?module=login&amp;what=mydata&amp;code=' . getCode('PROFILE_UPDATED');
                break;