Code cleanup, more usage of API functions

[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 1e9ff87d4fe17bca25e94cf6040dbbca3a78f879..70ee8d05e06377e1482806ff9c32a7bb38a740ce 100644 (file)
--- a/inc/modules/admin/what-list_sponsor.php
+++ b/inc/modules/admin/what-list_sponsor.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -50,7 +48,11 @@ if (isGetRequestParameterSet('id')) {
        $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`,
+       `status`,
+       UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`,
+       UNIX_TIMESTAMP(`last_online`) AS `last_online`,
+       UNIX_TIMESTAMP(`last_change`) AS `last_change`,
+       `receive_warnings`,
        `points_amount`, `points_used`, `remote_addr`, `warning_interval`, `refid`, `ref_count`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
@@ -61,24 +63,23 @@ WHERE
        if (SQL_NUMROWS($result) == 1) {
                // Load sponsor details
                $content = SQL_FETCHARRAY($result);
-               SQL_FREERESULT($result);
 
                // Check if an entry is empty
                foreach ($content as $k => $v) {
-                       if (empty($v)) $content[$k] = '---';
+                       if ((empty($v)) && ($v != 0)) $content[$k] = '---';
                } // END - foreach
 
                // Prepare all data for the template
                //  Sponsor's id
-               $content['id']          = getRequestParameter('id');
+               $content['id']              = getRequestParameter('id');
                //  Contact data
-               $content['email_link']  = generateEmailLink($content['email'], 'sponsor_data');
+               $content['email_link']      = generateEmailLink($content['email'], 'sponsor_data');
                //  Timestamps
                $content['sponsor_created'] = generateDateTime($content['sponsor_created'], 2);
                $content['last_online']     = generateDateTime($content['last_online'], 2);
                $content['last_change']     = generateDateTime($content['last_change'], 2);
                //  Orders total
-               $content['orders']      = countSumTotalData(bigintval(getRequestParameter('id')), 'sponsor_orders', 'id', 'sponsorid', true);
+               $content['orders']          = countSumTotalData(bigintval(getRequestParameter('id')), 'sponsor_orders', 'id', 'sponsor_id', true);
 
                // Load template
                loadTemplate('admin_list_sponsor_details', false, $content);
@@ -86,9 +87,12 @@ WHERE
                // Sponsor not found
                loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_404', bigintval(getRequestParameter('id'))));
        }
+
+       // Free result
+       SQL_FREERESULT($result);
 } elseif (isGetRequestParameterSet('refid')) {
        // 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(getRequestParameter('refid'))), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Free memory
@@ -97,7 +101,9 @@ WHERE
                // Sponsor found so let's list all his referals
                $result = SQL_QUERY_ESC("SELECT
        `id`, `gender`, `surname`, `family`, `email`, `status`,
-       `sponsor_created`, `last_online`, `points_amount`, `points_used`,
+       UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`,
+       UNIX_TIMESTAMP(`last_online`) AS `last_online`,
+       `points_amount`, `points_used`,
        `remote_addr`, `ref_count`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
@@ -123,7 +129,11 @@ ORDER BY
        // List all sponsors
        $result_main = SQL_QUERY("SELECT
        `id`, `gender`, `surname`, `family`, `email`, `status`,
-       `sponsor_created`, `last_online`, `points_amount`, `points_used`, `remote_addr`
+       UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`,
+       UNIX_TIMESTAMP(`last_online`) AS `last_online`,
+       `points_amount`, `points_used`,
+       (`points_amount` + `points_used`) AS `points`,
+       `remote_addr`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
 ORDER BY
@@ -134,18 +144,9 @@ ORDER BY
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result_main)) {
                        // Transfer data to array
-                       $content = array(
-                               'id'              => $content['id'],
-                               'gender'          => $content['gender'],
-                               'surname'         => $content['surname'],
-                               'family'          => $content['family'],
-                               'email'           => generateEmailLink($content['email'], 'sponsor_data'),
-                               'status'          => $content['status'],
-                               'sponsor_created' => generateDateTime($content['sponsor_created'], 2),
-                               'last_online'     => generateDateTime($content['last_online'], 2),
-                               'points'          => ($content['points_amount'] - $content['points_used']),
-                               'remote_addr'     => $content['remote_addr'],
-                       );
+                       $content['email']           = generateEmailLink($content['email'], 'sponsor_data');
+                       $content['sponsor_created'] = generateDateTime($content['sponsor_created'], 2);
+                       $content['last_online']     = generateDateTime($content['last_online'], 2);
 
                        // Load row template
                        $OUT .= loadTemplate('admin_list_sponsor_row', true, $content);