Huge rewrite:

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

diff --git a/inc/modules/admin/what-del_sponsor.php b/inc/modules/admin/what-del_sponsor.php
index 71579574af81875a0984c7ac21f88ea53e442108..a1dee18c04c3abf83e7411fe97bcbde79abedf4b 100644 (file)
--- a/inc/modules/admin/what-del_sponsor.php
+++ b/inc/modules/admin/what-del_sponsor.php
@@ -48,32 +48,30 @@ ADD_DESCR('admin', __FILE__);
 if (REQUEST_ISSET_GET('id')) {
        // Check for selected sponsor
        $result = SQL_QUERY_ESC("SELECT email, gender, surname, family FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE `id`='%s' LIMIT 1",
-       array(bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
+               array(bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Remove sponsor
                if (isFormSent()) {
                        // Load data and remember it in constants
-                       list($email, $gender, $surname, $family) = SQL_FETCHROW($result);
+                       $DATA = SQL_FETCHARRAY($result);
 
-                       // Free result
-                       SQL_FREERESULT($result);
-
-                       define('__EMAIL'  , $email);
-                       define('__GENDER'  , translateGender($gender));
-                       define('__SURNAME', $surname);
-                       define('__FAMILY' , $family);
+                       // @TODO Rewrite these constants
+                       define('__EMAIL'  , $DATA['email']);
+                       define('__GENDER'  , translateGender($DATA['gender']));
+                       define('__SURNAME', $DATA['surname']);
+                       define('__FAMILY' , $DATA['family']);
 
                        // Prepare message and send it away
-                       $msg = LOAD_EMAIL_TEMPLATE("del_sponsor", REQUEST_POST('reason'), bigintval(REQUEST_GET('id')));
-                       sendEmail($email, getMessage('ADMIN_SPONSOR_DEL_SUBJECT'), $msg);
+                       $message = LOAD_EMAIL_TEMPLATE('del_sponsor', REQUEST_POST('reason'), bigintval(REQUEST_GET('id')));
+                       sendEmail($DATA['email'], getMessage('ADMIN_SPONSOR_DEL_SUBJECT'), $message);
 
                        // Remove account
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE `id`='%s' LIMIT 1",
-                       array(bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
+                               array(bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
 
                        // Remove orders
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_sponsor_orders` WHERE sponsorid='%s' LIMIT 1",
-                       array(bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
+                               array(bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
 
                        // Output message
                        LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_SPONSOR_DELETED'), bigintval(REQUEST_GET('id'))));
@@ -82,13 +80,14 @@ if (REQUEST_ISSET_GET('id')) {
                        redirectToUrl('modules.php?module=admin&what=list_sponsor&id='.bigintval(REQUEST_GET('id')));
                } else {
                        // Load data
-                       list ($email, $gender, $sname, $fname) = SQL_FETCHROW($result);
+                       $DATA = SQL_FETCHARRAY($result);
 
                        // Transfer data to constants for the template
-                       define('__EMAIL' , $email);
-                       define('__SNAME' , $sname);
+                       // @TODO Rewrite these constants
+                       define('__EMAIL' , $DATA['email']);
+                       define('__SNAME' , $DATA['surname']);
                        define('__FNAME' , $fname);
-                       define('__GENDER', translateGender($gender));
+                       define('__GENDER', translateGender($DATA['gender']));
                        define('__UID'   , bigintval(REQUEST_GET('id')));
 
                        // Display form
@@ -98,6 +97,9 @@ if (REQUEST_ISSET_GET('id')) {
                // Sponsor not found!
                LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_SPONSOR_404'), bigintval(REQUEST_GET('id'))));
        }
+
+       // Free result
+       SQL_FREERESULT($result);
 } else {
        // Not called by what-list_sponsor.php
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_CALL_NOT_DIRECTLY'));