erroneous file naming. I tried to emulate this mindset.
Added line length and EOL char for file chunking. For some reason without
it there were extra line feeds in the chunked file.
+
+ * Lots of fixes for FA
*/
class email
var $bcc = array();
var $attachment = array();
var $boundary = "";
- var $header = "";
+ var $headers = array();
var $subject = "";
var $body = "";
var $charset = 'ISO-8859-1';
+ var $add_params = "";
- function email($name, $mail)
+ function __construct($name, $mail)
{
$this->boundary = md5(uniqid(time()));
- $this->header = "From: $name <$mail>\n";
+ $this->headers['From'] = $this->encode($name)." <$mail>";
+
+ $bcc = get_company_pref('bcc_email');
+ if ($bcc)
+ $this->bcc[] = $bcc;
+ }
+
+ function encode($txt)
+ {
+
+ $opts = array('input-charset' => $_SESSION['language']->encoding,
+ 'output-charest' => 'utf-8', // utf-8 works always nowadays
+ 'line-length'=> 72,
+ 'linebreak-chars'=>'\n',
+ 'scheme' => 'Q',
+ );
+ return substr(iconv_mime_encode('', $txt, $opts), 2);
}
- function to($mail)
+ //
+ // For backward compatibility in extensions address can be passed
+ // in $name in form: '"full name" <adr@host>'.
+ // Don't use this form unless all the mail addresses are encoded in ASCII
+ //
+ function to($name, $mail='')
{
- $this->to[] = $mail;
+ $this->to[] = $mail=='' ? $name : ($this->encode($name)." <$mail>");
}
- function cc($mail)
+ function cc($name, $mail='')
{
- $this->cc[] = $mail;
+ $this->cc[] = $mail=='' ? $name : ($this->encode($name)." <$mail>");
}
- function bcc($mail)
+ function bcc($name='', $mail='')
{
- $this->bcc[] = $mail;
+ $this->bcc[] = $mail=='' ? $name : ($this->encode($name)." <$mail>");
}
- function attachment($file)
+ function attachment($file, $filename=null)
{
- $this->attachment[] = $file;
+ if (!isset($filename))
+ $filename = $file;
+ $this->attachment[$filename] = $file;
}
function subject($subject)
{
- $this->subject = $subject;
+ $this->subject = $this->encode($subject);
}
function text($text)
{
- $this->body = "Content-Type: text/plain; charset=\"{$this->charset}\"\n";
- $this->body .= "Content-Transfer-Encoding: 8bit\n";
+ $this->body = "--$this->boundary\n";
+ $this->body .= "Content-Type: text/plain; charset=\"{$this->charset}\"\n";
+ $this->body .= "Content-Transfer-Encoding: 8bit\n\n";
$this->body .= $text."\n";
}
function html($html)
{
- $this->body = "Content-Type: text/html; charset=\"{$this->charset}\"\n";
- $this->body .= "Content-Transfer-Encoding: quoted-printable\n";
+ $this->body = "--$this->boundary\n";
+ $this->body .= "Content-Type: text/html; charset=\"{$this->charset}\"\n";
+ $this->body .= "Content-Transfer-Encoding: quoted-printable\n\n";
$this->body .= "<html><body>\n".$html."\n</body></html>\n";
}
if ($filename == $file . '.zip') return 'application/x-zip-compressed';
$file = basename($filename, '.pdf');
if ($filename == $file . '.pdf') return 'application/pdf';
+ $file = basename($filename, '.xls');
+ if ($filename == $file . '.xls') return 'application/vnd.ms-excel';
$file = basename($filename, '.csv');
if ($filename == $file . '.csv') return 'application/vnd.ms-excel';
$file = basename($filename, '.tar');
if ($filename == $file . '.tgz') return 'application/x-tar-gz';
$file = basename($filename, '.gz');
if ($filename == $file . '.gz') return 'application/x-gzip';
+ $file = basename($filename, '.html');
+ if ($filename == $file . '.html') return 'text/html';
return 'application/unknown';
}
function send()
{
- // CC Empfänger hinzufügen
- $max = count($this->cc);
- if ($max > 0)
- {
- $this->header .= "Cc: ".$this->cc[0];
- for ($i = 1; $i < $max; $i++)
- {
- $this->header .= ", ".$this->cc[$i];
- }
- $this->header .= "\n";
- }
- // BCC Empfänger hinzufügen
- $max = count($this->bcc);
- if ($max > 0)
- {
- $this->header .= "Bcc: ".$this->bcc[0];
- for ($i = 1; $i < $max; $i++)
- {
- $this->header .= ", ".$this->bcc[$i];
- }
- $this->header .= "\n";
- }
- $this->header .= "MIME-Version: 1.0\n";
- $this->header .= "Content-Type: multipart/mixed;\n boundary=\"$this->boundary\"\n";
- $this->header .= "This is a multi-part message in MIME format.\n";
- $this->header .= "--$this->boundary\n";
- $this->header .= $this->content_type;
-
- // Attachment hinzufügen
- $max = count($this->attachment);
- if ($max > 0)
+ // Add CC Recipients
+ if (!empty($this->cc))
+ $this->headers['Cc'] = implode(", ", $this->cc);
+
+ // Add BCC Recipients
+ if (!empty($this->bcc))
+ $this->headers['Bcc'] = implode(", ", $this->bcc);
+ $this->headers['Content-Type'] = "multipart/mixed;\n boundary=\"$this->boundary\"";
+
+ // Add Attachments
+ if (!empty($this->attachment))
{
- for ($i = 0; $i < $max; $i++)
+ foreach ($this->attachment as $filename => $fname)
{
- $file = fread(fopen($this->attachment[$i], "r"), filesize($this->attachment[$i]));
+ $file = fread(fopen($fname, "r"), filesize($fname));
$this->body .= "--".$this->boundary."\n";
- $this->body .= "Content-Type: " .$this->mime_type(basename($this->attachment[$i])). "; name=\"".basename($this->attachment[$i])."\"\n";
+ $this->body .= "Content-Type: " .$this->mime_type(basename($filename)). "; name=\"".basename($fname)."\"\n";
$this->body .= "Content-Transfer-Encoding: base64\n";
- $this->body .= "Content-Disposition: attachment; filename=\"".basename($this->attachment[$i])."\"\n\n";
+ $this->body .= "Content-Disposition: attachment; filename=\"".$filename."\"\n\n";
$this->body .= chunk_split(base64_encode($file),"72","\n");
- $file = "";
}
}
- $this->body .= "--".$this->boundary."--\n";
+ $this->body .= "--".$this->boundary."--\n";
+ $ret = 0;
foreach($this->to as $mail)
{
- $ret = mail($mail, $this->subject, $this->body, $this->header);
+ if (mail($mail, $this->subject, $this->body, $this->headers, $this->add_params))
+ $ret++;
}
return $ret;
}
}
-?>
\ No newline at end of file
projects / fa-stable.git / blobdiff