New naming convention applied to many functions, see #118 for details

[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 e0ee294b52e034d9887e6b9b895182eb536bde7a..e6e6866993d369deba3747d1cba97e46ceca321d 100644 (file)
--- a/inc/modules/admin/what-unlock_sponsor.php
+++ b/inc/modules/admin/what-unlock_sponsor.php
@@ -48,7 +48,7 @@ ADD_DESCR('admin', __FILE__);
 // Check if admin has submitted form
 if (IS_FORM_SENT()) {
        // Does he have selected at least one sponsor?
-       if (SELECTION_COUNT(REQUEST_POST('id')) > 0) {
+       if (countSelection(REQUEST_POST('id')) > 0) {
                // At least one entry selected
                foreach (REQUEST_POST('id') as $id => $selected) {
                        // Secure ID number and init $content
@@ -84,16 +84,16 @@ ORDER BY sp.pay_name",
 
                                                // Set default email
                                                $content['email'] = getMessage('SPONSOR_NO_ADMIN');
-                                               if ($content['aid'] > "0") {
+                                               if ($content['aid'] > '0') {
                                                        // Load admin's email address for contact
-                                                       $content['email'] = GET_ADMIN_EMAIL($content['aid']);
+                                                       $content['email'] = getAdminEmail($content['aid']);
                                                } // END - if
 
                                                // Transfer data to array
                                                $data = array(
                                                        'aid'   => $content['email'],
                                                        'order' => ($content['pay_count'] * $content['pay_rate'])." ".$content['pay_currency'],
-                                                       'stamp' => MAKE_DATETIME($content['pay_ordered'], "2"),
+                                                       'stamp' => generateDateTime($content['pay_ordered'], "2"),
                                                        'pname' => $content['pay_name'],
                                                );
        
@@ -114,7 +114,7 @@ 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",
+WHERE `id`='%s' AND `status`='PENDING' LIMIT 1",
                                array($content['id']), __FILE__, __LINE__);
 
                        // Update, if applyable, referal count and points
@@ -122,7 +122,7 @@ WHERE id='%s' AND `status`='PENDING' 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",
+WHERE `id`='%s' LIMIT 1",
                                        array(getConfig('sponsor_ref_points'), bigintval($content['refid'])), __FILE__, __LINE__);
 
                                // Whas that update fine?
@@ -131,20 +131,20 @@ WHERE id='%s' LIMIT 1",
                                        $result = SQL_QUERY_ESC("SELECT id, gender, surname, family, email,
 (points_amount - points_used) AS points, receive_warnings, ref_count AS refs
 FROM `{!_MYSQL_PREFIX!}_sponsor_data`
-WHERE id='%s' LIMIT 1",
+WHERE `id`='%s' LIMIT 1",
                                                array(bigintval($content['refid'])), __FILE__, __LINE__);
                                        $REFERRAL = SQL_FETCHARRAY($result);
 
                                        // Send warnings out?
                                        if ($REFERRAL['receive_warnings'] == 'Y') {
                                                // 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['points']     = translateComma($REFERRAL['points']);
+                                               $REFERRAL['ref_points'] = translateComma(getConfig('sponsor_ref_points'));
+                                               $REFERRAL['gender']     = translateGender($REFERRAL['gender']);
 
                                                // Send notification to referal
                                                $REF_MSG = LOAD_EMAIL_TEMPLATE("sponsor_ref_notify", $REFERRAL);
-                                               SEND_EMAIL($REFERRAL['email'], getMessage('SPONSOR_REF_NOTIFY_SUBJ'), $REF_MSG);
+                                               sendEmail($REFERRAL['email'], getMessage('SPONSOR_REF_NOTIFY_SUBJ'), $REF_MSG);
                                        }
 
                                        // Free memory
@@ -153,13 +153,13 @@ WHERE id='%s' LIMIT 1",
                        }
 
                        // Transfer data to array
-                       $content['gender']   = TRANSLATE_GENDER($content['gender']);
+                       $content['gender']   = translateGender($content['gender']);
                        $content['sponsor']  = $content['id'];
-                       $content['points']   = TRANSLATE_COMMA($content['points_amount']);
+                       $content['points']   = translateComma($content['points_amount']);
 
                        // So let's send the email away
                        $msg = LOAD_EMAIL_TEMPLATE("sponsor_unlocked", $content);
-                       SEND_EMAIL($content['email'], getMessage('SPONSOR_UNLOCKED_SUBJ'), $msg);
+                       sendEmail($content['email'], getMessage('SPONSOR_UNLOCKED_SUBJ'), $msg);
                }
        } else {
                // Nothing selected
@@ -189,12 +189,12 @@ if (SQL_NUMROWS($result) > 0) {
                $content = array(
                        'sw'      => $SW,
                        'id'      => $content['id'],
-                       'gender'   => TRANSLATE_GENDER($content['gender']),
+                       'gender'   => translateGender($content['gender']),
                        'surname' => $content['surname'],
                        'family'  => $content['family'],
                        'email'   => "mailto:".$content['email'],
                        'remote'  => $content['remote_addr'],
-                       'created' => MAKE_DATETIME($content['sponsor_created'], "2"),
+                       'created' => generateDateTime($content['sponsor_created'], "2"),
                );
 
                // Load row template and switch colors