A lot rewrites from double-quote to single-quote, some fixes for extension handling...

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

diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index 78434638f5fe999d643da4eb9ec1b86bbfc0975f..5cedc2ca6ab1a89c33f66deecf82fbef537c41bc 100644 (file)
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -46,14 +46,14 @@ if (!defined('__SECURITY')) {
 if (isResetModeEnabled()) {
        // Skip here
        return false;
-} elseif (!EXT_IS_ACTIVE("user")) {
+} elseif (!EXT_IS_ACTIVE('user')) {
        // Abort here if extension user is not active
        return false;
 }
 
 // Need this here
 // Check for freed mail orders to send out
-if (EXT_IS_ACTIVE("html_mail")) {
+if (EXT_IS_ACTIVE('html_mail')) {
        //                                0     1        2      3       4          5            6      7        8          9       10
        $result_main = SQL_QUERY("SELECT id, sender, subject, text, receivers, payment_id, timestamp, url, target_send, cat_id, html_msg FROM `{!_MYSQL_PREFIX!}_pool` WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);
 } else {
@@ -66,7 +66,7 @@ $cnt2 = 0; $lastSentId = 0; $cnt_back = array("0"); $pointsBack = array("0");
 if (SQL_NUMROWS($result_main) > 0) {
        // Parse all mails
        while ($DATA = SQL_FETCHROW($result_main)) {
-               // Set mail order as "active". That means it will be sent out
+               // Set mail order as 'active'. That means it will be sent out
                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET data_type='ACTIVE' WHERE id=%s AND data_type='NEW' LIMIT 1",
                        array($DATA[0]), __FILE__, __LINE__);
 
@@ -79,9 +79,9 @@ if (SQL_NUMROWS($result_main) > 0) {
                // Entry updated?
                if (SQL_AFFECTEDROWS() == 1) {
                        // "Explode" all receivers into an array
-                       if (ereg(";", $DATA[4])) {
+                       if (ereg(';', $DATA[4])) {
                                // There's more than one receiver in the list...
-                               $RECEIVERS = explode(";", $DATA[4]);
+                               $RECEIVERS = explode(';', $DATA[4]);
                        } elseif (!empty($DATA[4])) {
                                // Only one user left
                                $RECEIVERS = array($DATA[4]);
@@ -165,17 +165,17 @@ 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[1])), __FILE__, __LINE__);
 
-                                                       if (GET_EXT_VERSION("user") >= "0.1.4") {
+                                                       if (GET_EXT_VERSION('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($uid)), __FILE__, __LINE__);
                                                        } // END - if
 
                                                        // Update mediadata if version is 0.0.4 or higher
-                                                       if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
+                                                       if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
                                                                // Update entry (or add missing)
                                                                //* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<br />";
-                                                               MEDIA_UPDATE_ENTRY(array("total_send", "normal_send"), "add", 1);
+                                                               MEDIA_UPDATE_ENTRY(array("total_send", "normal_send"), 'add', 1);
                                                        } // END - if
 
                                                        // And count up the mail
@@ -237,10 +237,10 @@ if (SQL_NUMROWS($result_main) > 0) {
                                                $cnt2 += $GLOBALS['pool_cnt'];
 
                                                // Update mediadata if version is 0.0.4 or higher
-                                               if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
+                                               if (GET_EXT_VERSION('mediadata') >= '0.0.4') {
                                                        // Update entry (or add missing)
                                                        //* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<br />";
-                                                       MEDIA_UPDATE_ENTRY(array("total_orders", "normal_orders"), "add", 1);
+                                                       MEDIA_UPDATE_ENTRY(array("total_orders", "normal_orders"), 'add', 1);
                                                } // END - if
 
                                                //* DEBUG: */ echo"*EXIT/L:".__LINE__."/".$P."<br />";
@@ -249,10 +249,10 @@ if (SQL_NUMROWS($result_main) > 0) {
                                        // Do we have send maximum mails?
                                         elseif (($GLOBALS['pool_cnt'] >= getConfig('max_send')) || ($cnt2 >= getConfig('max_send'))) {
                                                // There are some mails left to send for next round, so we reset the status back to NEW (=still not fully delivered)
-                                               $add = "";
+                                               $add = '';
                                                if ($GLOBALS['pool_cnt'] <= $DATA[8]) $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[0])), __FILE__, __LINE__);
+                                                array(implode(';', $dummy), bigintval($DATA[0])), __FILE__, __LINE__);
 
                                                //* DEBUG: */ echo"*EXIT/L:".__LINE__."*<br />";
                                                break;
@@ -286,7 +286,7 @@ if (SQL_NUMROWS($result_main) > 0) {
 
                                        // Update receivers
                                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET receivers='%s' WHERE id=%s LIMIT 1",
-                                               array(implode(";", $dummy), bigintval($DATA[0])), __FILE__, __LINE__);
+                                               array(implode(';', $dummy), bigintval($DATA[0])), __FILE__, __LINE__);
                                }
                        }
                }
@@ -323,7 +323,7 @@ if (SQL_NUMROWS($result_main) > 0) {
                                        ADD_JACKPOT($PB);
 
                                        // Send mail out to admin
-                                       SEND_ADMIN_NOTIFICATION(ADMIN_BACK_JACKPOT." (".$uid.")", "back-admin", $content, "admin");
+                                       SEND_ADMIN_NOTIFICATION(ADMIN_BACK_JACKPOT." (".$uid.")", "back-admin", $content, 'admin');
                                }
                        } // END - if
                } // END - foreach