Continued:

[mailer.git] / inc / modules / sponsor / account.php

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index 4edb063590215aceebe1c6be2f63ea7104518111..f541d3b0685f6b85ec5b4172aff3b705fcdc12de 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Der Sponsor kann sein Account verwalten          *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -50,7 +45,7 @@ if (!defined('__SECURITY')) {
 // Data for the formular
 $result = sqlQueryEscaped("SELECT
        `id`, `company`, `position`, `tax_ident`,
-       `gender`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`,
+       `sex`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`,
        `phone`, `fax`, `cell`, `email`, `url`,
        `status`, `receive_warnings`
 FROM
@@ -87,7 +82,7 @@ if (sqlNumRows($result) == 1) {
                        } elseif ((isPostRequestElementSet('password1')) && (!isPostRequestElementSet('password2'))) {
                                // No password two entered
                                $message = '{--SPONSOR_PASSWORD_TWO_EMPTY--}';
-                       } elseif ((isPostRequestElementSet('password1')) && (strlen(postRequestElement('password1')) < getPassLen())) {
+                       } elseif ((isPostRequestElementSet('password1')) && (strlen(postRequestElement('password1')) < getMinPasswordLength())) {
                                // Too short password
                                $message = '{--SPONSOR_PASSWORD_TOO_SHORT--}';
                        } else {
@@ -118,10 +113,10 @@ if (sqlNumRows($result) == 1) {
 
                        if (!empty($message)) {
                                // Output message
-                               $GLOBALS['sponsor_output'] = displayMessage($message, TRUE);
+                               $GLOBALS['sponsor_output'] = returnMessage($message);
                        } else {
                                // No message generated
-                               $GLOBALS['sponsor_output'] = displayMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}', TRUE);
+                               $GLOBALS['sponsor_output'] = returnMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}');
                        }
                } else {
                        // Output formular
@@ -129,11 +124,11 @@ if (sqlNumRows($result) == 1) {
                }
        } else {
                // Locked or so?
-               $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}', TRUE);
+               $GLOBALS['sponsor_output'] = returnMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}');
        }
 } else {
        // Sponsor account not found
-       $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}', TRUE);
+       $GLOBALS['sponsor_output'] = returnMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}');
 }
 
 // Free memory