Fixed also usage of previously renamed fields as they must be the same

[mailer.git] / inc / modules / admin / what-edit_sponsor.php

diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php
index 93d133e3a1b5aad54b757318f316fcb42aa89979..c377966e43b41486ec5d54d47a06067425a6e095 100644 (file)
--- a/inc/modules/admin/what-edit_sponsor.php
+++ b/inc/modules/admin/what-edit_sponsor.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')) || (!isAdmin())) {
-       die();
+       exit();
 } // END - if
 
 // Add description as navigation point
@@ -46,10 +46,10 @@ addYouAreHereLink('admin', __FILE__);
 if ((isGetRequestElementSet('id')) && (isGetRequestElementSet('do'))) {
        // Check for selected sponsor
        $result_main = SQL_QUERY_ESC("SELECT
-       `id`,`company`,`position`,`gender`,`surname`,`family`,
-       `street_nr1`,`street_nr2`,`zip`,`city`,`country`,
-       `phone`,`fax`,`cell`,`email`,`url`,`tax_ident`,
-       `receive_warnings`,`warning_interval`
+       `id`, `company`, `position`, `gender`, `surname`, `family`,
+       `street_nr1`, `street_nr2`, `zip`, `city`, `country`,
+       `phone`, `fax`, `cell`, `email`, `url`, `tax_ident`,
+       `receive_warnings`, `warning_interval`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE
@@ -119,17 +119,16 @@ LIMIT 1",
                                        break;
 
                                case 'edit': // Edit sponsor account
-                                       $PASS = true;
-                                       if ((postRequestElement('pass1') != postRequestElement('pass2')) || ((!isPostRequestElementSet('pass1')) && (!isPostRequestElementSet('pass1')))) {
+                                       $PASS = TRUE;
+                                       if ((postRequestElement('password1') != postRequestElement('password2')) || ((!isPostRequestElementSet('password1')) && (!isPostRequestElementSet('password1')))) {
                                                // Remove passwords
-                                               unsetPostRequestElement('pass1');
-                                               unsetPostRequestElement('pass2');
-                                               $PASS = false;
+                                               unsetPostRequestElement('password1');
+                                               unsetPostRequestElement('password2');
+                                               $PASS = FALSE;
                                        } // END - if
 
                                        // Convert time selection
-                                       $content = array(); $id = 'warning_interval_ye'; $skip = false;
-                                       convertSelectionsToEpocheTime(postRequestArray(), $content, $id, $skip);
+                                       convertSelectionsToEpocheTimeInPostData('warning_interval_ye');
 
                                        // Save the sponsor
                                        handleSponsorRequest(postRequestArray());
@@ -138,10 +137,10 @@ LIMIT 1",
                                        postRequestElement('gender'          , '{%pipe,translateGender=' . postRequestElement('gender') . '%}');
                                        postRequestElement('warning_interval', '{%pipe,createFancyTime=' . postRequestElement('warning_interval') . '%}');
 
-                                       if ($PASS === false) setPostRequestElement('pass1', '{--SPONSOR_PASS_UNCHANGED--}');
+                                       if ($PASS === FALSE) setPostRequestElement('password1', '{--SPONSOR_PASS_UNCHANGED--}');
 
                                        // Load email template and send the mail away
-                                       $message = loadEmailTemplate('admin_sponsor_edit', postRequestArray(), false);
+                                       $message = loadEmailTemplate('admin_sponsor_edit', postRequestArray(), FALSE);
                                        sendEmail(postRequestElement('email'), '{--ADMIN_SPONSOR_EDIT_SUBJECT--}', $message);
                                        break;
 
@@ -160,7 +159,7 @@ LIMIT 1",
                        $content['contact'] = '<a href="' . generateSponsorEmailLink($content['email'], 'sponsor_data') . '">' . $content['surname'] . ' ' . $content['family'] . '</a>';
 
                        // Load mode template
-                       loadTemplate($TPL, false, $content);
+                       loadTemplate($TPL, FALSE, $content);
                } else {
                        // Template not found
                        displayMessage('{%message,ADMIN_SPONSOR_MODUS_TPL_404', getRequestElement('do') . '%}');