A lot has been rewritten, ext-teams added, ext-forced continued:

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

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index e76cdacf095c69993abaa7387b61877576e9805d..88e358cf2de065c111c5a50fead7ecd1cea22137 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * 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 *
@@ -41,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (!isExtensionActive('sponsor')) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('sponsor'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}');
        return;
 } elseif (!isSponsor()) {
        // No sponsor!
@@ -51,10 +49,10 @@ if (!defined('__SECURITY')) {
 
 // Data for the formular
 $result = SQL_QUERY_ESC("SELECT
-       `company`, `position`, `tax_ident`,
-       `gender`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`,
-       `phone`, `fax`, `cell`, `email`, `url`,
-       `status`, `receive_warnings`
+       `id`,`company`,`position`,`tax_ident`,
+       `gender`,`surname`,`family`,`street_nr1`,`street_nr2`,`zip`,`city`,`country`,
+       `phone`,`fax`,`cell`,`email`,`url`,
+       `status`,`receive_warnings`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE
@@ -89,7 +87,7 @@ if (SQL_NUMROWS($result) == 1) {
                        } elseif ((isPostRequestParameterSet('pass1')) && (!isPostRequestParameterSet('pass2'))) {
                                // No password two entered
                                $message = '{--SPONSOR_PASSWORD_TWO_EMPTY--}';
-                       } elseif ((isPostRequestParameterSet('pass1')) && (strlen(postRequestParameter('pass1')) < getConfig('pass_len'))) {
+                       } elseif ((isPostRequestParameterSet('pass1')) && (strlen(postRequestParameter('pass1')) < getPassLen())) {
                                // Too short password
                                $message = '{--SPONSOR_PASSWORD_TOO_SHORT--}';
                        } else {
@@ -120,31 +118,23 @@ if (SQL_NUMROWS($result) == 1) {
 
                        if (!empty($message)) {
                                // Output message
-                               $OUT = loadTemplate('admin_settings_saved', true, $message);
+                               $GLOBALS['sponsor_output'] = displayMessage($message, true);
                        } else {
                                // No message generated
-                               $OUT = loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_MESSAGE_GENERATED--}');
+                               $GLOBALS['sponsor_output'] = displayMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}', true);
                        }
                } else {
-                       // Init gender
-                       foreach (array('m', 'f', 'c') as $gender) {
-                               $content['gender_' . $gender] = '';
-                       } // END - foreach
-
-                       // Check for gender selection
-                       $content['gender_' . strtolower($content['gender'])] = ' selected="selected"';
-
                        // Output formular
-                       $OUT = loadTemplate('sponsor_account_form', true, $content);
+                       $GLOBALS['sponsor_output'] = loadTemplate('sponsor_account_form', true, $content);
                }
        } else {
                // Locked or so?
                $STATUS = sponsorTranslateUserStatus($content['status']);
-               $OUT = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_FAILED', $STATUS));
+               $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $STATUS . '%}', true);
        }
 } else {
-       // Sponsor account not found!
-       $OUT = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_404', getSession('sponsor_id')));
+       // Sponsor account not found
+       $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}', true);
 }
 
 // Free memory