New naming convention applied to many functions, see #118 for details

[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..06b6242446faa0fc5fc50166f1375af8ea66cbf0 100644 (file)
--- a/inc/modules/admin/what-del_sponsor.php
+++ b/inc/modules/admin/what-del_sponsor.php
@@ -45,9 +45,9 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // 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
@@ -59,16 +59,16 @@ if (REQUEST_ISSET_GET(('id'))) {
                        SQL_FREERESULT($result);
 
                        define('__EMAIL'  , $email);
-                       define('__GENDER'  , TRANSLATE_GENDER($gender));
+                       define('__GENDER'  , translateGender($gender));
                        define('__SURNAME', $surname);
                        define('__FAMILY' , $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);
+                       sendEmail($email, getMessage('ADMIN_SPONSOR_DEL_SUBJECT'), $msg);
 
                        // 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
@@ -79,7 +79,7 @@ if (REQUEST_ISSET_GET(('id'))) {
                        LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_SPONSOR_DELETED'), bigintval(REQUEST_GET('id'))));
                } 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);
@@ -88,7 +88,7 @@ if (REQUEST_ISSET_GET(('id'))) {
                        define('__EMAIL' , $email);
                        define('__SNAME' , $sname);
                        define('__FNAME' , $fname);
-                       define('__GENDER', TRANSLATE_GENDER($gender));
+                       define('__GENDER', translateGender($gender));
                        define('__UID'   , bigintval(REQUEST_GET('id')));
 
                        // Display form