$ff = HTML_FlexyFramework::get();
$http_host = isset($_SERVER["HTTP_HOST"]) ? $_SERVER["HTTP_HOST"] : 'pman.HTTP_HOST.not.set';
- if (isset($ff->Pman['HTTP_HOST'])) {
+ if (isset($ff->Pman['HTTP_HOST']) && $http_host != 'localhost') {
$http_host = $ff->Pman['HTTP_HOST'];
}
'Subject: ' . @$email['headers']['Subject']
);
} else {
- $pg->addEvent("COREMAILER-FAIL", false, $ret->toString());
+ $pg->addEvent("COREMAILER-FAIL", false,
+ "Sending to : " . ( is_array($rcpts) ? implode(', ', $rcpts) : $rcpts ) .
+ " Error: " . $ret->toString());
+
}
return $ret;
if(!array_key_exists($url, $urls)){
$conv = $this->fetchImage($url);
+ $urls[$url] = $conv;
$this->images[$conv['contentid']] = $conv;
} else {
$conv = $urls[$url];
}
-
+ $img->setAttribute('origsrc', $url);
$img->setAttribute('src', 'cid:' . $conv['contentid']);
}
- /*
- foreach ($imgs as $i=>$img) {
- $url = $img->getAttribute('src');
- if (preg_match('#^cid:#', $url)) {
- continue;
- }
- $me = $img->getAttribute('mailembed');
- if ($me == 'no') {
- continue;
- }
-
- $conv = $this->fetchImage($url);
- $this->images[$conv['contentid']] = $conv;
-
- $img->setAttribute('src', 'cid:' . $conv['contentid']);
- }
- *
- */
return $dom->saveHTML();
-
-
}
function htmlbodyCssEmbed($html)
{
@$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
$body = $dom->getElementsByTagName('body');
+ if (!empty($body->length)) {
+ $body->item(0)->setAttribute('class', $cls);
+ } else {
+ $body = $dom->createElement("body");
+ $body->setAttribute('class', $cls);
+ $dom->appendChild($body);
+ }
- $class = $dom->createAttribute('class');
- $class->value = $cls;
- $body->item(0)->appendChild($class);
return $dom->saveHTML();
}
function mapurl($in)
{
-
- foreach($this->urlmap as $o=>$n) {
+ foreach($this->urlmap as $o=>$n) {
if (strpos($in,$o) === 0) {
$ret =$n . substr($in,strlen($o));
$this->log("mapURL in $in = $ret");