No more required

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

diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php
index 5fde9c55716ff78d64781184eecdb0e2261f78d8..b750fae98e866655c817c60ad9ca438c08717763 100644 (file)
--- a/inc/modules/admin/what-unlock_sponsor.php
+++ b/inc/modules/admin/what-unlock_sponsor.php
@@ -59,31 +59,38 @@ if (isFormSent()) {
 
                        // Load his personal data
                        $result_main = SQL_QUERY_ESC("SELECT
-       `gender`, `surname`, `family`, `email`, `remote_addr`, `sponsor_created`, `points_amount`, `refid`
+       `id`, `gender`, `surname`, `family`, `email`, `remote_addr`,
+       UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`,
+       `points_amount`, `points_used`, `refid`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE
-       `status`='PENDING' AND
+       `status` IN('PENDING','UNCONFIRMED') AND
        `id`=%s
 LIMIT 1",
                        array($content['id']), __FILE__, __LINE__);
 
+                       /// Is there an entry?
                        if (SQL_NUMROWS($result_main) == 1) {
                                // Load data
                                $content = SQL_FETCHARRAY($result_main);
 
+                               // Add total amount
+                               $content['points'] = ($content['points_amount'] - $content['points_used']);
+
                                // Check for open payments and close them
                                $result = SQL_QUERY_ESC("SELECT
-       so.admin_id, so.pay_count, so.pay_ordered, so.pay_status,
-       sp.pay_name, sp.pay_rate, sp.pay_currency
+       so.admin_id, so.pay_count,
+       UNIX_TIMESTAMP(so.pay_ordered) AS `pay_ordered`,
+       so.pay_status, sp.pay_name, sp.pay_rate, sp.pay_currency
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_orders` AS so
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_sponsor_paytypes` AS sp
 ON
-       sp.id=so.payid
+       sp.id=so.payment_id
 WHERE
-       so.sponsorid='%s'
+       so.sponsor_id=%s
 ORDER BY
        sp.pay_name ASC",
                                        array($content['id']), __FILE__, __LINE__);
@@ -118,6 +125,10 @@ ORDER BY
 
                                // Free memory
                                SQL_FREERESULT($result);
+                       } else {
+                               // Not found
+                               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_SPONSOR_ACCOUNT_404_ALREADY_CONFIRMED', $content['id']));
+                               return;
                        }
 
                        // Free memory
@@ -130,7 +141,7 @@ SET
        `status`='CONFIRMED'
 WHERE
        `id`=%s AND
-       `status`='PENDING'
+       `status` IN('PENDING','UNCONFIRMED')
 LIMIT 1",
                        array($content['id']), __FILE__, __LINE__);
 
@@ -173,9 +184,6 @@ LIMIT 1",
                                } // END - if
                        } // END - if
 
-                       // Transfer data to array
-                       $content['points']   = translateComma($content['points_amount']);
-
                        // So let's send the email away
                        $message = loadEmailTemplate('sponsor_unlocked', $content);
                        sendEmail($content['email'], '{--SPONSOR_UNLOCKED_SUBJECT--}', $message);
@@ -188,11 +196,12 @@ LIMIT 1",
 
 // Begin listing of all pending sponsor accounts
 $result = SQL_QUERY("SELECT
-       `id`, `gender`, `surname`, `family`, `email`, `remote_addr`, `sponsor_created`
+       `id`, `gender`, `surname`, `family`, `email`, `remote_addr`,
+       UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE
-       `status`='PENDING'
+       `status` IN('PENDING','UNCONFIRMED')
 ORDER BY
        `id`", __FILE__, __LINE__);
 
@@ -200,16 +209,8 @@ if (!SQL_HASZERONUMS($result)) {
        // Entries found so let's list them!
        $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
-               // Transfer data to array
-               $content = array(
-                       'id'              => $content['id'],
-                       'gender'          => $content['gender'],
-                       'surname'         => $content['surname'],
-                       'family'          => $content['family'],
-                       'email'           => generateEmailLink($content['email'], 'sponsor_data'),
-                       'remote_addr'     => $content['remote_addr'],
-                       'sponsor_created' => generateDateTime($content['sponsor_created'], 2),
-               );
+               // Translate some data
+               $content['sponsor_created'] = generateDateTime($content['sponsor_created'], 2);
 
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_unlock_sponsor_row', true, $content);