A lot code rewritten:

[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 d25521cfe985c42610d529db90ff3c53bb0974ee..06d20c510f98cfa790f06175b321280fb2465e49 100644 (file)
--- a/inc/modules/admin/what-unlock_sponsor.php
+++ b/inc/modules/admin/what-unlock_sponsor.php
@@ -94,7 +94,7 @@ ORDER BY
                                                $content = merge_array($content, $content2);
 
                                                // Set default email
-                                               $content['email'] = getMessage('SPONSOR_NO_ADMIN');
+                                               $content['email'] = '{--SPONSOR_NO_ADMIN--}';
                                                if ($content['admin_id'] > 0) {
                                                        // Load admin's email address for contact
                                                        $content['email'] = getAdminEmail($content['admin_id']);
@@ -113,7 +113,7 @@ ORDER BY
                                        }
                                } else {
                                        // No payments found
-                                       $content['message'] = getMessage('SPONSOR_NO_PAYMENTS_FOUND');
+                                       $content['message'] = '{--SPONSOR_NO_PAYMENTS_FOUND--}';
                                }
 
                                // Free memory
@@ -135,7 +135,7 @@ LIMIT 1",
                        array($content['id']), __FILE__, __LINE__);
 
                        // Update, if applyable, referal count and points
-                       if (($content['refid'] > 0) && ($content['refid'] != $content['id'])) {
+                       if ((isValidUserId($content['refid'])) && ($content['refid'] != $content['id'])) {
                                // Update referal account
                                SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_sponsor_data`
@@ -165,7 +165,7 @@ LIMIT 1",
                                        if ($REFERAL['receive_warnings'] == 'Y') {
                                                // Send notification to referal
                                                $REF_MSG = loadEmailTemplate('sponsor_ref_notify', $REFERAL);
-                                               sendEmail($REFERAL['email'], getMessage('SPONSOR_REF_NOTIFY_SUBJ'), $REF_MSG);
+                                               sendEmail($REFERAL['email'], '{--SPONSOR_REF_NOTIFY_SUBJECT--}', $REF_MSG);
                                        } // END - if
 
                                        // Free memory
@@ -178,11 +178,11 @@ LIMIT 1",
 
                        // So let's send the email away
                        $message = loadEmailTemplate('sponsor_unlocked', $content);
-                       sendEmail($content['email'], getMessage('SPONSOR_UNLOCKED_SUBJ'), $message);
+                       sendEmail($content['email'], '{--SPONSOR_UNLOCKED_SUBJECT--}', $message);
                } // END - foreach
        } else {
                // Nothing selected
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SPONSOR_NONE_SELECTED_UNLOCK'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_SPONSOR_NONE_SELECTED_UNLOCK--}');
        }
 } // END - if
 
@@ -198,31 +198,28 @@ ORDER BY
 
 if (SQL_NUMROWS($result) > 0) {
        // Entries found so let's list them!
-       $OUT = ''; $SW = 2;
+       $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
                // Transfer data to array
-               // @TODO Rewritings: remote->remote_addr, created->sponsor_created in template
                $content = array(
-                       'sw'      => $SW,
-                       'id'      => $content['id'],
-                       'gender'   => translateGender($content['gender']),
-                       'surname' => $content['surname'],
-                       'family'  => $content['family'],
-                       'email'   => generateEmailLink($content['email'], 'sponsor_data'),
-                       'remote'  => $content['remote_addr'],
-                       'created' => generateDateTime($content['sponsor_created'], 2),
+                       '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),
                );
 
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_unlock_sponsor_row', true, $content);
-               $SW = 3 - $SW;
        } // END - while
 
        // Load template
        loadTemplate('admin_unlock_sponsor', false, $OUT);
 } else {
        // No pending accounts found
-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SPONSOR_NONE_PENDING'));
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_SPONSOR_NONE_PENDING--}');
 }
 
 // Free memory