blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-22 01:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed query method getMessages in model models/system/Recipient_model.php

Browse Source 
- Changed interface method sendMessages of job jobs/MailJob.php
- Added function terminateWithError to helper helpers/hlp_common_helper.php
- Changed method overrideConfigs of library MailLib
- Removed method getConfigs from library MailLib
- Added public method getEmailNumberToSent to library MailLib
- Changed method sendAllNotices of library MessageLib
- Renamed private method _sendNotice to _sendOneNotice in library MessageLib
- Added new private methods _loadDbNoticeEmailTemplate, _loadFsNoticeEmailTemplate and _sendNotice to library MessageLib
- Changed method _getNoticeBody in library MessageLib
- Removed methods _getNoticeHTMLBody and _getNoticeTXTBody from in library MessageLib
This commit is contained in:
Paolo
2019-06-13 18:23:24 +02:00
parent 8135c6275e
commit 0ef94aacda
5 changed files with 202 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/MailLib.php
+19 -28
View File
@@ -110,43 +110,34 @@ class MailLib
}
/**
* To ovveride the configurations
* Overrides configuration parameters
* If the given parameters are not null or empty strings then they are used to override
* the following properties of this object:
* - email_number_to_sent
* - email_number_per_time_range
* - email_time_range
* - email_from_system
*/
public function overrideConfigs($cfg)
public function overrideConfigs($numberToSent, $numberPerTimeRange, $emailTimeRange, $emailFromSystem)
{
if (!is_null($cfg))
if (is_numeric($numberToSent)) $this->email_number_to_sent = $numberToSent;
if (is_numeric($numberPerTimeRange)) $this->email_number_per_time_range = $numberPerTimeRange;
if (is_numeric($emailTimeRange)) $this->email_time_range = $emailTimeRange;
if (!isEmptyString($emailFromSystem) && filter_var($emailFromSystem, FILTER_VALIDATE_EMAIL))
{
if (isset($cfg->email_number_to_sent) && is_numeric($cfg->email_number_to_sent))
{
$this->email_number_to_sent = $cfg->email_number_to_sent;
}
if (isset($cfg->email_number_per_time_range) && is_numeric($cfg->email_number_per_time_range))
{
$this->email_number_per_time_range = $cfg->email_number_per_time_range;
}
if (isset($cfg->email_time_range) && is_numeric($cfg->email_time_range))
{
$this->email_time_range = $cfg->email_time_range;
}
if (isset($cfg->email_from_system) && filter_var($cfg->email_from_system, FILTER_VALIDATE_EMAIL))
{
$this->email_from_system = $cfg->email_from_system;
}
$this->email_from_system = $emailFromSystem;
}
}
/**
* Returns the current configuration
* Returns value of property email_number_to_sent
*/
public function getConfigs()
public function getEmailNumberToSent()
{
$cfg = new stdClass();
$cfg->email_number_to_sent = $this->email_number_to_sent;
$cfg->email_number_per_time_range = $this->email_number_per_time_range;
$cfg->email_time_range = $this->email_time_range;
$cfg->email_from_system = $this->email_from_system;
return $cfg;
return $this->email_number_to_sent;
}
/**