Even more rewrites/fixes from EL branch (please report any broken part after you...

[mailer.git] / inc / pool / pool-user.php

diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index 981c43d62e098349be589cac75fe026c6b42392a..b29d3fb625568476092b8d12ddcc7f1706726cb9 100644 (file)
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -152,14 +152,14 @@ 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 />");
                                                                        updateMediadataEntry(array('total_send', 'normal_send'), 'add', 1);
@@ -214,7 +214,7 @@ 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 />");
                                                        updateMediadataEntry(array('total_orders', 'normal_orders'), 'add', 1);
@@ -228,8 +228,11 @@ 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 />");
                                                break;