mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 06:38:00 +02:00
Code Issues Releases Wiki Activity

Added debug info and FIXME comment

Browse Source
This commit is contained in:
CaMer0n
2010-01-04 10:14:48 +00:00
parent 9ab38eed44
commit 553fa3e38d
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
e107_handlers/mail.php
View File

@@ -9,8 +9,8 @@
* e107 Main * e107 Main
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/mail.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/mail.php,v $
* $Revision: 1.21 $ * $Revision: 1.22 $
* $Date: 2009-12-27 11:25:18 $ * $Date: 2010-01-04 10:14:48 $
* $Author: e107coders $ * $Author: e107coders $
*/ */
@@ -673,6 +673,7 @@ class e107Email extends PHPMailer
*/ */
public function MsgHTML($message, $basedir = '') public function MsgHTML($message, $basedir = '')
{ {
global $_E107;
preg_match_all("/(src|background)=([\"\'])(.*)\\2/Ui", $message, $images); // Modified to accept single quotes as well preg_match_all("/(src|background)=([\"\'])(.*)\\2/Ui", $message, $images); // Modified to accept single quotes as well
if(isset($images[3])) if(isset($images[3]))
{ {
@@ -685,11 +686,18 @@ class e107Email extends PHPMailer
$filename = basename($url); $filename = basename($url);
$directory = dirname($url); $directory = dirname($url);
if ($directory == '.') $directory=''; if ($directory == '.') $directory='';
if (strpos($directory, e_HTTP) === 0) if (strpos($directory, e_HTTP) === 0)
{ {
$directory = str_replace(e_HTTP, '', $directory); // $directory = str_replace(e_HTTP, '', $directory); // FIXME - if e_HTTP == '/' - breaks full path;
$basedir = e_ROOT; // $basedir = e_ROOT;
} }
if(vartrue($_E107['debug']))
{
$message .= " -- Debug Info --<br />";
$message .= "CID file <b>{$filename}</b> in <b>{$directory}</b>.<br />Base = ".e_HTTP."<br />BaseDir = {$basedir}<br />";
}
//echo "CID file {$filename} in {$directory}. Base = ".e_HTTP." BaseDir = {$basedir}<br />"; //echo "CID file {$filename} in {$directory}. Base = ".e_HTTP." BaseDir = {$basedir}<br />";
$cid = 'cid:' . md5($filename); $cid = 'cid:' . md5($filename);
$ext = pathinfo($filename, PATHINFO_EXTENSION); $ext = pathinfo($filename, PATHINFO_EXTENSION);