A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

[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 801be23db9141cab645536ebd6c3684f623f2f15..d5e8b0fc6506f4789e728b8dd2f179904c11d197 100644 (file)
--- a/inc/modules/admin/what-unlock_sponsor.php
+++ b/inc/modules/admin/what-unlock_sponsor.php
@@ -46,18 +46,21 @@ if (IS_FORM_SENT()) {
        if (SELECTION_COUNT(REQUEST_POST('id')) > 0) {
                // At least one entry selected
                foreach (REQUEST_POST('id') as $id => $selected) {
        if (SELECTION_COUNT(REQUEST_POST('id')) > 0) {
                // At least one entry selected
                foreach (REQUEST_POST('id') as $id => $selected) {

-                       // Secure ID number
-                       $id = bigintval($id);
+                       // Secure ID number and init $content
+                       $content = array(
+                               'id'    => bigintval($id),
+                               'refid' => 0
+                       );

 
                        // Load his personal data
                        $result_main = SQL_QUERY_ESC("SELECT gender, surname, family, email, remote_addr, sponsor_created, points_amount, refid
 FROM `{!_MYSQL_PREFIX!}_sponsor_data`
 WHERE `status`='PENDING' AND id='%s' LIMIT 1",
 
                        // Load his personal data
                        $result_main = SQL_QUERY_ESC("SELECT gender, surname, family, email, remote_addr, sponsor_created, points_amount, refid
 FROM `{!_MYSQL_PREFIX!}_sponsor_data`
 WHERE `status`='PENDING' AND id='%s' LIMIT 1",

-                               array($id), __FILE__, __LINE__);
-                       $refid = 0;
+                               array($content['id']), __FILE__, __LINE__);
+

                        if (SQL_NUMROWS($result_main) == 1) {
                        if (SQL_NUMROWS($result_main) == 1) {

-                               // Load data and free memory
-                               list($gender, $sname, $fname, $email, $ip, $created, $points, $refid) = SQL_FETCHROW($result_main);
+                               // Load data
+                               $content = SQL_FETCHROW($result_main);

 
                                // Check for open payments and close them
                                $result = SQL_QUERY_ESC("SELECT DISTINCT so.aid, so.pay_count, so.pay_ordered, so.pay_status,
 
                                // Check for open payments and close them
                                $result = SQL_QUERY_ESC("SELECT DISTINCT so.aid, so.pay_count, so.pay_ordered, so.pay_status,


@@ -67,32 +70,34 @@ LEFT JOIN `{!_MYSQL_PREFIX!}_sponsor_paytypes` AS sp
 ON sp.id=so.payid
 WHERE so.sponsorid='%s'
 ORDER BY sp.pay_name",
 ON sp.id=so.payid
 WHERE so.sponsorid='%s'
 ORDER BY sp.pay_name",

-                                       array($id), __FILE__, __LINE__);
+                                       array($content['id']), __FILE__, __LINE__);

                                if (SQL_NUMROWS($result) > 0) {
                                        // Payment does exist
                                if (SQL_NUMROWS($result) > 0) {
                                        // Payment does exist

-                                       while (list($aid, $count, $ordered, $status, $pname, $prate, $pcurr) = SQL_FETCHROW($result))
-                                       {
+                                       while ($content2 = SQL_FETCHARRAY($result)) {
+                                               // Merge both arrays
+                                               $content = merge_array($content, $content2);
+

                                                // Set default email
                                                // Set default email

-                                               $email = SPONSOR_NO_ADMIN;
-                                               if ($aid > "0") {
+                                               $content['email'] = getMessage('SPONSOR_NO_ADMIN');
+                                               if ($content['aid'] > "0") {

                                                        // Load admin's email address for contact
                                                        // Load admin's email address for contact

-                                                       $email = GET_ADMIN_EMAIL($aid);
-                                               }
+                                                       $content['email'] = GET_ADMIN_EMAIL($content['aid']);
+                                               } // END - if

 
                                                // Transfer data to array
 
                                                // Transfer data to array

-                                               $content = array(
-                                                       'aid'   => $email,
-                                                       'order' => ($count * $prate)." ".$pcurr,
-                                                       'stamp' => MAKE_DATETIME($ordered, "2"),
-                                                       'pname' => $pname,
+                                               $data = array(
+                                                       'aid'   => $content['email'],
+                                                       'order' => ($content['pay_count'] * $content['pay_rate'])." ".$content['pay_currency'],
+                                                       'stamp' => MAKE_DATETIME($content['pay_ordered'], "2"),
+                                                       'pname' => $content['pay_name'],

                                                );
        
                                                // Load email template
                                                );
        
                                                // Load email template

-                                               $content['msg'] = LOAD_EMAIL_TEMPLATE("sponsor_unlock_sponsor_pay", $content, $id);
+                                               $content['msg'] = LOAD_EMAIL_TEMPLATE("sponsor_unlock_sponsor_pay", $data, $content['id']);

                                        }
                                } else {
                                        // No payments found
                                        }
                                } else {
                                        // No payments found

-                                       $content['msg'] = SPONSOR_NO_PAYMENTS_FOUND;
+                                       $content['msg'] = getMessage('SPONSOR_NO_PAYMENTS_FOUND');

                                }
 
                                // Free memory
                                }
 
                                // Free memory


@@ -105,15 +110,15 @@ ORDER BY sp.pay_name",
                        // Unlock sponsor account
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET `status`='CONFIRMED'
 WHERE id='%s' AND `status`='PENDING' LIMIT 1",
                        // Unlock sponsor account
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data` SET `status`='CONFIRMED'
 WHERE id='%s' AND `status`='PENDING' LIMIT 1",

-                               array($id), __FILE__, __LINE__);
+                               array($content['id']), __FILE__, __LINE__);

 
                        // Update, if applyable, referal count and points
 
                        // Update, if applyable, referal count and points

-                       if (($refid > 0) && ($refid != $id)) {
+                       if (($content['refid'] > 0) && ($content['refid'] != $content['id'])) {

                                // Update referal account
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data`
 SET points_amount=points_amount+%s, ref_count=ref_count+1
 WHERE id='%s' LIMIT 1",
                                // Update referal account
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_sponsor_data`
 SET points_amount=points_amount+%s, ref_count=ref_count+1
 WHERE id='%s' LIMIT 1",

-                                       array(getConfig('sponsor_ref_points'), bigintval($refid)), __FILE__, __LINE__);
+                                       array(getConfig('sponsor_ref_points'), bigintval($content['refid'])), __FILE__, __LINE__);

 
                                // Whas that update fine?
                                if (SQL_AFFECTEDROWS() == 1) {
 
                                // Whas that update fine?
                                if (SQL_AFFECTEDROWS() == 1) {


@@ -122,7 +127,7 @@ WHERE id='%s' LIMIT 1",
 (points_amount - points_used) AS points, receive_warnings, ref_count AS refs
 FROM `{!_MYSQL_PREFIX!}_sponsor_data`
 WHERE id='%s' LIMIT 1",
 (points_amount - points_used) AS points, receive_warnings, ref_count AS refs
 FROM `{!_MYSQL_PREFIX!}_sponsor_data`
 WHERE id='%s' LIMIT 1",

-                                               array(bigintval($refid)), __FILE__, __LINE__);
+                                               array(bigintval($content['refid'])), __FILE__, __LINE__);

                                        $REFERRAL = SQL_FETCHARRAY($result);
 
                                        // Send warnings out?
                                        $REFERRAL = SQL_FETCHARRAY($result);
 
                                        // Send warnings out?


@@ -130,7 +135,7 @@ WHERE id='%s' LIMIT 1",
                                                // Translate some data
                                                $REFERRAL['points']     = TRANSLATE_COMMA($REFERRAL['points']);
                                                $REFERRAL['ref_points'] = TRANSLATE_COMMA(getConfig('sponsor_ref_points'));
                                                // Translate some data
                                                $REFERRAL['points']     = TRANSLATE_COMMA($REFERRAL['points']);
                                                $REFERRAL['ref_points'] = TRANSLATE_COMMA(getConfig('sponsor_ref_points'));

-                                               $REFERRAL['gender']      = TRANSLATE_GENDER($REFERRAL['gender']);
+                                               $REFERRAL['gender']     = TRANSLATE_GENDER($REFERRAL['gender']);

 
                                                // Send notification to referal
                                                $REF_MSG = LOAD_EMAIL_TEMPLATE("sponsor_ref_notify", $REFERRAL);
 
                                                // Send notification to referal
                                                $REF_MSG = LOAD_EMAIL_TEMPLATE("sponsor_ref_notify", $REFERRAL);


@@ -143,15 +148,13 @@ WHERE id='%s' LIMIT 1",
                        }
 
                        // Transfer data to array
                        }
 
                        // Transfer data to array

-                       $content['gender']   = TRANSLATE_GENDER($gender);
-                       $content['surname'] = $sname;
-                       $content['family']  = $fname;
-                       $content['sponsor'] = $id;
-                       $content['points']  = TRANSLATE_COMMA($points);
+                       $content['gender']   = TRANSLATE_GENDER($content['gender']);
+                       $content['sponsor']  = $content['id'];
+                       $content['points']   = TRANSLATE_COMMA($content['points_amount']);

 
                        // So let's send the email away
                        $msg = LOAD_EMAIL_TEMPLATE("sponsor_unlocked", $content);
 
                        // So let's send the email away
                        $msg = LOAD_EMAIL_TEMPLATE("sponsor_unlocked", $content);

-                       SEND_EMAIL($email, getMessage('SPONSOR_UNLOCKED_SUBJ'), $msg);
+                       SEND_EMAIL($content['email'], getMessage('SPONSOR_UNLOCKED_SUBJ'), $msg);

                }
        } else {
                // Nothing selected
                }
        } else {
                // Nothing selected


@@ -175,17 +178,18 @@ ORDER BY
 if (SQL_NUMROWS($result) > 0) {
        // Entries found so let's list them!
        $OUT = ""; $SW = 2;
 if (SQL_NUMROWS($result) > 0) {
        // Entries found so let's list them!
        $OUT = ""; $SW = 2;

-       while (list($id, $gender, $sname, $fname, $email, $ip, $created) = SQL_FETCHROW($result)) {
+       while ($content = SQL_FETCHARRAY($result)) {

                // Transfer data to array
                // Transfer data to array

+               // @TODO Rewritings: remote->remote_addr, created->sponsor_created in template

                $content = array(
                        'sw'      => $SW,
                $content = array(
                        'sw'      => $SW,

-                       'id'      => $id,
-                       'gender'   => TRANSLATE_GENDER($gender),
-                       'surname' => $sname,
-                       'family'  => $fname,
-                       'email'   => "mailto:".$email,
-                       'remote'  => $ip,
-                       'created' => MAKE_DATETIME($created, "2"),
+                       'id'      => $content['id'],
+                       'gender'   => TRANSLATE_GENDER($content['gender']),
+                       'surname' => $content['surname'],
+                       'family'  => $content['family'],
+                       'email'   => "mailto:".$content['email'],
+                       'remote'  => $content['remote_addr'],
+                       'created' => MAKE_DATETIME($content['sponsor_created'], "2"),

                );
 
                // Load row template and switch colors
                );
 
                // Load row template and switch colors