Skip to content
Snippets Groups Projects
Commit 6fd12376 authored by Peter Rotich's avatar Peter Rotich
Browse files

Cascade email and template lookup.

parent 55d92c63
No related branches found
No related tags found
No related merge requests found
...@@ -351,14 +351,13 @@ class OsticketConfig extends Config { ...@@ -351,14 +351,13 @@ class OsticketConfig extends Config {
function getDefaultEmail() { function getDefaultEmail() {
if(!$this->defaultEmail && $this->getDefaultEmailId()) if(!$this->defaultEmail && $this->getDefaultEmailId())
$this->defaultEmail=Email::lookup($this->getDefaultEmailId()); $this->defaultEmail = Email::lookup($this->getDefaultEmailId());
return $this->defaultEmail; return $this->defaultEmail;
} }
function getDefaultEmailAddress() { function getDefaultEmailAddress() {
$email=$this->getDefaultEmail(); return ($email=$this->getDefaultEmail()) ? $email->getAddress() : null;
return $email?$email->getAddress():null;
} }
function getDefaultSLAId() { function getDefaultSLAId() {
...@@ -368,7 +367,7 @@ class OsticketConfig extends Config { ...@@ -368,7 +367,7 @@ class OsticketConfig extends Config {
function getDefaultSLA() { function getDefaultSLA() {
if(!$this->defaultSLA && $this->getDefaultSLAId()) if(!$this->defaultSLA && $this->getDefaultSLAId())
$this->defaultSLA=SLA::lookup($this->getDefaultSLAId()); $this->defaultSLA = SLA::lookup($this->getDefaultSLAId());
return $this->defaultSLA; return $this->defaultSLA;
} }
...@@ -379,15 +378,18 @@ class OsticketConfig extends Config { ...@@ -379,15 +378,18 @@ class OsticketConfig extends Config {
function getAlertEmail() { function getAlertEmail() {
if(!$this->alertEmail && $this->get('alert_email_id')) if(!$this->alertEmail)
$this->alertEmail= new Email($this->get('alert_email_id')); if(!($this->alertEmail = Email::lookup($this->getAlertEmailId())))
$this->alertEmail = $this->getDefaultEmail();
return $this->alertEmail; return $this->alertEmail;
} }
function getDefaultSMTPEmail() { function getDefaultSMTPEmail() {
if(!$this->defaultSMTPEmail && $this->get('default_smtp_id')) if(!$this->defaultSMTPEmail && $this->get('default_smtp_id'))
$this->defaultSMTPEmail= new Email($this->get('default_smtp_id')); $this->defaultSMTPEmail = Email::lookup($this->get('default_smtp_id'));
return $this->defaultSMTPEmail; return $this->defaultSMTPEmail;
} }
......
...@@ -77,9 +77,11 @@ class Dept { ...@@ -77,9 +77,11 @@ class Dept {
} }
function getEmail() { function getEmail() {
global $cfg;
if(!$this->email && $this->getEmailId()) if(!$this->email)
$this->email=Email::lookup($this->getEmailId()); if(!($this->email = Email::lookup($this->getEmailId())))
$this->email = $cfg->getDefaultEmail();
return $this->email; return $this->email;
} }
...@@ -138,19 +140,21 @@ class Dept { ...@@ -138,19 +140,21 @@ class Dept {
} }
function getTemplate() { function getTemplate() {
global $cfg;
if(!$this->template && $this->getTemplateId()) if (!$this->template) {
$this->template = EmailTemplateGroup::lookup($this->getTemplateId()); if (!($this->template = EmailTemplateGroup::lookup($this->getTemplateId())))
$this->template = $cfg->getDefaultTemplate();
}
return $this->template; return $this->template;
} }
function getAutoRespEmail() { function getAutoRespEmail() {
if(!$this->autorespEmail && $this->ht['autoresp_email_id'] && ($email=Email::lookup($this->ht['autoresp_email_id']))) if (!$this->autorespEmail && $this->ht['autoresp_email_id'])
$this->autorespEmail=$email; if (!($this->autorespEmail = Email::lookup($this->ht['autoresp_email_id'])))
else // Defualt to dept email if autoresp is not specified or deleted. $this->autorespEmail = $this->getEmail();
$this->autorespEmail=$this->getEmail();
return $this->autorespEmail; return $this->autorespEmail;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment