Naming convention applied to language strings, new API function added:

[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 a4b6ac2946cd9a5eaab7a4148125888179a2ec95..b7e6b0b95b9574b59d5e349e953295f7605ac1ed 100644 (file)
--- a/inc/modules/admin/what-del_sponsor.php
+++ b/inc/modules/admin/what-del_sponsor.php
@@ -47,7 +47,7 @@ addMenuDescription('admin', __FILE__);
 
 if (isGetRequestParameterSet('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 `id`, `email`, `gender`, `surname`, `family` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `id`=%s LIMIT 1",
                array(bigintval(getRequestParameter('id'))), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Remove sponsor
@@ -56,19 +56,18 @@ if (isGetRequestParameterSet('id')) {
                        $content = SQL_FETCHARRAY($result);
 
                        // Prepare data for the template
-                       $content['gender']  = translateGender($content['gender']);
                        $content['reason']  = secureString(postRequestParameter('reason'));
 
                        // Prepare message and send it away
                        $message = loadEmailTemplate('del_sponsor', $content, bigintval(getRequestParameter('id')));
-                       sendEmail($content['email'], getMessage('ADMIN_SPONSOR_DEL_SUBJECT'), $message);
+                       sendEmail($content['email'], '{--ADMIN_SPONSOR_DELETE_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(getRequestParameter('id'))), __FILE__, __LINE__);
 
                        // Remove orders
-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_sponsor_orders` WHERE `sponsorid`='%s' LIMIT 1",
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_sponsor_orders` WHERE `sponsor_id`='%s' LIMIT 1",
                                array(bigintval(getRequestParameter('id'))), __FILE__, __LINE__);
 
                        // Output message
@@ -96,7 +95,7 @@ if (isGetRequestParameterSet('id')) {
        SQL_FREERESULT($result);
 } else {
        // Not called by what-list_sponsor.php
-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_CALL_NOT_DIRECTLY'));
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_CALL_NOT_DIRECTLY--}');
 }
 
 // [EOF]