Renamed function so it might be more understandable

[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 d91a05ba8d8c5954a08bd3ce5503d04704875075..139ab263b6d03c619f239471ddb1e6b27570d94b 100644 (file)
--- a/inc/modules/admin/what-unlock_sponsor.php
+++ b/inc/modules/admin/what-unlock_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                    *
@@ -43,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Check if admin has submitted form
 if (isFormSent()) {
@@ -59,23 +57,29 @@ 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`,
+       (`points_amount` + `points_used`) AS `points`,
+       `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);
 
                                // 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
@@ -118,6 +122,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 +138,7 @@ SET
        `status`='CONFIRMED'
 WHERE
        `id`=%s AND
-       `status`='PENDING'
+       `status` IN('PENDING','UNCONFIRMED')
 LIMIT 1",
                        array($content['id']), __FILE__, __LINE__);
 
@@ -147,7 +155,7 @@ LIMIT 1",
                                        array(bigintval($content['refid'])), __FILE__, __LINE__);
 
                                // Whas that update fine?
-                               if (SQL_AFFECTEDROWS() == 1) {
+                               if (!SQL_HASZEROAFFECTED()) {
                                        // Load referal's data
                                        $result = SQL_QUERY_ESC("SELECT
        `id`, `gender`, `surname`, `family`, `email`,
@@ -185,11 +193,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' OR `status`='UNCONFIRMED'
+       `status` IN('PENDING','UNCONFIRMED')
 ORDER BY
        `id`", __FILE__, __LINE__);
 
@@ -197,16 +206,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);