More rewrites to configuration:

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

diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index 1e35fec1423c414c054f09fad6390edba59d5c5b..f10b19f755f0e4eab8fd005ab9fa975f5ee306cf 100644 (file)
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -44,8 +44,8 @@ if (!defined('__SECURITY')) {
 if ((isResetModeEnabled()) || (!isHtmlOutputMode())) {
        // Skip here
        return FALSE;
-} elseif (!isExtensionActive('user')) {
-       // Abort here if extension user is not active
+} elseif ((!isExtensionActive('user')) || (!isExtensionActive('other'))) {
+       // Abort here if extension user/other are not active
        return FALSE;
 }
 
@@ -218,8 +218,8 @@ if (!SQL_HASZERONUMS($result_main)) {
                                                } // END - switch
                                        } // END - if
 
-                                       // Is there reached the maximum to send mails? || (getConfig('max_send') >= $GLOBALS['pool_cnt'])
-                                       //* DEBUG: */ debugOutput('*L:'.__LINE__.'/'.$GLOBALS['pool_cnt'].'>='.$mailData['target_send'].'/'.getConfig('max_send').'>='.$GLOBALS['pool_cnt'].'/'.$lastSentId.'!='.$mailData['id'].'*');
+                                       // Is there reached the maximum to send mails? || (getMaxSend() >= $GLOBALS['pool_cnt'])
+                                       //* DEBUG: */ debugOutput('*L:'.__LINE__.'/'.$GLOBALS['pool_cnt'].'>='.$mailData['target_send'].'/'.getMaxSend().'>='.$GLOBALS['pool_cnt'].'/'.$lastSentId.'!='.$mailData['id'].'*');
                                        if ((($GLOBALS['pool_cnt'] >= $mailData['target_send'])) && ($lastSentId != $mailData['id'])) {
                                                // Prepare content
                                                $content = array(
@@ -263,7 +263,7 @@ if (!SQL_HASZERONUMS($result_main)) {
                                                break;
                                        }
                                        // Is there send maximum mails?
-                                       elseif (($GLOBALS['pool_cnt'] >= getConfig('max_send')) || ($count2 >= getConfig('max_send'))) {
+                                       elseif (($GLOBALS['pool_cnt'] >= getMaxSend()) || ($count2 >= getMaxSend())) {
                                                // 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'] <= $mailData['target_send']) $add = ',`target_send`=`target_send`-' . $GLOBALS['pool_cnt'];