]> git.mxchange.org Git - mailer.git/blobdiff - inc/pool/pool-user.php
New debugging function debugOutput() introduced, some rewrites to EL:
[mailer.git] / inc / pool / pool-user.php
index 1abf8a079befa926fe1ef1d5814885b319fe5a38..d51453f469f79379b1023cfeb44dfe94ed1a23d2 100644 (file)
@@ -93,15 +93,15 @@ if (SQL_NUMROWS($result_main) > 0) {
                        // We can now send mails to them...
                        foreach ($receiverS as $key => $userid) {
                                // Lookup user id
-                               //* DEBUG: */ outputHtml("*L:".__LINE__.'/'.SQL_NUMROWS($result_user)."*<br />");
+                               //* DEBUG: */ debugOutput('*L:'.__LINE__.'/'.SQL_NUMROWS($result_user).'*');
                                if (fetchUserData($userid)) {
                                        // Do we have a stats entry?
                                        $result_stats = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s AND `userid`=%s AND timestamp_ordered='%s' LIMIT 1",
                                                array($DATA['id'], $DATA['sender'], $DATA['timestamp']), __FILE__, __LINE__);
 
                                        // If there's no stats entry add it!
-                                       //* DEBUG: */ outputHtml("!L:".__LINE__.'/'.SQL_NUMROWS($result_stats)."!<br />");
-                                       if (SQL_NUMROWS($result_stats) == '0') {
+                                       //* DEBUG: */ debugOutput('!L:'.__LINE__.'/'.SQL_NUMROWS($result_stats).'!');
+                                       if (SQL_NUMROWS($result_stats) == 0) {
                                                // No entry was found, so we add him!
                                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_stats` (`pool_id` , `userid`, `cat_id`, `payment_id`, `subject`, `url` , `max_rec` , `timestamp_ordered`, `timestamp_sstart`) VALUES ('%s','%s','%s','%s','%s','%s','%s','%s' , UNIX_TIMESTAMP())",
                                                        array(bigintval($DATA['id']), bigintval($DATA['sender']), bigintval($DATA['cat_id']), bigintval($DATA['payment_id']), $DATA['subject'], $DATA['url'], $DATA['target_send'], bigintval($DATA['timestamp'])), __FILE__, __LINE__);
@@ -111,20 +111,17 @@ if (SQL_NUMROWS($result_main) > 0) {
                                                        array(bigintval($DATA['id']), bigintval($DATA['sender']), bigintval($DATA['timestamp'])), __FILE__, __LINE__);
                                        } // END - if
 
-                                       //* DEBUG: */ outputHtml("!L:".__LINE__.'/'.SQL_NUMROWS($result_stats)."!<br />");
+                                       //* DEBUG: */ debugOutput('!L:'.__LINE__.'/'.SQL_NUMROWS($result_stats).'!');
                                        if (SQL_NUMROWS($result_stats) == 1) {
                                                // We got one!
                                                list($stats_id) = SQL_FETCHROW($result_stats);
 
                                                // Mark this user as "spammed" ;-) And place a line for him...
-                                               //* DEBUG: */ outputHtml("?L:".__LINE__.'/'.$dummy.'/'.$key.'/'.$userid.'('.['sender'].")/".$DATA['id'].'/'.$stats_id."?<br />");
+                                               //* DEBUG: */ debugOutput('?L:'.__LINE__.'/'.$dummy.'/'.$key.'/'.$userid.'('.['sender'].')/'.$DATA['id'].'/'.$stats_id.'?');
                                                switch (removeReceiver($dummy, $key, bigintval($userid), bigintval($DATA['id']), bigintval($stats_id))) {
                                                        case 'done':
                                                                // Prepare the mail
                                                                $DATA['stats_id'] = bigintval($stats_id);
-                                                               $DATA['surname']  = getUserData('surname');
-                                                               $DATA['family']   = getUserData('family');
-                                                               $DATA['gender']   = translateGender(getUserData('gender'));
 
                                                                // Replace text variables
                                                                foreach ($GLOBALS['replacer'] as $key => $value) {
@@ -132,18 +129,11 @@ if (SQL_NUMROWS($result_main) > 0) {
                                                                } // END - if
 
                                                                // Prepare content
-                                                               $content = array(
-                                                                       'id'            => $DATA['stats_id'],
-                                                                       'url'           => $DATA['url'],
-                                                                       'sender_userid' => $DATA['sender'],
-                                                                       'category'      => getCategory($DATA['cat_id']),
-                                                                       'time'          => createFancyTime(getPaymentPoints($DATA['payment_id'], 'time')),
-                                                                       'points'        => translateComma(getPaymentPoints($DATA['payment_id'], 'payment')),
-                                                                       'text'          => $DATA['text']
-                                                               );
+                                                               $DATA['time']   = getPaymentPoints($DATA['payment_id'], 'time');
+                                                               $DATA['points'] = getPaymentPoints($DATA['payment_id'], 'payment');
 
                                                                // Load message template
-                                                               $mailText = loadEmailTemplate('normal-mail', $content, bigintval($userid));
+                                                               $mailText = loadEmailTemplate('normal-mail', $DATA, bigintval($userid));
 
                                                                // Send mail away
                                                                sendEmail(getUserData('email'), $DATA['subject'], $mailText, $HTML);
@@ -152,34 +142,34 @@ if (SQL_NUMROWS($result_main) > 0) {
                                                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET emails_sent=emails_sent+1 WHERE `userid`=%s LIMIT 1",
                                                                        array(bigintval($DATA['sender'])), __FILE__, __LINE__);
 
-                                                               if (getExtensionVersion('user') >= '0.1.4') {
+                                                               if (isExtensionInstalledAndNewer('user', '0.1.4')) {
                                                                        // Update mails received for receiver
                                                                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `emails_received`=`emails_received`+1 WHERE `userid`=%s LIMIT 1",
                                                                                array(bigintval($userid)), __FILE__, __LINE__);
                                                                } // END - if
 
                                                                // Update mediadata if version is 0.0.4 or higher
-                                                               if (getExtensionVersion('mediadata') >= '0.0.4') {
+                                                               if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
                                                                        // Update entry (or add missing)
-                                                                       //* DEBUG: */ outputHtml("*MEDIA/L:".__LINE__."*<br />");
+                                                                       //* DEBUG: */ debugOutput('*MEDIA/L:'.__LINE__.'*');
                                                                        updateMediadataEntry(array('total_send', 'normal_send'), 'add', 1);
                                                                } // END - if
 
                                                                // And count up the mail
                                                                $GLOBALS['pool_cnt']++;
-                                                               //* DEBUG: */ outputHtml("*EXIT/L:".__LINE__.'/'.$GLOBALS['pool_cnt']."*<br />");
+                                                               //* DEBUG: */ debugOutput('*EXIT/L:'.__LINE__.'/'.$GLOBALS['pool_cnt'].'*');
                                                                break;
 
                                                        case 'already':
                                                                // Entry already found, but we still count one up!
                                                                $GLOBALS['pool_cnt']++;
-                                                               //* DEBUG: */ outputHtml("*EXIT/L:".__LINE__.'/'.$GLOBALS['pool_cnt']."<br />");
+                                                               //* DEBUG: */ debugOutput('*EXIT/L:'.__LINE__.'/'.$GLOBALS['pool_cnt']);
                                                                break;
                                                }
                                        }
 
                                        // Do we have reached the maximum to send mails? || (getConfig('max_send') >= $GLOBALS['pool_cnt'])
-                                       //* DEBUG: */ outputHtml("*L:".__LINE__.'/'.$GLOBALS['pool_cnt'].">=".$DATA['target_send'].'/'.getConfig('max_send').">=".$GLOBALS['pool_cnt'].'/'.$lastSentId."!=".$DATA['id']."*<br />");
+                                       //* DEBUG: */ debugOutput('*L:'.__LINE__.'/'.$GLOBALS['pool_cnt'].'>='.$DATA['target_send'].'/'.getConfig('max_send').'>='.$GLOBALS['pool_cnt'].'/'.$lastSentId.'!='.$DATA['id'].'*');
                                        if ((($GLOBALS['pool_cnt'] >= $DATA['target_send'])) && ($lastSentId != $DATA['id'])) {
                                                // Prepare content
                                                $content = array(
@@ -214,13 +204,13 @@ if (SQL_NUMROWS($result_main) > 0) {
                                                $cnt2 += $GLOBALS['pool_cnt'];
 
                                                // Update mediadata if version is 0.0.4 or higher
-                                               if (getExtensionVersion('mediadata') >= '0.0.4') {
+                                               if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
                                                        // Update entry (or add missing)
-                                                       //* DEBUG: */ outputHtml("*MEDIA/L:".__LINE__."*<br />");
+                                                       //* DEBUG: */ debugOutput('*MEDIA/L:'.__LINE__.'*');
                                                        updateMediadataEntry(array('total_orders', 'normal_orders'), 'add', 1);
                                                } // END - if
 
-                                               //* DEBUG: */ outputHtml("*EXIT/L:".__LINE__.'/'.$P."<br />");
+                                               //* DEBUG: */ debugOutput('*EXIT/L:'.__LINE__.'/'.$P);
                                                break;
                                        }
                                        // Do we have send maximum mails?
@@ -228,10 +218,13 @@ if (SQL_NUMROWS($result_main) > 0) {
                                                // There are some mails left to send for next round, so we reset the status back to NEW (=still not fully delivered)
                                                $add = '';
                                                if ($GLOBALS['pool_cnt'] <= $DATA['target_send']) $add = ", target_send=target_send-".$GLOBALS['pool_cnt'];
-                                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='NEW', receivers='%s'".$add." WHERE `id`=%s LIMIT 1",
-                                                       array(implode(';', $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
+                                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='NEW', receivers='%s'" . $add . " WHERE `id`=%s LIMIT 1",
+                                                       array(
+                                                               implode(';', $dummy),
+                                                               bigintval($DATA['id'])
+                                                       ), __FILE__, __LINE__);
 
-                                               //* DEBUG: */ outputHtml("*EXIT/L:".__LINE__."*<br />");
+                                               //* DEBUG: */ debugOutput('*EXIT/L:'.__LINE__.'*');
                                                break;
                                        }
 
@@ -265,9 +258,9 @@ if (SQL_NUMROWS($result_main) > 0) {
                                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `receivers`='%s' WHERE `id`=%s LIMIT 1",
                                                array(implode(';', $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
                                }
-                       }
-               }
-       }
+                       } // END - foreach
+               } // END - if
+       } // END - while
 
        // Do we have points to "pay back"?
        if ((count($pointsBack) > 0) && (!empty($pointsBack[0]))) {
@@ -277,7 +270,7 @@ if (SQL_NUMROWS($result_main) > 0) {
                        if (($PB > 0) && ($userid > 0)) {
                                // Prepare content
                                $content = array(
-                                       'points' => translateComma($PB)
+                                       'points' => $PB
                                );
 
                                // We have to pay back some points to the sender (we add them directly :-P)
@@ -297,7 +290,7 @@ if (SQL_NUMROWS($result_main) > 0) {
                        } // END - if
                } // END - foreach
        } // END - if
-}
+} // END - if
 
 // Free memory
 SQL_FREERESULT($result_main);
@@ -305,5 +298,5 @@ SQL_FREERESULT($result_main);
 // Remove variable
 unset($mailText);
 
-//
+// [EOF]
 ?>