Commit b0191fc0 authored by mcramer's avatar mcramer
Browse files

Bugfix: Attachments were not cleaned up on finish() call of mail class (next...

Bugfix: Attachments were not cleaned up on finish() call of mail class (next recipient gets all attachments, too)
Update: some import tests for plesk
parent c8ccbfb4
......@@ -461,10 +461,10 @@ public function toLower($record) {
function tableInfo($table_name) {
global $go_api,$go_info;
global $go_api,$go_info,$app;
// Tabellenfelder einlesen
if($rows = $go_api->db->queryAllRecords('SHOW FIELDS FROM '.$table_name)){
if($rows = $app->db->queryAllRecords('SHOW FIELDS FROM '.$table_name)){
foreach($rows as $row) {
$name = $row[0];
$default = $row[4];
......
......@@ -41,7 +41,10 @@ class fakeserver {
}
public function getFault() {
return $this->faultMessage . ' (' . $this->faultText . ')';
$ret = $this->faultMessage . ' (' . $this->faultText . ')';
$this->faultMessage = null;
$this->faultText = null;
return $ret;
}
}
......
......@@ -560,6 +560,25 @@ class ispcmail {
*/
public function finish() {
if($this->use_smtp == true) $this->_smtp_close();
$rand = md5(microtime());
$this->mime_boundary = '==Multipart_Boundary_x' . $rand . 'x';
$this->headers = array();
$this->attachments = array();
$this->text_part = '';
$this->html_part = '';
$this->headers['MIME-Version'] = '1.0';
$this->smtp_helo = '';
$this->smtp_host = '';
$this->smtp_port = '';
$this->smtp_user = '';
$this->smtp_pass = '';
$this->use_smtp = false;
$this->smtp_crypt = false;
$this->mail_charset = 'UTF-8';
return;
}
}
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment