Index: branches/5.2.x/core/install/english.lang
===================================================================
diff -u -N -r16591 -r16598
--- branches/5.2.x/core/install/english.lang	(.../english.lang)	(revision 16591)
+++ branches/5.2.x/core/install/english.lang	(.../english.lang)	(revision 16598)
@@ -166,6 +166,7 @@
 			<PHRASE Label="la_config_DefaultGridPerPage" Module="Core" Type="1">RGVmYXVsdCAiUGVyIFBhZ2UiIHNldHRpbmcgaW4gR3JpZHM=</PHRASE>
 			<PHRASE Label="la_config_DefaultRegistrationCountry" Module="Core" Type="1">RGVmYXVsdCBSZWdpc3RyYXRpb24gQ291bnRyeQ==</PHRASE>
 			<PHRASE Label="la_config_DefaultTrackingCode" Module="Core" Type="1">RGVmYXVsdCBBbmFseXRpY3MgVHJhY2tpbmcgQ29kZQ==</PHRASE>
+			<PHRASE Label="la_config_EmailDelivery" Module="Core" Type="1">RW1haWwgRGVsaXZlcnk=</PHRASE>
 			<PHRASE Label="la_config_EmailLogRotationInterval" Module="Core" Type="1" Hint="VGhpcyBzZXR0aW5nIGFsbG93cyB5b3UgdG8gY29udHJvbCBmb3IgaG93IGxvbmcgIkUtbWFpbCBMb2ciIG1lc3NhZ2VzIHdpbGwgYmUgc3RvcmVkIGluIHRoZSBsb2cgYW5kIHRoZW4gYXV0b21hdGljYWxseSBkZWxldGVkLiBVc2Ugb3B0aW9uICJGb3JldmVyIiB3aXRoIGNhdXRpb24gc2luY2UgaXQgd2lsbCBjb21wbGV0ZWx5IGRpc2FibGUgYXV0b21hdGljIGxvZyBjbGVhbnVwIGFuZCBjYW4gbGVhZCB0byBsYXJnZSBzaXplIG9mIGRhdGFiYXNlIHRhYmxlIHRoYXQgc3RvcmVzIGUtbWFpbCBtZXNzYWdlcy4=">S2VlcCAiRS1tYWlsIExvZyIgZm9y</PHRASE>
 			<PHRASE Label="la_config_EnableEmailLog" Module="Core" Type="1" Hint="IkUtbWFpbCBMb2ciIHN0b3JlcyB0aGUgZXhhY3QgY29weSBvZiBhbGwgZW1haWxzIHRoYXQgYmVlbiBzZW50IG91dCBieSB5b3VyIHdlYnNpdGUuIFRoZSBmb2xsb3dpbmcgaW5mb3JtYXRpb24gaXMgc3RvcmVkOiBUaW1lLCBTZW5kZXIsIFJlY2lwaWVudHMsIFN1YmplY3QsIEUtbWFpbCBFdmVudCBuYW1lLCBhbmQgRW1haWwgQm9keS4=">RW5hYmxlICJFLW1haWwgTG9nIg==</PHRASE>
 			<PHRASE Label="la_config_EnablePageContentRevisionControl" Module="Core" Type="1">RW5hYmxlIFJldmlzaW9uIENvbnRyb2wgZm9yIFNlY3Rpb24gQ29udGVudA==</PHRASE>
@@ -892,6 +893,8 @@
 			<PHRASE Label="la_opt_EditorsPick" Module="Core" Type="1">RWRpdG9yJ3MgUGljaw==</PHRASE>
 			<PHRASE Label="la_opt_Email" Module="Core" Type="1">RS1tYWls</PHRASE>
 			<PHRASE Label="la_opt_EmailBody" Module="Core" Type="1">RS1tYWlsIEJvZHk=</PHRASE>
+			<PHRASE Label="la_opt_EmailDeliveryImmediate" Module="Core" Type="1">SW1tZWRpYXRl</PHRASE>
+			<PHRASE Label="la_opt_EmailDeliveryQueue" Module="Core" Type="1">RW1haWwgUXVldWU=</PHRASE>
 			<PHRASE Label="la_opt_EmailLogKeepForever" Module="Core" Type="1">Rm9yZXZlciAobmV2ZXIgZGVsZXRlZCBhdXRvbWF0aWNhbGx5KQ==</PHRASE>
 			<PHRASE Label="la_opt_EmailSubject" Module="Core" Type="1">RS1tYWlsIFN1YmplY3Q=</PHRASE>
 			<PHRASE Label="la_opt_EmailTemplates" Module="Core" Type="1">RS1tYWlsIFRlbXBsYXRlcw==</PHRASE>
