projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more quote identeiifers fixessss
[Pman.Core]
/
Mailer.php
diff --git
a/Mailer.php
b/Mailer.php
index
ef82bed
..
7da09a8
100644
(file)
--- a/
Mailer.php
+++ b/
Mailer.php
@@
-122,7
+122,7
@@
class Pman_Core_Mailer {
$ff = HTML_FlexyFramework::get();
$http_host = isset($_SERVER["HTTP_HOST"]) ? $_SERVER["HTTP_HOST"] : 'pman.HTTP_HOST.not.set';
$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'];
}
$http_host = $ff->Pman['HTTP_HOST'];
}
@@
-321,14
+321,8
@@
class Pman_Core_Mailer {
$pg = $ff->page;
$pg = $ff->page;
- $ts = microtime(true);
-
$email = is_array($email) ? $email : $this->toData();
$email = is_array($email) ? $email : $this->toData();
- $diff = microtime(true) - $ts;
-
- print_r($diff);exit;
-
if (is_a($email, 'PEAR_Error')) {
$pg->addEvent("COREMAILER-FAIL", false, "email toData failed");
if (is_a($email, 'PEAR_Error')) {
$pg->addEvent("COREMAILER-FAIL", false, "email toData failed");
@@
-379,7
+373,10
@@
class Pman_Core_Mailer {
'Subject: ' . @$email['headers']['Subject']
);
} else {
'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;
}
return $ret;
@@
-392,6
+389,8
@@
class Pman_Core_Mailer {
@$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
$imgs= $dom->getElementsByTagName('img');
@$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
$imgs= $dom->getElementsByTagName('img');
+ $urls = array();
+
foreach ($imgs as $i=>$img) {
$url = $img->getAttribute('src');
if (preg_match('#^cid:#', $url)) {
foreach ($imgs as $i=>$img) {
$url = $img->getAttribute('src');
if (preg_match('#^cid:#', $url)) {
@@
-402,16
+401,19
@@
class Pman_Core_Mailer {
continue;
}
continue;
}
- $conv = $this->fetchImage($url);
- $this->images[$conv['contentid']] = $conv;
-
+ 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']);
$img->setAttribute('src', 'cid:' . $conv['contentid']);
-
-
}
}
- return $dom->saveHTML();
+ return $dom->saveHTML();
}
function htmlbodyCssEmbed($html)
}
function htmlbodyCssEmbed($html)
@@
-505,10
+507,14
@@
class Pman_Core_Mailer {
@$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
$body = $dom->getElementsByTagName('body');
@$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();
}
return $dom->saveHTML();
}