Important fix for mail and 'percents' renamed to 'click_rate' where it is a click...

[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 a805b179bc13d439212c642f1754fb4adafe426b..39b6d3f0a9c2359062efed44934c0fd4b2630bbb 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, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,10 +43,10 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('mydata')) && (!isAdmin())) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('mydata'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mydata%}');
        return;
 } // END - if
 
@@ -71,9 +71,9 @@ switch ($mode) {
                $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)) {
+               if ((($content['last_update'] + getProfileLock()) > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
                        // You cannot change your account
-                       $content['change'] = loadTemplate('admin_settings_saved', true, '<div class="notice">' . getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['last_update'] + getConfig('profile_lock'), 0)) . '</div>');
+                       $content['change'] = displayMessage('<div class="notice">{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['last_update'] + getProfileLock(), 0) . '%}</div>', true);
                } else {
                        // He is allowed to change his profile
                        $content['change'] = loadTemplate('member_mydata_button', true);
@@ -123,21 +123,16 @@ LIMIT 1",
                // Free result
                SQL_FREERESULT($result);
 
-               $content['update_check'] = $content['last_update'] + getConfig('profile_lock');
+               $content['update_check'] = $content['last_update'] + getProfileLock();
 
                // How far is last change on his profile away from now?
-               if (($content['update_check'] > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
-                       $content['update_check'] = getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['update_check'] + getConfig('profile_lock'), 0));
+               if (($content['update_check'] > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
+                       $content['update_check'] = '{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['update_check'] + getProfileLock(), '0') . '%}';
 
                        // You cannot change your account
-                       loadTemplate('admin_settings_saved', false, $content['update_check']);
+                       displayMessage($content['update_check']);
                } else {
-                       // He is allowed to change his profile
-                       foreach (array('gender_m','gender_f','gender_c') as $entry) {
-                               $content[$entry] = '';
-                       } // END - foreach
-
-                       $content['gender_' . strtolower($content['gender'])] = ' selected="selected"';
+                       // Init elements
                        $content['dob'] = '';
 
                        switch (getLanguage()) {
@@ -189,17 +184,20 @@ LIMIT 1",
                $content = merge_array($content, getUserDataArray());
 
                // Calculate time to check
-               $content['update_check'] = $content['last_update'] + getConfig('profile_lock');
+               $content['update_check'] = $content['last_update'] + getProfileLock();
 
                // 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);
-
+               if (($content['update_check'] > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
                        // You cannot change your account
-                       loadTemplate('admin_settings_saved', false, $content['update_check']);
+                       $content['update_check'] = generateDateTime($content['update_check'] + getProfileLock(), 0);
+
+                       displayMessage($content['update_check']);
                } elseif ((!isEmailValid(postRequestParameter('email'))) && (!isAdmin())) {
                        // Invalid email address!
-                       loadTemplate('admin_settings_saved', false, '{--INVALID_EMAIL_ENTERED--}');
+                       displayMessage('{--INVALID_EMAIL_ENTERED--}');
+               } elseif ((isEmailTaken(postRequestParameter('email'))) && (isCheckDoubleEmailEnabled()) && (!isAdmin())) {
+                       // Email address is already registered
+                       displayMessage('{--MEMBER_EMAIL_IS_ALREADY_REGISTERED--}');
                } else {
                        // Generate hash
                        $hash = generateHash(postRequestParameter('pass1'), substr($content['password'], 0, -40));
@@ -293,7 +291,7 @@ LIMIT 1",
                                }
 
                                // Did something change?
-                               if (SQL_AFFECTEDROWS() == 1) {
+                               if (!SQL_HASZEROAFFECTED()) {
                                        // Get all modes ...
                                        $modes = explode(';', $mode);
 
@@ -301,11 +299,11 @@ LIMIT 1",
                                        sendModeMails ('mydata', $modes);
                                } else {
                                        // Something went wrong
-                                       loadTemplate('admin_settings_saved', false, '{--MEMBER_UPDATE_FAILED--}');
+                                       displayMessage('{--MEMBER_UPDATE_FAILED--}');
                                }
                        } else {
                                // Entered wrong pass for updating profile
-                               loadTemplate('admin_settings_saved', false, '{--MEBER_UPDATE_PWD_WRONG--}');
+                               displayMessage('{--MEBER_UPDATE_PWD_WRONG--}');
                        }
                }
                break;