galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Upgrade to v26 (#172)

Browse Source 
* A bunch of new updates from icehrm pro

* Push changes to frontend
This commit is contained in:
Thilina Hasantha
2019-02-03 14:00:34 +01:00
committed by GitHub
parent a75325fb52
commit 16014bb38e
734 changed files with 131230 additions and 17430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
core/src/Classes/Email/EmailSender.php
View File

@@ -11,7 +11,9 @@ namespace Classes\Email;
use Classes\Crypt\AesCtr;
use Classes\UIManager;
use Employees\Common\Model\Employee;
use Model\IceEmail;
use Users\Common\Model\User;
use Utils\LogManager;
abstract class EmailSender
{
@@ -22,7 +24,7 @@ abstract class EmailSender
$this->settings = $settings;
}
public function sendEmailFromNotification($notification)
public function sendEmailFromNotification($notification, $delayed = false)
{
$toEmail = null;
$user = new User();
@@ -44,17 +46,50 @@ abstract class EmailSender
if ($action->type == "url") {
$emailBody = str_replace("#_url_#", CLIENT_BASE_URL."?".$action->url, $emailBody);
}
$this->sendEmail(
'IceHrm Notification from '.$notification->type,
$user->email,
$emailBody,
array(),
array(),
array()
);
if ($delayed) {
$this->sendEmailDelayed(
'IceHrm Notification from '.$notification->type,
$user->email,
$emailBody,
array(),
array(),
array()
);
} else {
$this->sendEmail(
'IceHrm Notification from '.$notification->type,
$user->email,
$emailBody,
array(),
array(),
array()
);
}
}
}
public function sendEmailDelayed($subject, $toEmail, $template, $params, $ccList = array(), $bccList = array())
{
$email = new IceEmail();
$email->subject = $subject;
$email->toEmail = $toEmail;
$email->template = $template;
$email->params = json_encode($params);
$email->cclist = json_encode($ccList);
$email->bcclist = json_encode($bccList);
$email->status = 'Pending';
$email->created = date('Y-m-d H:i:s');
$email->updated = date('Y-m-d H:i:s');
$ok = $email->Save();
if (!$ok) {
LogManager::getInstance()->error("Error Saving Email: ".$email->ErrorMsg());
return false;
}
return true;
}
public function sendEmailFromDB($email)
{
$params = array();