Index: branches/5.2.x/core/install/upgrades.sql
===================================================================
diff -u -N -r16588 -r16598
--- branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 16588)
+++ branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 16598)
@@ -2950,3 +2950,5 @@
 UPDATE LanguageLabels
 SET l1_HintTranslation = REPLACE(l1_HintTranslation, '<li>This deploy script will reset all caches at once</li>', '<li>This deploy script will reset all caches at once.</li>\r\n<li>This deploy script will dump production assets.</li>\r\n')
 WHERE PhraseKey = 'LA_TITLE_SYSTEMTOOLSDEPLOY';
+
+INSERT INTO SystemSettings VALUES(DEFAULT, 'EmailDelivery', '2', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMailling', 'la_config_EmailDelivery', 'radio', NULL, '1=la_opt_EmailDeliveryQueue||2=la_opt_EmailDeliveryImmediate', 50.11, 0, 1, NULL);
Index: branches/5.2.x/core/units/mailing_lists/mailing_lists_config.php
===================================================================
diff -u -N -r16577 -r16598
--- branches/5.2.x/core/units/mailing_lists/mailing_lists_config.php	(.../mailing_lists_config.php)	(revision 16577)
+++ branches/5.2.x/core/units/mailing_lists/mailing_lists_config.php	(.../mailing_lists_config.php)	(revision 16598)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mailing_lists_config.php 16577 2017-07-18 11:30:11Z alex $
+* @version	$Id: mailing_lists_config.php 16598 2017-07-27 09:19:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -33,7 +33,6 @@
 
 	'ScheduledTasks' => Array (
 		'generate_mailing_queue' => Array ('EventName' => 'OnGenerateEmailQueue', 'RunSchedule' => '*/30 * * * *'),
-		'process_mailing_queue' => Array ('EventName' => 'OnProcessEmailQueue', 'RunSchedule' => '*/30 * * * *'),
 	),
 
 	'IDField' => 'MailingId',
Index: branches/5.2.x/core/units/email_queue/email_queue_config.php
===================================================================
diff -u -N -r16388 -r16598
--- branches/5.2.x/core/units/email_queue/email_queue_config.php	(.../email_queue_config.php)	(revision 16388)
+++ branches/5.2.x/core/units/email_queue/email_queue_config.php	(.../email_queue_config.php)	(revision 16598)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_queue_config.php 16388 2016-08-11 08:16:43Z alex $
+* @version	$Id: email_queue_config.php 16598 2017-07-27 09:19:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -18,7 +18,7 @@
 	'Prefix' => 'email-queue',
 	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
 	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
-	'EventHandlerClass' => Array ('class' => 'kDBEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
+	'EventHandlerClass' => Array ('class' => 'EmailQueueEventHandler', 'file' => 'email_queue_eh.php', 'build_event' => 'OnBuild'),
 	'TagProcessorClass' => Array ('class' => 'EmailQueueTagProcessor', 'file' => 'email_queue_tp.php', 'build_event' => 'OnBuild'),
 
 	'AutoLoad' => true,
@@ -31,12 +31,19 @@
 		5 => 'mode',
 	),
 
+	'ScheduledTasks' => Array (
+		'process_email_queue' => Array ('EventName' => 'OnProcess', 'RunSchedule' => '* * * * *'),
+	),
+
 	'IDField' => 'EmailQueueId',
 
 	'TableName' => TABLE_PREFIX . 'EmailQueue',
 
 	'TitlePresets' => Array (
 		'email_queue_list' => Array ('prefixes' => Array ('email-queue_List'), 'format' => '!la_tab_EmailQueue!',),
+
+		'email_send' => Array ('prefixes' => Array (), 'format' => '!la_title_SendingPreparedEmails!. !la_title_PleaseWait!'),
+		'email_send_complete' => Array ('prefixes' => Array (), 'format' => '!la_title_SendMailComplete!'),
 	),
 
 	'PermSection' => Array ('main' => 'in-portal:email_queue'),
Index: branches/5.2.x/core/admin_templates/mailing_lists/send_complete.tpl
===================================================================
diff -u -N -r15608 -r16598
--- branches/5.2.x/core/admin_templates/mailing_lists/send_complete.tpl	(.../send_complete.tpl)	(revision 15608)
+++ branches/5.2.x/core/admin_templates/mailing_lists/send_complete.tpl	(.../send_complete.tpl)	(revision 16598)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="900" height="600"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" permission_type="advanced:send_email" prefix="email-template" title_preset="email_send_complete"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" permission_type="advanced:send_email" prefix="email-queue" title_preset="email_send_complete"/>
 
 <script type="text/javascript">
 	function close_window() {
Index: branches/5.2.x/core/kernel/utility/email.php
===================================================================
diff -u -N -r16513 -r16598
--- branches/5.2.x/core/kernel/utility/email.php	(.../email.php)	(revision 16513)
+++ branches/5.2.x/core/kernel/utility/email.php	(.../email.php)	(revision 16598)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version	$Id: email.php 16513 2017-01-20 14:10:53Z alex $
+ * @version	$Id: email.php 16598 2017-07-27 09:19:55Z alex $
  * @package	In-Portal
  * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
  * @license	  GNU/GPL
@@ -204,7 +204,7 @@
 	protected function _getCustomParams()
 	{
 		$ret = $this->params;
-		$send_keys = Array ('from_email', 'from_name', 'to_email', 'to_name', 'overwrite_to_email', 'language_id', 'use_custom_design');
+		$send_keys = Array ('from_email', 'from_name', 'to_email', 'to_name', 'overwrite_to_email', 'language_id', 'use_custom_design', 'delivery');
 
 		foreach ($send_keys as $send_key) {
 			unset($ret[$send_key]);
@@ -217,11 +217,10 @@
 	 * Sends e-mail now or puts it in queue
 	 *
 	 * @param int $recipient_user_id
-	 * @param bool $immediate_send
 	 * @return bool
 	 * @access public
 	 */
-	public function send($recipient_user_id = null, $immediate_send = true)
+	public function send($recipient_user_id = null)
 	{
 		$this->recipientUserId = $recipient_user_id;
 
@@ -283,7 +282,9 @@
 			$this->sender->setLogData($log_fields_hash);
 		}
 
-		return $this->sender->Deliver(null, $immediate_send);
+		$delivery = isset($this->params['delivery']) ? $this->params['delivery'] : $this->Application->ConfigValue('EmailDelivery');
+
+		return $this->sender->Deliver(null, $delivery == EmailDelivery::IMMEDIATE);
 	}
 
 	/**
Index: branches/5.2.x/core/units/email_templates/email_template_eh.php
===================================================================
diff -u -N -r16513 -r16598
--- branches/5.2.x/core/units/email_templates/email_template_eh.php	(.../email_template_eh.php)	(revision 16513)
+++ branches/5.2.x/core/units/email_templates/email_template_eh.php	(.../email_template_eh.php)	(revision 16598)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_template_eh.php 16513 2017-01-20 14:10:53Z alex $
+* @version	$Id: email_template_eh.php 16598 2017-07-27 09:19:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -30,7 +30,6 @@
 			$permissions = Array (
 				'OnFrontOnly' => Array ('self' => 'edit'),
 				'OnSaveSelected' => Array ('self' => 'view'),
-				'OnProcessEmailQueue' => Array ('self' => 'add|edit'),
 				'OnExportEmailTemplates' => Array ('self' => 'view'),
 
 				'OnSuggestAddressJSON' => Array ('self' => 'add|edit'),
@@ -220,72 +219,6 @@
 		}
 
 		/**
-		 * Process emails from queue
-		 *
-		 * @param kEvent $event
-		 * @todo Move to MailingList
-		 */
-		function OnProcessEmailQueue($event)
-		{
-			$deliver_count = $event->getEventParam('deliver_count');
-			if ( $deliver_count === false ) {
-				$deliver_count = $this->Application->ConfigValue('MailingListSendPerStep');
-				if ( $deliver_count === false ) {
-					$deliver_count = 10; // 10 emails per script run (if not specified directly)
-				}
-			}
-
-			$processing_type = $this->Application->GetVar('type');
-			if ( $processing_type = 'return_progress' ) {
-				$email_queue_progress = $this->Application->RecallVar('email_queue_progress');
-				if ( $email_queue_progress === false ) {
-					$emails_sent = 0;
-					$sql = 'SELECT COUNT(*)
-							FROM ' . TABLE_PREFIX . 'EmailQueue
-							WHERE (SendRetries < 5) AND (LastSendRetry < ' . strtotime('-2 hours') . ')';
-					$total_emails = $this->Conn->GetOne($sql);
-					$this->Application->StoreVar('email_queue_progress', $emails_sent . ':' . $total_emails);
-				}
-				else {
-					list ($emails_sent, $total_emails) = explode(':', $email_queue_progress);
-				}
-			}
-
-			$sql = 'SELECT *
-					FROM ' . TABLE_PREFIX . 'EmailQueue
-					WHERE (SendRetries < 5) AND (LastSendRetry < ' . strtotime('-2 hours') . ')
-					LIMIT 0,' . $deliver_count;
-			$messages = $this->Conn->Query($sql);
-
-			$message_count = count($messages);
-			if ( !$message_count ) {
-				// no messages left to send in queue
-				if ( $processing_type = 'return_progress' ) {
-					$this->Application->RemoveVar('email_queue_progress');
-					$this->Application->Redirect($this->Application->GetVar('finish_template'));
-				}
-				return;
-			}
-
-			/** @var MailingListHelper $mailing_list_helper */
-			$mailing_list_helper = $this->Application->recallObject('MailingListHelper');
-
-			$mailing_list_helper->processQueue($messages);
-
-			if ( $processing_type = 'return_progress' ) {
-				$emails_sent += $message_count;
-				if ( $emails_sent >= $total_emails ) {
-					$this->Application->RemoveVar('email_queue_progress');
-					$this->Application->Redirect($this->Application->GetVar('finish_template'));
-				}
-
-				$this->Application->StoreVar('email_queue_progress', $emails_sent . ':' . $total_emails);
-				$event->status = kEvent::erSTOP;
-				echo ($emails_sent / $total_emails) * 100;
-			}
-		}
-
-		/**
 		 * Prefills module dropdown
 		 *
 		 * @param kEvent $event
@@ -745,4 +678,4 @@
 
 			$this->clearSelectedIDs($event);
 		}
-	}
\ No newline at end of file
+	}
Index: branches/5.2.x/core/units/email_templates/email_templates_config.php
===================================================================
diff -u -N -r16577 -r16598
--- branches/5.2.x/core/units/email_templates/email_templates_config.php	(.../email_templates_config.php)	(revision 16577)
+++ branches/5.2.x/core/units/email_templates/email_templates_config.php	(.../email_templates_config.php)	(revision 16598)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_templates_config.php 16577 2017-07-18 11:30:11Z alex $
+* @version	$Id: email_templates_config.php 16598 2017-07-27 09:19:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -62,8 +62,6 @@
 
 			// for mass mailing
 			'email_send_form' => Array ('prefixes' => Array (), 'format' => '!la_title_SendEmail!'),
-			'email_send' => Array ('prefixes' => Array (), 'format' => '!la_title_SendingPreparedEmails!. !la_title_PleaseWait!'),
-			'email_send_complete' => Array ('prefixes' => Array (), 'format' => '!la_title_SendMailComplete!'),
 		),
 
 		'EditTabPresets' => Array (
Index: branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php
===================================================================
diff -u -N -r16513 -r16598
--- branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php	(.../mailing_list_eh.php)	(revision 16513)
+++ branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php	(.../mailing_list_eh.php)	(revision 16598)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mailing_list_eh.php 16513 2017-01-20 14:10:53Z alex $
+* @version	$Id: mailing_list_eh.php 16598 2017-07-27 09:19:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -30,7 +30,6 @@
 			$permissions = Array (
 				'OnCancelMailing' => Array ('self' => 'edit'),
 				'OnGenerateEmailQueue' => Array ('self' => true),
-				'OnProcessEmailQueue' => Array ('self' => true),
 				'OnGetHtmlBody' => Array ('self' => 'edit'),
 			);
 
@@ -255,28 +254,6 @@
 		}
 
 		/**
-		 * Allows to safely get mailing configuration variables
-		 *
-		 * @param string $variable_name
-		 * @return int
-		 */
-		function _ensureDefault($variable_name)
-		{
-			$value = $this->Application->ConfigValue($variable_name);
-			if ( $value === false ) {
-				// ensure default value, when configuration variable is missing
-				return 10;
-			}
-
-			if ( !$value ) {
-				// configuration variable found, but it's value is empty or zero
-				return false;
-			}
-
-			return $value;
-		}
-
-		/**
 		 * Generates email queue for active mailing lists
 		 *
 		 * @param kEvent $event
@@ -302,16 +279,15 @@
 				return;
 			}
 
-			// queue 10 emails per step summary from all mailing lists (FIFO logic)
-			$to_queue = $this->_ensureDefault('MailingListQueuePerStep');
+			/** @var MailingListHelper $mailing_list_helper */
+			$mailing_list_helper = $this->Application->recallObject('MailingListHelper');
 
-			if ( $to_queue === false ) {
+			$to_queue = $mailing_list_helper->getSetting('MailingListQueuePerStep');
+
+			if ( !is_numeric($to_queue) ) {
 				return;
 			}
 
-			/** @var MailingListHelper $mailing_list_helper */
-			$mailing_list_helper = $this->Application->recallObject('MailingListHelper');
-
 			foreach ($mailing_lists as $mailing_id => $mailing_data) {
 				if ( $mailing_data['EmailsTotal'] == 0 ) {
 					// no work performed on this mailing list -> calculate totals
@@ -356,38 +332,6 @@
 		}
 
 		/**
-		 * Process email queue from cron
-		 *
-		 * @param kEvent $event
-		 */
-		function OnProcessEmailQueue($event)
-		{
-			$deliver_count = $this->_ensureDefault('MailingListSendPerStep');
-			if ($deliver_count === false) {
-				return ;
-			}
-
-			$queue_table = $this->Application->getUnitOption('email-queue', 'TableName');
-
-			// get queue part to send
-			$sql = 'SELECT *
-					FROM ' . $queue_table . '
-					WHERE (SendRetries < 5) AND (LastSendRetry < ' . strtotime('-2 hours') . ')
-					LIMIT 0,' . $deliver_count;
-			$messages = $this->Conn->Query($sql);
-
-			if (!$messages) {
-				// no more messages left in queue
-				return ;
-			}
-
-			/** @var MailingListHelper $mailing_list_helper */
-			$mailing_list_helper = $this->Application->recallObject('MailingListHelper');
-
-			$mailing_list_helper->processQueue($messages);
-		}
-
-		/**
 		 * Returns HTML of sent e-mail for iframe
 		 *
 		 * @param kEvent $event
@@ -403,4 +347,4 @@
 
 			echo $object->GetDBField('MessageHtml');
 		}
-	}
\ No newline at end of file
+	}
Index: branches/5.2.x/core/install/install_data.sql
===================================================================
diff -u -N -r16592 -r16598
--- branches/5.2.x/core/install/install_data.sql	(.../install_data.sql)	(revision 16592)
+++ branches/5.2.x/core/install/install_data.sql	(.../install_data.sql)	(revision 16598)
@@ -90,6 +90,7 @@
 INSERT INTO SystemSettings VALUES(DEFAULT, 'MailingListQueuePerStep', '10', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMailling', 'la_config_MailingListQueuePerStep', 'text', NULL, NULL, 50.08, 0, 0, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'MailingListSendPerStep', '10', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMailling', 'la_config_MailingListSendPerStep', 'text', NULL, NULL, 50.09, 0, 0, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'DefaultEmailRecipients', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMailling', 'la_config_DefaultEmailRecipients', 'text', NULL, NULL, 50.10, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'EmailDelivery', '1', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMailling', 'la_config_EmailDelivery', 'radio', NULL, '1=la_opt_EmailDeliveryQueue||2=la_opt_EmailDeliveryImmediate', 50.11, 0, 1, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'UseOutputCompression', '1', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSystem', 'la_config_UseOutputCompression', 'checkbox', '', '', 60.01, 0, 1, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'OutputCompressionLevel', '7', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSystem', 'la_config_OutputCompressionLevel', 'text', '', '', 60.02, 0, 1, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'UseTemplateCompression', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSystem', 'la_config_UseTemplateCompression', 'checkbox', '', '', 60.03, 0, 1, NULL);
Index: branches/5.2.x/core/kernel/constants.php
===================================================================
diff -u -N -r16247 -r16598
--- branches/5.2.x/core/kernel/constants.php	(.../constants.php)	(revision 16247)
+++ branches/5.2.x/core/kernel/constants.php	(.../constants.php)	(revision 16598)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: constants.php 16247 2015-09-02 20:48:06Z alex $
+* @version	$Id: constants.php 16598 2017-07-27 09:19:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -201,8 +201,13 @@
 		const PS_USER = 'USER';
 	}
 
-class CategoryPermissionRebuild {
-	const MANUAL = 1;
-	const SILENT = 2;
-	const AUTOMATIC = 3;
-}
+	class CategoryPermissionRebuild {
+		const MANUAL = 1;
+		const SILENT = 2;
+		const AUTOMATIC = 3;
+	}
+
+	class EmailDelivery {
+		const QUEUE = 1;
+		const IMMEDIATE = 2;
+	}
Index: branches/5.2.x/core/units/helpers/mailing_list_helper.php
===================================================================
diff -u -N -r16513 -r16598
--- branches/5.2.x/core/units/helpers/mailing_list_helper.php	(.../mailing_list_helper.php)	(revision 16513)
+++ branches/5.2.x/core/units/helpers/mailing_list_helper.php	(.../mailing_list_helper.php)	(revision 16598)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mailing_list_helper.php 16513 2017-01-20 14:10:53Z alex $
+* @version	$Id: mailing_list_helper.php 16598 2017-07-27 09:19:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -113,10 +113,12 @@
 		}
 
 		/**
-		 * Generates recipients emails based on "To" field value
+		 * Generates recipients emails based on "To" field value.
 		 *
-		 * @param int $id
-		 * @param Array $fields_hash
+		 * @param int   $id          Id.
+		 * @param Array $fields_hash Fields hash.
+		 *
+		 * @return array
 		 */
 		function generateRecipients($id, $fields_hash)
 		{
@@ -241,7 +243,7 @@
 		 */
 		function _updateSentTotals($mailing_totals)
 		{
-			if (array_key_exists(0, $mailing_totals)) {
+			if ( array_key_exists(0, $mailing_totals) ) {
 				// don't update sent email count for mails queued directly (not via mailing lists)
 				unset($mailing_totals[0]);
 			}
@@ -250,7 +252,7 @@
 			$table_name = $this->Application->getUnitOption('mailing-list', 'TableName');
 
 			// update sent email count for each processed mailing
-			foreach ($mailing_totals as $mailing_id => $mailing_total) {
+			foreach ( $mailing_totals as $mailing_id => $mailing_total ) {
 				$sql = 'UPDATE ' . $table_name . '
 						SET EmailsSent = EmailsSent + ' . $mailing_total . '
 						WHERE ' . $id_field . ' = ' . $mailing_id;
@@ -265,37 +267,42 @@
 		}
 
 		/**
-		 * Sent given messages from email queue
+		 * Sent given messages from email queue.
 		 *
-		 * @param Array $messages
+		 * @return integer
 		 */
-		function processQueue(&$messages)
+		function processQueue()
 		{
 			/** @var kEmailSendingHelper $esender */
 			$esender = $this->Application->recallObject('EmailSender');
 
-			$queue_table = $this->Application->getUnitOption('email-queue', 'TableName');
+			$messages = $this->getMessages();
+			$message_count = count($messages);
 
+			if ( !$message_count ) {
+				return 0;
+			}
+
 			$i = 0;
-			$message = Array ();
-			$mailing_totals = Array ();
-			$message_count = count($messages);
+			$message = Array();
+			$mailing_totals = Array();
+			$queue_table = $this->Application->getUnitOption('email-queue', 'TableName');
 
-			while ($i < $message_count) {
+			while ( $i < $message_count ) {
 				$message[0] = unserialize($messages[$i]['MessageHeaders']);
 				$message[1] =& $messages[$i]['MessageBody'];
 
-				$esender->setLogData( unserialize($messages[$i]['LogData']) );
+				$esender->setLogData(unserialize($messages[$i]['LogData']));
 				$delivered = $esender->Deliver($message, true); // immediate send!
 
-				if ($delivered) {
+				if ( $delivered ) {
 					// send succeeded, delete from queue
 					$sql = 'DELETE FROM ' . $queue_table . '
 							WHERE EmailQueueId = ' . $messages[$i]['EmailQueueId'];
 					$this->Conn->Query($sql);
 
 					$mailing_id = $messages[$i]['MailingId'];
-					if (!array_key_exists($mailing_id, $mailing_totals)) {
+					if ( !array_key_exists($mailing_id, $mailing_totals) ) {
 						$mailing_totals[$mailing_id] = 0;
 					}
 					$mailing_totals[$mailing_id]++;
@@ -311,5 +318,68 @@
 			}
 
 			$this->_updateSentTotals($mailing_totals);
+
+			return $message_count;
 		}
-	}
\ No newline at end of file
+
+		/**
+		 * Returns queued messages (or their count), that can be sent
+		 *
+		 * @param bool $count_only
+		 *
+		 * @return Array|int
+		 * @access public
+		 */
+		public function getMessages($count_only = false)
+		{
+			$deliver_count = $this->getSetting('MailingListSendPerStep');
+
+			if ( !is_numeric($deliver_count) ) {
+				return $count_only ? 0 : Array();
+			}
+
+			$queue_table = $this->Application->getUnitOption('email-queue', 'TableName');
+
+			if ( $count_only ) {
+				$sql = 'SELECT COUNT(*)
+						FROM ' . $queue_table . '
+						WHERE (SendRetries < 5) AND (LastSendRetry < ' . strtotime('-2 hours') . ')';
+
+				return $this->Conn->GetOne($sql);
+			}
+
+			// regular e-mails are pressed before mailing generated ones !
+			$sql = 'SELECT *
+					FROM ' . $queue_table . '
+					WHERE (SendRetries < 5) AND (LastSendRetry < ' . strtotime('-2 hours') . ')
+					ORDER BY MailingId ASC
+					LIMIT 0,' . $deliver_count;
+
+			return $this->Conn->Query($sql);
+		}
+
+		/**
+		 * Allows to safely get mailing configuration variable
+		 *
+		 * @param string $variable_name
+		 *
+		 * @return int
+		 * @access public
+		 */
+		public function getSetting($variable_name)
+		{
+			$value = $this->Application->ConfigValue($variable_name);
+
+			if ( $value === false ) {
+				// ensure default value, when configuration variable is missing
+				return 10;
+			}
+
+			if ( !$value ) {
+				// configuration variable found, but it's value is empty or zero
+				return false;
+			}
+
+			return $value;
+		}
+	}
Index: branches/5.2.x/core/admin_templates/mailing_lists/send_queue.tpl
===================================================================
diff -u -N -r16339 -r16598
--- branches/5.2.x/core/admin_templates/mailing_lists/send_queue.tpl	(.../send_queue.tpl)	(revision 16339)
+++ branches/5.2.x/core/admin_templates/mailing_lists/send_queue.tpl	(.../send_queue.tpl)	(revision 16598)
@@ -1,15 +1,15 @@
 <inp2:adm_SetPopupSize width="900" height="600"/>
 
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" permission_type="advanced:send_email" prefix="email-template" title_preset="email_send"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:user_list" permission_type="advanced:send_email" prefix="email-queue" title_preset="email_send"/>
 
 <inp2:m_RenderElement name="ajax_progress_bar" cancel_action="cancel_action();"/>
 <script type="text/javascript">
 	function cancel_action() {
 		redirect('<inp2:m_Link template="mailing_lists/send_complete" no_amp="1" js_escape="1"/>');
 	}
 
-	$QueueProcessor = new AjaxProgressBar('<inp2:m_t template="index" email-template_event="OnProcessEmailQueue" type="return_progress" finish_template="mailing_lists/send_complete" pass="m,email-template" no_amp="1" js_escape="1"/>');
+	$QueueProcessor = new AjaxProgressBar('<inp2:m_t template="index" email-queue_event="OnProcessAjax" finish_template="mailing_lists/send_complete" pass="m,email-queue" no_amp="1" js_escape="1"/>');
 </script>
 
 <inp2:m_include t="incs/footer"/>