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

Merge remote branch 'upstream/develop-next' into develop-next

parents 81771ded f16830d1
Branches
Tags
No related merge requests found
...@@ -807,7 +807,10 @@ class DynamicListItem extends VerySimpleModel implements CustomListItem { ...@@ -807,7 +807,10 @@ class DynamicListItem extends VerySimpleModel implements CustomListItem {
'sort' => 'sort', 'sort' => 'sort',
'value' => 'value', 'value' => 'value',
'abbrev' => 'extra') as $k => $v) { 'abbrev' => 'extra') as $k => $v) {
if (isset($vars[$k])) if ($k == 'abbrev' && empty($vars[$k])) {
$vars[$k] = NULL;
$this->set($v, $vars[$k]);
} elseif (isset($vars[$k]))
$this->set($v, $vars[$k]); $this->set($v, $vars[$k]);
} }
......
...@@ -671,6 +671,18 @@ class MailFetcher { ...@@ -671,6 +671,18 @@ class MailFetcher {
// attachment. Download the body and pass it along to the mail // attachment. Download the body and pass it along to the mail
// parsing engine. // parsing engine.
$info = Mail_Parse::splitHeaders($mailinfo['header']); $info = Mail_Parse::splitHeaders($mailinfo['header']);
//make sure reply-to headers are correctly formatted
if ($mailinfo['reply-to'] && !Validator::is_email($mailinfo['reply-to']) && $info['Reply-To']) {
$replyto = Mail_Parse::parseAddressList($info['Reply-To']);
if ($replyto[0]) {
$mailinfo['reply-to'] = sprintf('%s@%s', $replyto[0]->mailbox, $replyto[0]->host);
$mailinfo['reply-to-name'] = $replyto[0]->personal;
} else {
$mailinfo['reply-to'] = null;
}
}
if (strtolower($info['Content-Type']) == 'message/rfc822') { if (strtolower($info['Content-Type']) == 'message/rfc822') {
if ($wrapped = $this->getPart($mid, 'message/rfc822')) { if ($wrapped = $this->getPart($mid, 'message/rfc822')) {
require_once INCLUDE_DIR.'api.tickets.php'; require_once INCLUDE_DIR.'api.tickets.php';
......
...@@ -6,7 +6,7 @@ $signin_url = ROOT_PATH . "login.php" ...@@ -6,7 +6,7 @@ $signin_url = ROOT_PATH . "login.php"
$signout_url = ROOT_PATH . "logout.php?auth=".$ost->getLinkToken(); $signout_url = ROOT_PATH . "logout.php?auth=".$ost->getLinkToken();
header("Content-Type: text/html; charset=UTF-8"); header("Content-Type: text/html; charset=UTF-8");
header("Content-Security-Policy: frame-ancestors '".$cfg->getAllowIframes()."';"); header("Content-Security-Policy: frame-ancestors ".$cfg->getAllowIframes().";");
if (($lang = Internationalization::getCurrentLanguage())) { if (($lang = Internationalization::getCurrentLanguage())) {
$langs = array_unique(array($lang, $cfg->getPrimaryLanguage())); $langs = array_unique(array($lang, $cfg->getPrimaryLanguage()));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment