Some language strings rewritten to use getMessage()

[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 f12da4ae2b13e0e81a0632edca532d6f6ab8310e..a1dee18c04c3abf83e7411fe97bcbde79abedf4b 100644 (file)
--- a/inc/modules/admin/what-del_sponsor.php
+++ b/inc/modules/admin/what-del_sponsor.php
@@ -40,35 +40,33 @@
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
-}
+} // END - if
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
-if (REQUEST_ISSET_GET(('id'))) {
+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",
+       $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__);
        if (SQL_NUMROWS($result) == 1) {
                // Remove sponsor
-               if (IS_FORM_SENT()) {
+               if (isFormSent()) {
                        // Load data and remember it in constants
-                       list($email, $gender, $surname, $family) = SQL_FETCHROW($result);
-
-                       // Free result
-                       SQL_FREERESULT($result);
+                       $DATA = SQL_FETCHARRAY($result);
 
-                       define('__EMAIL'  , $email);
-                       define('__GENDER'  , TRANSLATE_GENDER($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')));
-                       SEND_EMAIL($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",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE `id`='%s' LIMIT 1",
                                array(bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
 
                        // Remove orders
@@ -77,18 +75,19 @@ if (REQUEST_ISSET_GET(('id'))) {
 
                        // Output message
                        LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_SPONSOR_DELETED'), bigintval(REQUEST_GET('id'))));
-               } elseif (REQUEST_ISSET_POST(('no'))) {
+               } elseif (REQUEST_ISSET_POST('no')) {
                        // Do not delete him...
-                       LOAD_URL('modules.php?module=admin&what=list_sponsor&id='.bigintval(REQUEST_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', TRANSLATE_GENDER($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'));