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

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

diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php
index 9bbaf602b7ffa6693de1830376226124c0748ecc..af15d3b2dbcecb40fc065e625844e35770b7da5d 100644 (file)
--- a/inc/modules/admin/what-list_sponsor.php
+++ b/inc/modules/admin/what-list_sponsor.php
@@ -45,11 +45,11 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
-if (REQUEST_ISSET_GET(('id'))) {
+if (REQUEST_ISSET_GET('id')) {
        // Show detailed informations to a sponsor
        $result = SQL_QUERY_ESC("SELECT company, position, gender, surname, family, street_nr1, street_nr2, zip, city, country, phone, fax, cell, email, url, tax_ident, status, sponsor_created, last_online, last_change, receive_warnings, points_amount, points_used, remote_addr, warning_interval, refid, ref_count
 FROM `{!_MYSQL_PREFIX!}_sponsor_data`
-WHERE id='%s' LIMIT 1",
+WHERE `id`='%s' LIMIT 1",
  array(bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result) == 1) {
@@ -78,7 +78,7 @@ WHERE id='%s' LIMIT 1",
                define('__SPONSOR_POSITION'   , $DATA['position']);
                define('__SPONSOR_TAX_IDENT'  , $DATA['tax_ident']);
                //  Personal data
-               define('__SPONSOR_GENDER'      , TRANSLATE_GENDER($DATA['gender']));
+               define('__SPONSOR_GENDER'      , translateGender($DATA['gender']));
                define('__SPONSOR_SURNAME'    , $DATA['surname']);
                define('__SPONSOR_FAMILY'     , $DATA['family']);
                define('__SPONSOR_STREET1'    , $DATA['street_nr1']);
@@ -94,19 +94,19 @@ WHERE id='%s' LIMIT 1",
                define('__SPONSOR_EMAIL_VALUE', $DATA['email']);
                define('__SPONSOR_URL'        , DEREFERER($DATA['url']));
                //  Timestamps
-               define('__SPONSOR_CREATED'    , MAKE_DATETIME($DATA['sponsor_created'], "2"));
-               define('__SPONSOR_LAST_ONLINE', MAKE_DATETIME($DATA['last_online'], "2"));
-               define('__SPONSOR_LAST_CHANGE', MAKE_DATETIME($DATA['last_change'], "2"));
+               define('__SPONSOR_CREATED'    , generateDateTime($DATA['sponsor_created'], "2"));
+               define('__SPONSOR_LAST_ONLINE', generateDateTime($DATA['last_online'], "2"));
+               define('__SPONSOR_LAST_CHANGE', generateDateTime($DATA['last_change'], "2"));
                //  Sponsor points
-               define('__SPONSOR_AMOUNT'     , TRANSLATE_COMMA($DATA['points_amount']));
-               define('__SPONSOR_USED'       , TRANSLATE_COMMA($DATA['points_used']));
+               define('__SPONSOR_AMOUNT'     , translateComma($DATA['points_amount']));
+               define('__SPONSOR_USED'       , translateComma($DATA['points_used']));
                //  Warning because low points
-               define('__SPONSOR_REC_WARNING', TRANSLATE_YESNO($DATA['receive_warnings']));
-               define('__SPONSOR_INTERVAL'   , CREATE_FANCY_TIME($DATA['warning_interval']));
+               define('__SPONSOR_REC_WARNING', translateYesNo($DATA['receive_warnings']));
+               define('__SPONSOR_INTERVAL'   , createFancyTime($DATA['warning_interval']));
                //  Orders total
                define('__SPONSOR_ORDERS'     , $orders);
                //  Other data
-               define('__SPONSOR_STATUS'     , SPONSOR_TRANSLATE_STATUS($DATA['status']));
+               define('__SPONSOR_STATUS'     , sponsorTranslateUserStatus($DATA['status']));
                define('__SPONSOR_REFID'      , $DATA['refid']);
                define('__SPONSOR_REMOTE_ADR' , $DATA['remote_addr']);
                define('__SPONSOR_REFS'       , $DATA['ref_count']);
@@ -119,7 +119,7 @@ WHERE id='%s' LIMIT 1",
        }
 } elseif (REQUEST_ISSET_GET(('rid'))) {
        // Search for sponsor
-       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE id='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE `id`='%s' LIMIT 1",
         array(bigintval(REQUEST_GET('rid'))), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Free memory
@@ -156,14 +156,14 @@ FROM `{!_MYSQL_PREFIX!}_sponsor_data` ORDER BY `id`", __FILE__, __LINE__);
                        $content = array(
                                'id'      => $content['id'],
                                'sw'      => $SW,
-                               'gender'  => TRANSLATE_GENDER($content['gender']),
+                               'gender'  => translateGender($content['gender']),
                                'sname'   => $content['surname'],
                                'fname'   => $content['family'],
                                'email'   => "mailto:".$content['email'],
-                               'status'  => SPONSOR_TRANSLATE_STATUS($content['status']),
-                               'created' => MAKE_DATETIME($content['sponsor_created'], "2"),
-                               'last'    => MAKE_DATETIME($content['last_online'], "2"),
-                               'points'  => TRANSLATE_COMMA($content['points_amount'] - $content['points_used']),
+                               'status'  => sponsorTranslateUserStatus($content['status']),
+                               'created' => generateDateTime($content['sponsor_created'], "2"),
+                               'last'    => generateDateTime($content['last_online'], "2"),
+                               'points'  => translateComma($content['points_amount'] - $content['points_used']),
                                'ip'      => $content['remote_addr'],
                        );