From 3e559d2fdaa2f665524819aee6c6364787708b90 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 24 Nov 2014 23:38:37 +0000 Subject: [PATCH] replacing PHPMailer with Horde_Mime_Mail and Horde_Mail_Transport_Smtphorde to overcome memory limit when sending mails --- mail/inc/class.mail_compose.inc.php | 314 ++- phpgwapi/inc/class.egw_mailer.inc.php | 587 ++++-- phpgwapi/inc/class.phpmailer.inc.php | 2534 ------------------------ phpgwapi/inc/class.smtp.php | 840 -------- phpgwapi/inc/common_functions.inc.php | 8 +- phpgwapi/lang/phpmailer.lang-ar.php | 27 - phpgwapi/lang/phpmailer.lang-br.php | 26 - phpgwapi/lang/phpmailer.lang-ca.php | 26 - phpgwapi/lang/phpmailer.lang-ch.php | 26 - phpgwapi/lang/phpmailer.lang-cz.php | 25 - phpgwapi/lang/phpmailer.lang-de.php | 25 - phpgwapi/lang/phpmailer.lang-dk.php | 26 - phpgwapi/lang/phpmailer.lang-es.php | 26 - phpgwapi/lang/phpmailer.lang-et.php | 26 - phpgwapi/lang/phpmailer.lang-fi.php | 27 - phpgwapi/lang/phpmailer.lang-fo.php | 27 - phpgwapi/lang/phpmailer.lang-fr.php | 25 - phpgwapi/lang/phpmailer.lang-hu.php | 25 - phpgwapi/lang/phpmailer.lang-it.php | 27 - phpgwapi/lang/phpmailer.lang-ja.php | 26 - phpgwapi/lang/phpmailer.lang-nl.php | 25 - phpgwapi/lang/phpmailer.lang-no.php | 25 - phpgwapi/lang/phpmailer.lang-pl.php | 25 - phpgwapi/lang/phpmailer.lang-ro.php | 27 - phpgwapi/lang/phpmailer.lang-ru.php | 25 - phpgwapi/lang/phpmailer.lang-se.php | 26 - phpgwapi/lang/phpmailer.lang-tr.php | 27 - phpgwapi/lang/phpmailer.lang-zh.php | 26 - phpgwapi/lang/phpmailer.lang-zh_cn.php | 26 - 29 files changed, 579 insertions(+), 4326 deletions(-) delete mode 100644 phpgwapi/inc/class.phpmailer.inc.php delete mode 100644 phpgwapi/inc/class.smtp.php delete mode 100644 phpgwapi/lang/phpmailer.lang-ar.php delete mode 100644 phpgwapi/lang/phpmailer.lang-br.php delete mode 100644 phpgwapi/lang/phpmailer.lang-ca.php delete mode 100644 phpgwapi/lang/phpmailer.lang-ch.php delete mode 100644 phpgwapi/lang/phpmailer.lang-cz.php delete mode 100644 phpgwapi/lang/phpmailer.lang-de.php delete mode 100644 phpgwapi/lang/phpmailer.lang-dk.php delete mode 100644 phpgwapi/lang/phpmailer.lang-es.php delete mode 100644 phpgwapi/lang/phpmailer.lang-et.php delete mode 100644 phpgwapi/lang/phpmailer.lang-fi.php delete mode 100644 phpgwapi/lang/phpmailer.lang-fo.php delete mode 100644 phpgwapi/lang/phpmailer.lang-fr.php delete mode 100644 phpgwapi/lang/phpmailer.lang-hu.php delete mode 100644 phpgwapi/lang/phpmailer.lang-it.php delete mode 100644 phpgwapi/lang/phpmailer.lang-ja.php delete mode 100644 phpgwapi/lang/phpmailer.lang-nl.php delete mode 100644 phpgwapi/lang/phpmailer.lang-no.php delete mode 100644 phpgwapi/lang/phpmailer.lang-pl.php delete mode 100644 phpgwapi/lang/phpmailer.lang-ro.php delete mode 100644 phpgwapi/lang/phpmailer.lang-ru.php delete mode 100644 phpgwapi/lang/phpmailer.lang-se.php delete mode 100644 phpgwapi/lang/phpmailer.lang-tr.php delete mode 100644 phpgwapi/lang/phpmailer.lang-zh.php delete mode 100644 phpgwapi/lang/phpmailer.lang-zh_cn.php diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php index 18b6edbec8..654d1b0022 100644 --- a/mail/inc/class.mail_compose.inc.php +++ b/mail/inc/class.mail_compose.inc.php @@ -124,16 +124,16 @@ class mail_compose { $sigPref = array(); } - // split mailaccount (acc_id) and signature (ident_id) + // split mailaccount (acc_id) and identity (ident_id) if ($_content && isset($_content['mailaccount'])) { - list($_content['mailaccount'], $_content['signatureid']) = explode(':', $_content['mailaccount']); + list($_content['mailaccount'], $_content['mailidentity']) = explode(':', $_content['mailaccount']); } //error_log(__METHOD__.__LINE__.array2string($sigPref)); //lang('compose'),lang('from') // needed to be found by translationtools //error_log(__METHOD__.__LINE__.array2string($_REQUEST).function_backtrace()); //error_log(__METHOD__.__LINE__.array2string($_content).function_backtrace()); - $_contentHasSigID = array_key_exists('signatureid',(array)$_content); + $_contentHasSigID = array_key_exists('mailidentity',(array)$_content); $_contentHasMimeType = array_key_exists('mimeType',(array)$_content); if (isset($_GET['reply_id'])) $replyID = $_GET['reply_id']; if (!$replyID && isset($_GET['id'])) $replyID = $_GET['id']; @@ -298,9 +298,9 @@ class mail_compose $sendOK=false; $message = $this->errorInfo; } - if (!empty($_content['signatureid']) && $_content['signatureid'] != $sigPref[$this->mail_bo->profileID]) + if (!empty($_content['mailidentity']) && $_content['mailidentity'] != $sigPref[$this->mail_bo->profileID]) { - $sigPref[$this->mail_bo->profileID]=$_content['signatureid']; + $sigPref[$this->mail_bo->profileID]=$_content['mailidentity']; $GLOBALS['egw']->preferences->add('mail','LastSignatureIDUsed',$sigPref,'user'); // save prefs $GLOBALS['egw']->preferences->save_repository(true); @@ -448,7 +448,7 @@ class mail_compose // identity and signatureid; this might trigger that the signature in mail body may have to be altered if ( !empty($content['body']) && (!empty($composeCache['mailaccount']) && !empty($_content['mailaccount']) && $_content['mailaccount'] != $composeCache['mailaccount']) || - (!empty($composeCache['signatureid']) && !empty($_content['signatureid']) && $_content['signatureid'] != $composeCache['signatureid']) + (!empty($composeCache['mailidentity']) && !empty($_content['mailidentity']) && $_content['mailidentity'] != $composeCache['mailidentity']) ) { $buttonClicked = true; @@ -469,8 +469,8 @@ class mail_compose if ($newSig === false) $newSig = -2; } } - $_oldSig = $composeCache['signatureid']; - $_signatureid = ($newSig?$newSig:$_content['signatureid']); + $_oldSig = $composeCache['mailidentity']; + $_signatureid = ($newSig?$newSig:$_content['mailidentity']); $_currentMode = $_content['mimeType']; if ($_oldSig != $_signatureid) { @@ -534,7 +534,7 @@ class mail_compose unset($rep, $in); if ($replaced) { - $content['signatureid'] = $_content['signatureid'] = $presetSig = $_signatureid; + $content['mailidentity'] = $_content['mailidentity'] = $presetSig = $_signatureid; $found = false; // this way we skip further replacement efforts } else @@ -569,24 +569,13 @@ class mail_compose } else { - $content['signatureid'] = $_content['signatureid'] = $presetSig = $_signatureid; + $content['mailidentity'] = $_content['mailidentity'] = $presetSig = $_signatureid; } if ($styles) { //error_log($styles); $content['body'] = $styles.$content['body']; } - /* - if ($_currentMode == 'html') - { - $_content = utf8_decode($_content); - } - - $escaped = utf8_encode(str_replace(array("'", "\r", "\n"), array("\\'", "\\r", "\\n"), $_content)); - //error_log(__METHOD__.$escaped); - if ($_currentMode == 'html') - else - */ } } @@ -902,22 +891,22 @@ class mail_compose { $presetSig = (strtolower($_REQUEST['signature']) == 'no' ? -2 : -1); } - if (($suppressSigOnTop || $content['isDraft']) && !empty($content['signatureid'])) $presetSig = (int)$content['signatureid']; + if (($suppressSigOnTop || $content['isDraft']) && !empty($content['mailidentity'])) $presetSig = (int)$content['mailidentity']; //if (($suppressSigOnTop || $content['isDraft']) && !empty($content['stationeryID'])) $presetStationery = $content['stationeryID']; $presetId = NULL; if (($suppressSigOnTop || $content['isDraft']) && !empty($content['mailaccount'])) $presetId = (int)$content['mailaccount']; - if (!empty($sigPref[$this->mail_bo->profileID]) && (empty($presetSig) || $presetSig==-1 || empty($content['signatureid']) || $content['signatureid']==-1)) $presetSig=$sigPref[$this->mail_bo->profileID]; + if (!empty($sigPref[$this->mail_bo->profileID]) && (empty($presetSig) || $presetSig==-1 || empty($content['mailidentity']) || $content['mailidentity']==-1)) $presetSig=$sigPref[$this->mail_bo->profileID]; // fetch the signature, prepare the select box, ... - if (empty($content['signatureid'])) { - $content['signatureid'] = $acc['ident_id']; + if (empty($content['mailidentity'])) { + $content['mailidentity'] = $acc['ident_id']; } $disableRuler = false; - //_debug_array(($presetSig ? $presetSig : $content['signatureid'])); + //_debug_array(($presetSig ? $presetSig : $content['mailidentity'])); try { - $signature = emailadmin_account::read_identity(($presetSig ? $presetSig : $content['signatureid']),true); + $signature = emailadmin_account::read_identity(($presetSig ? $presetSig : $content['mailidentity']),true); } catch (Exception $e) { @@ -1013,11 +1002,6 @@ class mail_compose } } //error_log(__METHOD__.__LINE__.array2string($content)); - if($content['mimeType'] == 'html') { - $ishtml=1; - } else { - $ishtml=0; - } // get identities of all accounts as "$acc_id:$ident_id" => $identity $sel_options['mailaccount'] = $identities = array(); @@ -1032,7 +1016,7 @@ class mail_compose } // signature stuff set earlier - if ($presetSig) $content['signatureid'] = $presetSig; + if ($presetSig) $content['mailidentity'] = $presetSig; // end signature stuff //$content['bcc'] = array('kl@stylite.de','kl@leithoff.net'); @@ -1069,7 +1053,7 @@ class mail_compose if ($_content) { //input array of _content had no signature information but was seeded later, and content has a valid setting - if (!$_contentHasSigID && $content['signatureid'] && array_key_exists('signatureid',$_content)) unset($_content['signatureid']); + if (!$_contentHasSigID && $content['mailidentity'] && array_key_exists('mailidentity',$_content)) unset($_content['mailidentity']); $content = array_merge($content,$_content); if (!empty($content['folder'])) $sel_options['folder']=$this->ajax_searchFolder(0,true); @@ -1169,8 +1153,8 @@ class mail_compose $content['mimeType']=0; } - // join mailaccount and signatureid together again - $content['mailaccount'] .= ':'.$content['signatureid']; + // join again mailaccount and identity + $content['mailaccount'] .= ':'.$content['mailidentity']; //error_log(__METHOD__.__LINE__.array2string($content)); $etpl->exec('mail.mail_compose.compose',$content,$sel_options,array(),$preserv,2); @@ -1372,12 +1356,12 @@ class mail_compose if ($mail_bo->folderExists($val)) $this->sessionData['folder'][] = $val; } } - if (!empty($addHeadInfo['X-SIGNATURE'])) { + if (!empty($addHeadInfo['X-MAILIDENTITY'])) { // with the new system it would be the identity try { - emailadmin_account::read_identity($addHeadInfo['X-SIGNATURE']); - $this->sessionData['signatureid'] = $addHeadInfo['X-SIGNATURE']; + emailadmin_account::read_identity($addHeadInfo['X-MAILIDENTITY']); + $this->sessionData['mailidentity'] = $addHeadInfo['X-MAILIDENTITY']; } catch (Exception $e) { @@ -1388,12 +1372,12 @@ class mail_compose $this->sessionData['stationeryID'] = $addHeadInfo['X-STATIONERY']; } */ - if (!empty($addHeadInfo['X-IDENTITY'])) { + if (!empty($addHeadInfo['X-MAILACCOUNT'])) { // with the new system it would the identity is the account id try { - emailadmin_account::read($addHeadInfo['X-IDENTITY']); - $this->sessionData['mailaccount'] = $addHeadInfo['X-IDENTITY']; + emailadmin_account::read($addHeadInfo['X-MAILACCOUNT']); + $this->sessionData['mailaccount'] = $addHeadInfo['X-MAILACCOUNT']; } catch (Exception $e) { @@ -2015,83 +1999,59 @@ class mail_compose function createMessage(egw_mailer $_mailObject, array $_formData, array $_identity, $_convertLinks=false) { $mail_bo = $this->mail_bo; - $_mailObject->PluginDir = EGW_SERVER_ROOT."/phpgwapi/inc/"; $activeMailProfile = emailadmin_account::read($this->mail_bo->profileID); - $_mailObject->IsSMTP(); - // we make sure the message ID is set here, that way, we make sure its not created on the fly upon header creation - $host = self::_getHostName(); - if (empty($_mailObject->MessageID)) $_mailObject->MessageID = '<'.md5(uniqid(time())).'@'.trim($host?$host:'localhost').'>'; - $_mailObject->CharSet = $this->displayCharset; // you need to set the sender, if you work with different identities, since most smtp servers, dont allow // sending in the name of someone else if ($_identity['ident_id'] != $activeMailProfile['ident_id'] && !empty($_identity['ident_email']) && strtolower($activeMailProfile['ident_email']) != strtolower($_identity['ident_email'])) { error_log(__METHOD__.__LINE__.' Faking From/SenderInfo for '.$activeMailProfile['ident_email'].' with ID:'.$activeMailProfile['ident_id'].'. Identitiy to use for sending:'.array2string($_identity)); } - $_mailObject->Sender = (!empty($_identity['ident_email'])? $_identity['ident_email'] : $activeMailProfile['ident_email']); - $_mailObject->From = $_identity['ident_email']; - $_mailObject->FromName = $_mailObject->EncodeHeader(mail_bo::generateIdentityString($_identity,false)); + $_mailObject->setFrom($_identity['ident_email'] ? $_identity['ident_email'] : $activeMailProfile['ident_email'], + mail_bo::generateIdentityString($_identity,false)); - $_mailObject->Priority = $_formData['priority']; - $_mailObject->Encoding = 'quoted-printable'; - $_mailObject->AddCustomHeader('X-Mailer: EGroupware-Mail'); + $_mailObject->addHeader('X-Priority', $_formData['priority']); + $_mailObject->addHeader('X-Mailer', 'EGroupware-Mail'); if(!empty($_formData['in-reply-to'])) { if (stripos($_formData['in-reply-to'],'<')===false) $_formData['in-reply-to']='<'.trim($_formData['in-reply-to']).'>'; - //error_log(__METHOD__.__LINE__.'$_mailObject->AddCustomHeader(In-Reply-To: '. $_formData['in-reply-to'].")"); - $_mailObject->AddCustomHeader('In-Reply-To: '. $_formData['in-reply-to']); + //error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(In-Reply-To', $_formData['in-reply-to'].")"); + $_mailObject->addHeader('In-Reply-To', $_formData['in-reply-to']); } if(!empty($_formData['references'])) { if (stripos($_formData['references'],'<')===false) $_formData['references']='<'.trim($_formData['references']).'>'; - //error_log(__METHOD__.__LINE__.'$_mailObject->AddCustomHeader(References: '. $_formData['references'].")"); - $_mailObject->AddCustomHeader('References: '. $_formData['references']); + //error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(References', $_formData['references'].")"); + $_mailObject->addHeader('References', $_formData['references']); } if(!empty($_formData['thread-topic'])) { - //error_log(__METHOD__.__LINE__.'$_mailObject->AddCustomHeader(Tread-Topic: '. $_formData['thread-topic'].")"); - $_mailObject->AddCustomHeader('Thread-Topic: '. $_formData['thread-topic']); + //error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(Tread-Topic', $_formData['thread-topic'].")"); + $_mailObject->addHeader('Thread-Topic', $_formData['thread-topic']); } if(!empty($_formData['thread-index'])) { - //error_log(__METHOD__.__LINE__.'$_mailObject->AddCustomHeader(Tread-Index: '. $_formData['thread-index'].")"); - $_mailObject->AddCustomHeader('Thread-Index: '. $_formData['thread-index']); + //error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(Tread-Index', $_formData['thread-index'].")"); + $_mailObject->addHeader('Thread-Index', $_formData['thread-index']); } if(!empty($_formData['list-id'])) { - //error_log(__METHOD__.__LINE__.'$_mailObject->AddCustomHeader(List-Id: '. $_formData['list-id'].")"); - $_mailObject->AddCustomHeader('List-Id: '. $_formData['list-id']); + //error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(List-Id', $_formData['list-id'].")"); + $_mailObject->addHeader('List-Id', $_formData['list-id']); } //error_log(__METHOD__.__LINE__.' notify to:'.$_identity['ident_email'].'->'.array2string($_formData)); if($_formData['disposition']=='on') { - $_mailObject->AddCustomHeader('Disposition-Notification-To: '. $_identity['ident_email']); + $_mailObject->addHeader('Disposition-Notification-To', $_identity['ident_email']); } if(!empty($_identity->organization) && (mail_bo::$mailConfig['how2displayIdentities'] == '' || mail_bo::$mailConfig['how2displayIdentities'] == 'orgNemail')) { - #$_mailObject->AddCustomHeader('Organization: '. $mail_bo->encodeHeader($_identity->organization, 'q')); - $_mailObject->AddCustomHeader('Organization: '. $_identity['ident_org']); + $_mailObject->addHeader('Organization', $_identity['ident_org']); } // Expand any mailing lists - foreach(array( - 'to' => 'AddAddress', - 'cc' => 'AddCC', - 'bcc' => 'AddBCC', - 'replyto' => 'AddReplyto') as $field => $method) + foreach(array('to', 'cc', 'bcc', 'replyto') as $field) { if ($field != 'replyto') $_formData[$field] = self::resolveEmailAddressList($_formData[$field]); - foreach((array)$_formData[$field] as $address) - { - foreach(emailadmin_imapbase::parseAddressList($address) as $addressObject) { - if (!$addressObject->valid) continue; - $_emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''); - $emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$mail_bo->idna2->encode($addressObject->host) : ''); - $_mailObject->$method($emailAddress, str_replace(array('@'),' ',($addressObject->personal?$addressObject->personal:$_emailAddress))); - } - } + if ($_formData[$field]) $_mailObject->addAddress($_formData[$field], '', $field); } - //$_mailObject->WordWrap = 76; // as we break lines ourself, we will not need/use the buildin WordWrap - #$_mailObject->Subject = $mail_bo->encodeHeader($_formData['subject'], 'q'); - $_mailObject->Subject = $_formData['subject']; - #$realCharset = mb_detect_encoding($_formData['body'] . 'a' , strtoupper($this->displayCharset).',UTF-8, ISO-8859-1'); - #error_log("bocompose::createMessage:".$realCharset); + $_mailObject->addHeader('Subject', $_formData['subject']); + // this should never happen since we come from the edit dialog if (mail_bo::detect_qp($_formData['body'])) { //error_log("Error: bocompose::createMessage found QUOTED-PRINTABLE while Composing Message. Charset:$realCharset Message:".print_r($_formData['body'],true)); @@ -2119,40 +2079,42 @@ class mail_compose $signature = mail_bo::merge($signature,array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id'))); } - if($_formData['mimeType'] =='html') { - $_mailObject->IsHTML(true); - if(!empty($signature)) { - $_mailObject->Body = $_formData['body'] . - ($disableRuler ?'
':'
'). - $signature; - $_mailObject->AltBody = $this->convertHTMLToText($_formData['body'],true,true). + if($_formData['mimeType'] == 'html') + { + $body = $_formData['body']; + if(!empty($signature)) + { + $body .= ($disableRuler ?'
':'
').$signature; + $_mailObject->setBody($this->convertHTMLToText($_formData['body'],true,true). ($disableRuler ?"\r\n":"\r\n-- \r\n"). - $this->convertHTMLToText($signature,true,true); - #print "
$_mailObject->AltBody
"; - } else { - $_mailObject->Body = $_formData['body']; - $_mailObject->AltBody = $this->convertHTMLToText($_formData['body'],true,true); + $this->convertHTMLToText($signature,true,true)); + } + else + { + $body = $_formData['body']; + $_mailObject->setBody($this->convertHTMLToText($_formData['body'],true,true)); } // convert URL Images to inline images - if possible - if ($_convertLinks) mail_bo::processURL2InlineImages($_mailObject, $_mailObject->Body); - if (strpos($_mailObject->Body,"")!==false) + if ($_convertLinks) mail_bo::processURL2InlineImages($_mailObject, $body); + if (strpos($body,"")!==false) { - $_mailObject->Body = str_replace(array('',''),'',$_mailObject->Body); + $body = str_replace(array('',''),'',$body); } + $_mailObject->setHtmlBody($body, null, false); // false = no automatic alternative, we called setBody() } else { - $_mailObject->IsHTML(false); - $_mailObject->Body = $this->convertHTMLToText($_formData['body'],false); + $body = $this->convertHTMLToText($_formData['body'],false); #$_mailObject->Body = $_formData['body']; if(!empty($signature)) { - $_mailObject->Body .= ($disableRuler ?"\r\n":"\r\n-- \r\n"). + $body .= ($disableRuler ?"\r\n":"\r\n-- \r\n"). $this->convertHTMLToText($signature,true,true); } + $_mailObject->setBody($body); } // add the attachments - $mail_bo->openConnection(); if (is_array($_formData) && isset($_formData['attachments'])) { + $connection_opened = false; //error_log(__METHOD__.__LINE__.array2string($_formData['attachments'])); $tnfattachments = null; foreach((array)$_formData['attachments'] as $attachment) { @@ -2168,6 +2130,11 @@ class mail_compose [size] => 622379 [folder] => INBOX)) */ + if (!$connection_opened) + { + $mail_bo->openConnection(); + $connection_opened = true; + } $mail_bo->reopen($attachment['folder']); switch($attachment['type']) { case 'MESSAGE/RFC822': @@ -2176,7 +2143,7 @@ class mail_compose $rawHeader = $mail_bo->getMessageRawHeader($attachment['uid'], $attachment['partID'],$attachment['folder']); } $rawBody = $mail_bo->getMessageRawBody($attachment['uid'], $attachment['partID'],$attachment['folder']); - $_mailObject->AddStringAttachment($rawHeader.$rawBody, $_mailObject->EncodeHeader($attachment['name']), '7bit', 'message/rfc822'); + $_mailObject->AddStringAttachment($rawHeader.$rawBody, $attachment['name'], '7bit', 'message/rfc822'); break; default: $attachmentData = $mail_bo->getAttachment($attachment['uid'], $attachment['partID'],0,false); @@ -2194,9 +2161,8 @@ class mail_compose } } } - $_mailObject->AddStringAttachment($attachmentData['attachment'], $_mailObject->EncodeHeader($attachment['name']), 'base64', $attachment['type']); + $_mailObject->AddStringAttachment($attachmentData['attachment'], $attachment['name'], 'base64', $attachment['type']); break; - } } else @@ -2210,25 +2176,17 @@ class mail_compose { $tmp_path = $GLOBALS['egw_info']['server']['temp_dir'].SEP.basename($attachment['file']); } - if (isset($attachment['type']) && stripos($attachment['type'],"text/calendar; method=")!==false ) - { - $_mailObject->AltExtended = file_get_contents($tmp_path); - $_mailObject->AltExtendedContentType = $attachment['type']; - } - else - { - $_mailObject->AddAttachment ( - $tmp_path, - $_mailObject->EncodeHeader($attachment['name']), - strtoupper($attachment['type'])=='MESSAGE/RFC822' ? '7bit' : 'base64', - $attachment['type'] - ); - } + $_mailObject->AddAttachment ( + $tmp_path, + $attachment['name'], + strtoupper($attachment['type'])=='MESSAGE/RFC822' ? '7bit' : 'base64', + $attachment['type'] + ); } } } + if ($connection_opened) $mail_bo->closeConnection(); } - $mail_bo->closeConnection(); } /** @@ -2248,9 +2206,9 @@ class mail_compose } $formData = array_merge($content, array( - 'isDrafted' => 1, - 'body' => $content['mail_'.($content['mimeType']?'htmltext':'plaintext')], - 'mimeType' => $content['mimeType']?'html':'plain' // checkbox has only true|false value + 'isDrafted' => 1, + 'body' => $content['mail_'.($content['mimeType']?'htmltext':'plaintext')], + 'mimeType' => $content['mimeType']?'html':'plain' // checkbox has only true|false value )); //Saving draft procedure @@ -2315,7 +2273,8 @@ class mail_compose static function resolveEmailAddressList($_emailAddressList) { $addrFromList=array(); - foreach((array)$_emailAddressList as $ak => $address) { + foreach((array)$_emailAddressList as $ak => $address) + { if(is_int($address)) { // List was selected, expand to addresses @@ -2348,12 +2307,12 @@ class mail_compose function saveAsDraft($_formData, &$savingDestination='') { $mail_bo = $this->mail_bo; - $mail = new egw_mailer(); + $mail = new egw_mailer($this->mail_bo->profileID); // preserve the bcc and if possible the save to folder information $this->sessionData['folder'] = $_formData['folder']; $this->sessionData['bcc'] = $_formData['bcc']; - $this->sessionData['signatureid'] = $_formData['signatureid']; + $this->sessionData['mailidentity'] = $_formData['mailidentity']; //$this->sessionData['stationeryID'] = $_formData['stationeryID']; $this->sessionData['mailaccount'] = $_formData['mailaccount']; $this->sessionData['attachments'] = $_formData['attachments']; @@ -2369,25 +2328,18 @@ class mail_compose } $flags = '\\Seen \\Draft'; - $BCCmail = ''; $this->createMessage($mail, $_formData, $identity); - $this->sessionData['bcc'] = self::resolveEmailAddressList($this->sessionData['bcc']); - foreach((array)$this->sessionData['bcc'] as $address) { - foreach(emailadmin_imapbase::parseAddressList($address) as $addressObject) { - $emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''); - $mailAddr[] = array($emailAddress, $addressObject->personal); - } - } + // folder list as Customheader if (!empty($this->sessionData['folder'])) { $folders = implode('|',array_unique($this->sessionData['folder'])); - $mail->AddCustomHeader("X-Mailfolder: $folders"); + $mail->addHeader('X-Mailfolder', $folders); } - $mail->AddCustomHeader('X-Signature: '.$this->sessionData['signatureid']); - //$mail->AddCustomHeader('X-Stationery: '.$this->sessionData['stationeryID']); - $mail->AddCustomHeader('X-Identity: '.(int)$this->sessionData['mailaccount']); + $mail->addHeader('X-Mailidentity', $this->sessionData['mailidentity']); + //$mail->addHeader('X-Stationery', $this->sessionData['stationeryID']); + $mail->addHeader('X-Mailaccount', (int)$this->sessionData['mailaccount']); // decide where to save the message (default to draft folder, if we find nothing else) // if the current folder is in draft or template folder save it there // if it is called from printview then save it with the draft folder @@ -2404,16 +2356,14 @@ class mail_compose } if ( !empty($_formData['printit']) && $_formData['printit'] == 0 ) $savingDestination = $mail_bo->getDraftFolder(); - if (count($mailAddr)>0) $BCCmail = $mail->AddrAppend("Bcc",$mailAddr); - //error_log(__METHOD__.__LINE__.$BCCmail.$mail->getMessageHeader().$mail->getMessageBody()); + // normaly Bcc is only added to recipients, but not as header visible to all recipients + $mail->forceBccHeader(); + $mail_bo->openConnection(); if ($mail_bo->folderExists($savingDestination,true)) { try { - $messageUid = $mail_bo->appendMessage($savingDestination, - $BCCmail.$mail->getMessageHeader(), - $mail->getMessageBody(), - $flags); + $messageUid = $mail_bo->appendMessage($savingDestination, $mail->getRaw(), null, $flags); } catch (egw_exception_wrong_userinput $e) { @@ -2432,7 +2382,7 @@ class mail_compose function send($_formData) { $mail_bo = $this->mail_bo; - $mail = new egw_mailer(); + $mail = new egw_mailer($this->mail_bo->profileID); $messageIsDraft = false; $this->sessionData['mailaccount'] = $_formData['mailaccount']; @@ -2444,7 +2394,7 @@ class mail_compose $this->sessionData['subject'] = trim($_formData['subject']); $this->sessionData['body'] = $_formData['body']; $this->sessionData['priority'] = $_formData['priority']; - $this->sessionData['signatureid'] = $_formData['signatureid']; + $this->sessionData['mailidentity'] = $_formData['mailidentity']; //$this->sessionData['stationeryID'] = $_formData['stationeryID']; $this->sessionData['disposition'] = $_formData['disposition']; $this->sessionData['mimeType'] = $_formData['mimeType']; @@ -2500,14 +2450,14 @@ class mail_compose } try { - $identity = emailadmin_account::read_identity((int)$this->sessionData['signatureid'],true); + $identity = emailadmin_account::read_identity((int)$this->sessionData['mailidentity'],true); } catch (Exception $e) { $identity = array(); } //error_log($this->sessionData['mailaccount']); - //error_log(__METHOD__.__LINE__.':'.array2string($this->sessionData['signatureid']).'->'.array2string($identity)); + //error_log(__METHOD__.__LINE__.':'.array2string($this->sessionData['mailidentity']).'->'.array2string($identity)); // create the messages $this->createMessage($mail, $_formData, $identity, true); // remember the identity @@ -2524,20 +2474,6 @@ class mail_compose // sentFolder is account specific $sentFolder = $this->mail_bo->getSentFolder(); if (!$this->mail_bo->folderExists($sentFolder, true)) $sentFolder=false; - // we do not fake the sender (anymore), we use the account settings for server and authentication of the choosen account - $ogServer = $this->mail_bo->ogServer; - //_debug_array($ogServer); - $mail->Host = $ogServer->host; - $mail->Port = $ogServer->port; - // SMTP Auth?? - if($ogServer->smtpAuth) { - $mail->SMTPAuth = true; - // check if username contains a ; -> then a sender is specified (and probably needed) - list($username,$senderadress) = explode(';', $ogServer->username,2); - if (isset($senderadress) && !empty($senderadress)) $mail->Sender = $senderadress; - $mail->Username = $username; - $mail->Password = $ogServer->password; - } // we switch back from authentication data to the account we used to work on if ($_formData['serverID']!=$_formData['mailaccount']) @@ -2598,20 +2534,9 @@ class mail_compose try { $mail->Send(); } - catch(phpmailerException $e) { - $this->errorInfo = $e->getMessage(); - if ($mail->ErrorInfo) // use the complete mailer ErrorInfo, for full Information - { - if (stripos($mail->ErrorInfo, $this->errorInfo)===false) - { - $this->errorInfo = $mail->ErrorInfo.'
'.$this->errorInfo; - } - else - { - $this->errorInfo = $mail->ErrorInfo; - } - } - error_log(__METHOD__.__LINE__.array2string($this->errorInfo)); + catch(Exception $e) { + _egw_log_exception($e); + $this->errorInfo = $e->getMessage().($e->detail ? ': '.$e->detail : ''); return false; } } else { @@ -2636,16 +2561,9 @@ class mail_compose // if copying mail to folder, or saving mail to infolog, we need to gather the needed information if (count($folder) > 0 || $_formData['to_infolog'] == 'on' || $_formData['to_tracker'] == 'on') { //error_log(__METHOD__.__LINE__.array2string($this->sessionData['bcc'])); - foreach((array)$this->sessionData['bcc'] as $address) { - foreach(emailadmin_imapbase::parseAddressList($address) as $addressObject) { - $emailAddress = $addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''); - $mailAddr[] = array($emailAddress, $addressObject->personal); - } - } - $BCCmail=''; - if (count($mailAddr)>0) $BCCmail = $mail->AddrAppend("Bcc",$mailAddr); - $sentMailHeader = $BCCmail.$mail->getMessageHeader(); - $sentMailBody = $mail->getMessageBody(); + + // normaly Bcc is only added to recipients, but not as header visible to all recipients + $mail->forceBccHeader(); } // copying mail to folder if (count($folder) > 0) @@ -2669,10 +2587,7 @@ class mail_compose try { //error_log(__METHOD__.__LINE__.array2string($folderName)); - $mail_bo->appendMessage($folderName, - $sentMailHeader, - $sentMailBody, - $flags); + $mail_bo->appendMessage($folderName, $mail->getRaw(), null, $flags); } catch (egw_exception_wrong_userinput $e) { @@ -2699,10 +2614,7 @@ class mail_compose { $flags = '\\Seen'; //error_log(__METHOD__.__LINE__.array2string($folderName)); - $this->mail_bo->appendMessage($sentFolder, - $sentMailHeader, - $sentMailBody, - $flags); + $this->mail_bo->appendMessage($sentFolder, $mail->getRaw(), null, $flags); } catch (egw_exception_wrong_userinput $e) { @@ -2819,9 +2731,7 @@ class mail_compose if(is_array($this->sessionData['attachments'])) { - reset($this->sessionData['attachments']); - while(list($key,$value) = @each($this->sessionData['attachments'])) { - #print "$key: ".$value['file']."
"; + foreach($this->sessionData['attachments'] as $value) { if (!empty($value['file']) && parse_url($value['file'],PHP_URL_SCHEME) != 'vfs') { // happens when forwarding mails unlink($value['file']); } @@ -2860,8 +2770,8 @@ class mail_compose } } - if ((!isset($content['mailaccount']) || empty($content['mailaccount'])) && $id) $content['signatureid'] = $id; - if (!isset($content['signatureid']) || empty($content['signatureid'])) $content['signatureid'] = $id; + if ((!isset($content['mailaccount']) || empty($content['mailaccount'])) && $id) $content['mailidentity'] = $id; + if (!isset($content['mailidentity']) || empty($content['mailidentity'])) $content['mailidentity'] = $id; if (!isset($content['mimeType']) || empty($content['mimeType'])) { $content['mimeType'] = 'html'; diff --git a/phpgwapi/inc/class.egw_mailer.inc.php b/phpgwapi/inc/class.egw_mailer.inc.php index 5c046ed039..ced6c7c0b6 100644 --- a/phpgwapi/inc/class.egw_mailer.inc.php +++ b/phpgwapi/inc/class.egw_mailer.inc.php @@ -16,28 +16,481 @@ require_once(EGW_API_INC.'/class.phpmailer.inc.php'); * Log mails to log file specified in $GLOBALS['egw_info']['server']['log_mail'] * or regular error_log for true (can be set either in DB or header.inc.php). * + * New egw_mailer object uses Horde Mime Mail class with compatibility methods for + * old PHPMailer methods and class variable assignments. + * * This class does NOT use anything EGroupware specific, it acts like PHPMail, but logs. */ -class egw_mailer extends PHPMailer +class egw_mailer extends Horde_Mime_Mail { /** - * Constructor: always throw exceptions instead of echoing errors and EGw pathes + * Mail account used for sending mail + * + * @var emailadmin_account */ - function __construct() - { - parent::__construct(true); // throw exceptions instead of echoing errors + protected $account; - // setting EGroupware specific path for PHPMailer lang files - if (!empty($GLOBALS['egw_info']['user']['preferences']['common']['lang'])) list($lang,$nation) = explode('-',$GLOBALS['egw_info']['user']['preferences']['common']['lang']); - $lang_path = EGW_SERVER_ROOT.'/phpgwapi/lang/'; - if ($nation && file_exists($lang_path."phpmailer.lang-$nation.php")) // atm. only for pt-br => br + /** + * + * @var Horde_Mail_Rfc822_List + */ + protected $to; + protected $cc; + protected $bcc; + protected $replyto; + + /** + * Constructor: always throw exceptions instead of echoing errors and EGw pathes + * + * @param int|emailadmin_account $account =null mail account to use, default use emailadmin_account::get_default($smtp=true) + */ + function __construct($account=null) + { + parent::__construct(); + $this->_headers->setUserAgent('EGroupware API '.$GLOBALS['egw_info']['server']['versions']['phpgwapi']); + + $this->setAccount($account); + + $this->is_html = false; + + $this->ClearAddresses(); + + $this->clearParts(); + } + + /** + * Clear all addresses + */ + function clearAddresses() + { + // clear all addresses + $this->to = new Horde_Mail_Rfc822_List(); + $this->cc = new Horde_Mail_Rfc822_List(); + $this->bcc = new Horde_Mail_Rfc822_List(); + $this->replyto = new Horde_Mail_Rfc822_List(); + } + + /** + * Set mail account to use for sending + * + * @param int|emailadmin_account $account =null mail account to use, default use emailadmin_account::get_default($smtp=true) + * @throws egw_exception_not_found if account was not found (or not valid for current user) + */ + function setAccount($account=null) + { + if (is_a($account, 'emailadmin_account')) { - $lang = $nation; + $this->account = $account; } - if (!$this->SetLanguage((empty($lang)?'en':$lang),$lang_path)) + elseif ($account > 0) { - $this->SetLanguage('en',$lang_path); // use English default + $this->account = emailadmin_account::read($account); } + else + { + $this->account = emailadmin_account::get_default(true); // true = need an SMTP (not just IMAP) account + } + // use smpt-username as sender, if available, but only if it is a full email address + $sender = $this->account->acc_smtp_username && strpos($this->account->acc_smtp_username, '@') !== false ? + $this->account->acc_smtp_username : $this->account->ident_email; + $name = $this->account->ident_realname ? $this->account->ident_realname : $sender; + $this->setFrom($sender, $name); + } + + /** + * Set From and Return-Path header + * + * @param string $address + * @param string $personal ='' + */ + public function setFrom($address, $personal='') + { + $this->addHeader('Return-Path', '<'.$address.'>', true); + $this->addHeader('From', self::add_personal($address, $personal)); + } + + /** + * Add one or multiple addresses to To, Cc, Bcc or Reply-To + * + * @param string|array|Horde_Mail_Rfc822_List $address + * @param string $personal ='' only used if $address is a string + * @param string $type ='to' type of address to add "to", "cc", "bcc" or "replyto" + */ + function addAddress($address, $personal='', $type='to') + { + static $type2header = array( + 'to' => 'To', + 'cc' => 'Cc', + 'bcc' => 'Bcc', + 'replyto' => 'Reply-To', + ); + if (!isset($type2header[$type])) + { + throw new egw_exception_wrong_parameter("Unknown type '$type'!"); + } + if ($personal) $address = self::add_personal ($address, $personal); + + // add to our local list + $this->$type->add($address); + + // add as header + $this->addHeader($type2header[$type], $this->$type, true); + } + + /** + * Write Bcc as header for storing in sent or as draft + * + * Bcc is normally only add to recipients while sending, but not added visible as header! + */ + function forceBccHeader() + { + $this->_headers->removeHeader('Bcc'); + $this->_headers->addHeader('Bcc', $this->bcc); + } + + /** + * Add personal part to email address + * + * @param string $address + * @param string $personal + * @return string Rfc822 address + */ + static function add_personal($address, $personal) + { + if (is_string($address) && !empty($personal)) + { + //if (!preg_match('/^[!#$%&\'*+/0-9=?A-Z^_`a-z{|}~-]+$/u', $personal)) // that's how I read the rfc(2)822 + if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal)) // but quoting is never wrong, so quote more then necessary + { + $personal = '"'.str_replace(array('\\', '"'),array('\\\\', '\\"'), $personal).'"'; + } + $address = ($personal ? $personal.' <' : '').$address.($personal ? '>' : ''); + } + return $address; + } + + /** + * Add one or multiple addresses to Cc + * + * @param string|array|Horde_Mail_Rfc822_List $address + * @param string $personal ='' only used if $address is a string + */ + function AddCc($address, $personal=null) + { + $this->AddAddress($address, $personal, 'cc'); + } + + /** + * Add one or multiple addresses to Bcc + * + * @param string|array|Horde_Mail_Rfc822_List $address + * @param string $personal ='' only used if $address is a string + */ + function AddBcc($address, $personal=null) + { + $this->AddAddress($address, $personal, 'bcc'); + } + + /** + * Add one or multiple addresses to Reply-To + * + * @param string|array|Horde_Mail_Rfc822_List $address + * @param string $personal ='' only used if $address is a string + */ + function AddReplyTo($address, $personal=null) + { + $this->AddAddress($address, $personal, 'replyto'); + } + + /** + * Adds an attachment + * + * "text/calendar; method=..." get automatic detected and added as highes priority alternative, + * overwriting evtl. existing html body! + * + * @param string $file The path to the file. + * @param string $name The file name to use for the attachment. + * @param string $type The content type of the file. + * @param string $charset The character set of the part, only relevant for text parts. + * @return integer part-number + * @throws egw_exception_not_found if $file could not be opened for reading + */ + public function addAttachment($file, $name = null, $type = null, $charset = 'us-ascii') + { + // deprecated PHPMailer::AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') call + if ($type === 'base64') + { + $type = $charset; + $charset = 'us-ascii'; + } + + // pass file as resource to Horde_Mime_Part::setContent() + if (!($resource = fopen($file, 'r'))) + //if (!($resource = file_get_contents($file))) + { + throw new egw_exception_not_found("File '$file' not found!"); + } + $part = new Horde_Mime_Part(); + $part->setType($type ? $type : egw_vfs::mime_content_type($file)); + $part->setContents($resource); + // this should not be necessary, because binary data get detected by mime-type, + // but at least Cyrus complains about NUL characters + $part->setTransferEncoding('base64', array('send' => true)); + $part->setName($name ? $name : egw_vfs::basename($file)); + + // store "text/calendar" as _htmlBody, to trigger "multipart/alternative" + if (stripos($type,"text/calendar; method=") !== false) + { + $this->_htmlBody = $part; + return; + } + $part->setDisposition('attachment'); + + return $this->addMimePart($part); + } + + /** + * Adds a string or binary attachment (non-filesystem) to the list. + * + * "text/calendar; method=..." get automatic detected and added as highes priority alternative, + * overwriting evtl. existing html body! + * + * @param string $content String attachment data. + * @param string $filename Name of the attachment. We assume that this is NOT a path + * @param string $type File extension (MIME) type. + * @return int part-number + */ + public function AddStringAttachment($content, $filename, $type = 'application/octet-stream') + { + // deprecated PHPMailer::AddStringAttachment($content, $filename = '', $encoding = 'base64', $type = 'application/octet-stream') call + if ($type === 'base64' || func_num_args() == 4) + { + $type = func_get_arg(3); + } + + $part = new Horde_Mime_Part(); + $part->setType($type); + $part->setCharset('utf-8'); + $part->setContents($content); + // this should not be necessary, because binary data get detected by mime-type, + // but at least Cyrus complains about NUL characters + $part->setTransferEncoding('base64', array('send' => true)); + $part->setName($filename); + + // store "text/calendar" as _htmlBody, to trigger "multipart/alternative" + if (stripos($type,"text/calendar; method=") !== false) + { + $this->_htmlBody = $part; + return; + } + $part->setDisposition('attachment'); + + return $this->addMimePart($part); + } + + /** + * Send mail, injecting mail transport from account + * + * @ToDo hooks port hook from SmtpSend + */ + function send() + { + parent::send($this->account->smtpTransport(), true); // true: keep Message-ID + } + + /** + * Reset all Settings to send multiple Messages + */ + function ClearAll() + { + $this->__construct($this->account); + } + + /** + * Get the raw email data sent by this object. + * + * Reimplement to be able to call it for saveAsDraft by calling + * $this->send(new Horde_Mail_Transport_Null()), + * if no base-part is set, because send is not called before. + * + * @param boolean $stream If true, return a stream resource, otherwise + * @return stream|string The raw email data. + */ + function getRaw($stream=true) + { + try { + $this->getBasePart(); + } + catch(Horde_Mail_Exception $e) + { + unset($e); + parent::send(new Horde_Mail_Transport_Null(), true); // true: keep Message-ID + } + return parent::getRaw($stream); + } + + /** + * Deprecated PHPMailer compatibility methods + */ + + /** + * Get header part of mail + * + * @deprecated use getRaw($stream=true) to get a stream of whole mail containing headers and body + * @return string + */ + function getMessageHeader() + { + try { + $this->getBasePart(); + } + catch(Horde_Mail_Exception $e) + { + unset($e); + parent::send(new Horde_Mail_Transport_Null(), true); // true: keep Message-ID + } + return $this->_headers->toString(); + } + + /** + * Get body part of mail + * + * @deprecated use getRaw($stream=true) to get a stream of whole mail containing headers and body + * @return string + */ + function getMessageBody() + { + try { + $this->getBasePart(); + } + catch(Horde_Mail_Exception $e) + { + unset($e); + parent::send(new Horde_Mail_Transport_Null(), true); // true: keep Message-ID + } + return $this->getBasePart()->toString( + array('stream' => false, 'encode' => Horde_Mime_Part::ENCODE_7BIT | Horde_Mime_Part::ENCODE_8BIT | Horde_Mime_Part::ENCODE_BINARY)); + } + + /** + * Use SMPT + * + * @deprecated not used, SMTP always used + */ + function IsSMTP() + { + + } + + /** + * @deprecated use AddHeader($header, $value) + */ + function AddCustomHeader($str) + { + $matches = null; + if (preg_match('/^([^:]+): *(.*)$/', $str, $matches)) + { + $this->addHeader($matches[1], $matches[2]); + } + } + /** + * @deprecated use clearParts() + */ + function ClearAttachments() + { + $this->clearParts(); + } + /** + * @deprecated done by Horde automatic + */ + function EncodeHeader($str/*, $position = 'text'*/) + { + return $str; + } + protected $is_html = false; + /** + * Defines that setting $this->Body should set Body or AltBody + * @param boolean $html + * @deprecated use either setBody() or setHtmlBody() + */ + function isHtml($html) + { + $this->is_html = (bool)$html; + } + + protected $from = ''; + /** + * Magic method to intercept assignments to old PHPMailer variables + * + * @deprecated use addHeader(), setBody() or setHtmlBody() + * @param type $name + * @param type $value + */ + function __set($name, $value) + { + switch($name) + { + case 'Sender': + $this->addHeader('Return-Path', '<'.$value.'>', true); + break; + case 'From': + case 'FromName': + if (empty($this->from) || $name == 'From' && $this->from[0] == '<') + { + $this->from = $name == 'From' ? '<'.$value.'>' : $value; + } + elseif ($name == 'From') + { + $this->from = self::add_personal($value, $this->from); + } + else + { + $this->from = self::add_personal(substr($this->from, 1, -1), $value); + } + $this->addHeader('From', $this->from, true); + break; + case 'Priority': + $this->AddHeader('X-Priority', $value); + break; + case 'Subject': + $this->AddHeader($name, $value); + break; + case 'MessageID': + $this->AddHeader('Message-ID', $value); + break; + case 'AltExtended': + case 'AltExtendedContentType': + // todo addPart() + break; + case 'Body': + $this->is_html ? $this->setHtmlBody($value, null, false) : $this->setBody($value); + break; + case 'AltBody': + !$this->is_html ? $this->setHtmlBody($value, null, false) : $this->setBody($value); + break; + + default: + error_log(__METHOD__."('$name', ".array2string($value).") unsupported attribute '$name' --> ignored"); + break; + } + } + /** + * Magic method to intercept readin old PHPMailer variables + * + * @deprecated use getHeader(), etc. + * @param type $name + */ + function __get($name) + { + switch($name) + { + case 'Sender': + return $this->getHeader('Return-Path'); + case 'From': + return $this->getHeader('From'); + } + error_log(__METHOD__."('$name') unsupported attribute '$name' --> returning NULL"); + return null; } /** @@ -166,114 +619,4 @@ class egw_mailer extends PHPMailer throw $e; } } - - /** - * Creates recipient headers. - * - * Overwritten to get To, Cc and Bcc addresses, which are private in phpMailer - * - * @access public - * @return string - */ - public function AddrAppend($type, $addr) - { - if (is_null($addr)) $addr = array(); - foreach($addr as $data) - { - if (!empty($data[0])) $this->addresses[$type][] = $data[0]; - } - return parent::AddrAppend($type, $addr); - } - - /** - * Adds a "Bcc" address. - * - * Reimplemented as AddrAppend() for Bcc get's NOT called for SMTP! - * - * @param string $address - * @param string $name - * @return boolean true on success, false if address already used - */ - public function AddBCC($address, $name = '') - { - $this->AddrAppend('Bcc', array(array($address,$name))); - - return parent::AddBCC($address, $name); - } - - /** - * Gets the "ReplyTo" addresses. - * - * Function to retrieve the ReplyTo Addresses of the SMT Mailobject - * - * @return array with the reply-to mail addresse(s)) - */ - public function GetReplyTo() - { - return $this->ReplyTo; - } - - /** - * Adds a string or binary attachment (non-filesystem) to the list. - * This method can be used to attach ascii or binary data, - * such as a BLOB record from a database. - * @param string $string String attachment data. - * @param string $filename Name of the attachment. We assume that this is NOT a path - * @param string $encoding File encoding (see $Encoding). - * @param string $type File extension (MIME) type. - * @return void - */ - public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') - { - // Append to $attachment array - //already encoded? - //TODO: maybe add an parameter to AddStringAttachment to avoid using the basename - $x += preg_match('/\?=.+=\?/', $filename); - $this->attachment[] = array( - 0 => $string, - 1 => $filename, - 2 => ($x?basename($filename):$filename), - 3 => $encoding, - 4 => $type, - 5 => true, // isStringAttachment - 6 => 'attachment', - 7 => 0 - ); - } - - /** - * Clears all recipients assigned in the TO array. Returns void. - */ - public function ClearAddresses() { - $this->addresses['To'] = array(); - - parent::ClearAddresses(); - } - - /** - * Clears all recipients assigned in the CC array. Returns void. - */ - public function ClearCCs() { - $this->addresses['Cc'] = array(); - - parent::ClearCCs(); - } - - /** - * Clears all recipients assigned in the BCC array. Returns void. - */ - public function ClearBCCs() { - $this->addresses['Bcc'] = array(); - - parent::ClearBCCs(); - } - - /** - * Clears all recipients assigned in the TO, CC and BCC array. Returns void. - */ - public function ClearAllRecipients() { - $this->addresses = array(); - - parent::ClearAllRecipients(); - } } diff --git a/phpgwapi/inc/class.phpmailer.inc.php b/phpgwapi/inc/class.phpmailer.inc.php deleted file mode 100644 index d99a0a41c2..0000000000 --- a/phpgwapi/inc/class.phpmailer.inc.php +++ /dev/null @@ -1,2534 +0,0 @@ -exceptions = ($exceptions == true); - } - - /** - * Sets message type to HTML. - * @param bool $ishtml - * @return void - */ - public function IsHTML($ishtml = true) { - if ($ishtml) { - $this->ContentType = 'text/html'; - } else { - $this->ContentType = 'text/plain'; - } - $this->BodyContentType = $this->ContentType; - } - - /** - * Sets Mailer to send message using SMTP. - * @return void - */ - public function IsSMTP() { - $this->Mailer = 'smtp'; - } - - /** - * Sets Mailer to send message using PHP mail() function. - * @return void - */ - public function IsMail() { - $this->Mailer = 'mail'; - } - - /** - * Sets Mailer to send message using the $Sendmail program. - * @return void - */ - public function IsSendmail() { - if (!stristr(ini_get('sendmail_path'), 'sendmail')) { - $this->Sendmail = '/var/qmail/bin/sendmail'; - } - $this->Mailer = 'sendmail'; - } - - /** - * Sets Mailer to send message using the qmail MTA. - * @return void - */ - public function IsQmail() { - if (stristr(ini_get('sendmail_path'), 'qmail')) { - $this->Sendmail = '/var/qmail/bin/sendmail'; - } - $this->Mailer = 'sendmail'; - } - - ///////////////////////////////////////////////// - // METHODS, RECIPIENTS - ///////////////////////////////////////////////// - - /** - * Adds a "To" address. - * @param string $address - * @param string $name - * @return boolean true on success, false if address already used - */ - public function AddAddress($address, $name = '') { - try - { - return $this->AddAnAddress('to', $address, $name); - } catch (phpmailerException $e) - { - //$this->SetError(__METHOD__.__LINE__.$e->getMessage()); - return false; - } - } - - /** - * Adds a "Cc" address. - * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer. - * @param string $address - * @param string $name - * @return boolean true on success, false if address already used - */ - public function AddCC($address, $name = '') { - try - { - return $this->AddAnAddress('cc', $address, $name); - } catch (phpmailerException $e) - { - //$this->SetError(__METHOD__.__LINE__.$e->getMessage()); - return false; - } - - } - - /** - * Adds a "Bcc" address. - * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer. - * @param string $address - * @param string $name - * @return boolean true on success, false if address already used - */ - public function AddBCC($address, $name = '') { - try - { - return $this->AddAnAddress('bcc', $address, $name); - } catch (phpmailerException $e) - { - //$this->SetError(__METHOD__.__LINE__.$e->getMessage()); - return false; - } - } - - /** - * Adds a "Reply-to" address. - * @param string $address - * @param string $name - * @return boolean - */ - public function AddReplyTo($address, $name = '') { - try - { - return $this->AddAnAddress('ReplyTo', $address, $name); - } catch (phpmailerException $e) - { - //$this->SetError(__METHOD__.__LINE__.$e->getMessage()); - return false; - } - } - - /** - * Adds an address to one of the recipient arrays - * Addresses that have been added already return false, but do not throw exceptions - * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo' - * @param string $address The email address to send to - * @param string $name - * @return boolean true on success, false if address already used or invalid in some way - * @access private - */ - private function AddAnAddress($kind, $address, $name = '') { - if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) { - $this->SetError('Invalid recipient type: ' . $kind. ' for Address:'.$address.' '.$name); - echo 'Invalid recipient array: ' . $kind; - return false; - } - $address = trim($address); - $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim - if (!self::ValidateAddress($address)) { - $this->SetError($this->Lang('invalid_address').': '. $address); - if ($this->exceptions) { - throw new phpmailerException($this->Lang('invalid_address').': '.$address); - } - echo $this->Lang('invalid_address').': '.$address; - return false; - } - if ($kind != 'ReplyTo') { - if (!isset($this->all_recipients[strtolower($address)])) { - array_push($this->$kind, array($address, $name)); - $this->all_recipients[strtolower($address)] = true; - return true; - } - } else { - if (!array_key_exists(strtolower($address), $this->ReplyTo)) { - $this->ReplyTo[strtolower($address)] = array($address, $name); - return true; - } - } - return false; -} - -/** - * Set the From and FromName properties - * @param string $address - * @param string $name - * @return boolean - */ - public function SetFrom($address, $name = '',$auto=1) { - $address = trim($address); - $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim - if (!self::ValidateAddress($address)) { - $this->SetError($this->Lang('invalid_address').': '. $address); - if ($this->exceptions) { - throw new phpmailerException($this->Lang('invalid_address').': '.$address); - } - echo $this->Lang('invalid_address').': '.$address; - return false; - } - $this->From = $address; - $this->FromName = $name; - if ($auto) { - if (empty($this->ReplyTo)) { - $this->AddAnAddress('ReplyTo', $address, $name); - } - if (empty($this->Sender)) { - $this->Sender = $address; - } - } - return true; - } - - /** - * Check that a string looks roughly like an email address should - * Static so it can be used without instantiation - * Tries to use PHP built-in validator in the filter extension (from PHP 5.2), falls back to a reasonably competent regex validator - * Conforms approximately to RFC2822 - * @link http://www.hexillion.com/samples/#Regex Original pattern found here - * @param string $address The email address to check - * @return boolean - * @static - * @access public - */ - public static function ValidateAddress($address) { - if (function_exists('filter_var')) { //Introduced in PHP 5.2 - if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) { - return false; - } else { - return true; - } - } else { - return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address); - } - } - - ///////////////////////////////////////////////// - // METHODS, MAIL SENDING - ///////////////////////////////////////////////// - - /** - * Creates message and assigns Mailer. If the message is - * not sent successfully then it returns false. Use the ErrorInfo - * variable to view description of the error. - * @return bool - */ - public function Send() { - try { - if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) { - throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL); - } - - // Set whether the message is multipart/alternative - if(!empty($this->AltBody) || !empty($this->AltExtended)) { - $this->ContentType = 'multipart/alternative'; - } - - $this->error_count = 0; // reset errors - $this->SetMessageType(); - $header = $this->CreateHeader(); - $body = $this->CreateBody(); - - if (empty($this->Body)) { - throw new phpmailerException($this->Lang('empty_message'), self::STOP_CRITICAL); - } - if ($this->IsError()) { - throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL); - } - - // digitally sign with DKIM if enabled - if ($this->DKIM_domain && $this->DKIM_private) { - $header_dkim = $this->DKIM_Add($header,$this->Subject,$body); - $header = str_replace("\r\n","\n",$header_dkim) . $header; - } - - // Choose the mailer and send through it - switch($this->Mailer) { - case 'sendmail': - return $this->SendmailSend($header, $body); - case 'smtp': - return $this->SmtpSend($header, $body); - default: - return $this->MailSend($header, $body); - } - - } catch (phpmailerException $e) { - $this->SetError($e->getMessage()); - if ($this->exceptions) { - throw $e; - } - echo $e->getMessage()."\n"; - return false; - } - } - - /** - * Sends mail using the $Sendmail program. - * @param string $header The message headers - * @param string $body The message body - * @access protected - * @return bool - */ - protected function SendmailSend($header, $body) { - if ($this->Sender != '') { - $sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender)); - } else { - $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail)); - } - if ($this->SingleTo === true) { - foreach ($this->SingleToArray as $key => $val) { - if(!@$mail = popen($sendmail, 'w')) { - throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); - } - fputs($mail, "To: " . $val . "\n"); - fputs($mail, $header); - fputs($mail, $body); - $result = pclose($mail); - // implement call back function if it exists - $isSent = ($result == 0) ? 1 : 0; - $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body); - if($result != 0) { - throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); - } - } - } else { - if(!@$mail = popen($sendmail, 'w')) { - throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); - } - fputs($mail, $header); - fputs($mail, $body); - $result = pclose($mail); - // implement call back function if it exists - $isSent = ($result == 0) ? 1 : 0; - $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body); - if($result != 0) { - throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL); - } - } - return true; - } - - /** - * Sends mail using the PHP mail() function. - * @param string $header The message headers - * @param string $body The message body - * @access protected - * @return bool - */ - protected function MailSend($header, $body) { - $toArr = array(); - foreach($this->to as $t) { - $toArr[] = $this->AddrFormat($t); - } - $to = implode(', ', $toArr); - - $params = sprintf("-oi -f %s", $this->Sender); - if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) { - $old_from = ini_get('sendmail_from'); - ini_set('sendmail_from', $this->Sender); - if ($this->SingleTo === true && count($toArr) > 1) { - foreach ($toArr as $key => $val) { - $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params); - // implement call back function if it exists - $isSent = ($rt == 1) ? 1 : 0; - $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body); - } - } else { - $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params); - // implement call back function if it exists - $isSent = ($rt == 1) ? 1 : 0; - $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body); - } - } else { - if ($this->SingleTo === true && count($toArr) > 1) { - foreach ($toArr as $key => $val) { - $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params); - // implement call back function if it exists - $isSent = ($rt == 1) ? 1 : 0; - $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body); - } - } else { - $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header); - // implement call back function if it exists - $isSent = ($rt == 1) ? 1 : 0; - $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body); - } - } - if (isset($old_from)) { - ini_set('sendmail_from', $old_from); - } - if(!$rt) { - throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL); - } - return true; - } - - /** - * Sends mail via SMTP using PhpSMTP - * Returns false if there is a bad MAIL FROM, RCPT, or DATA input. - * @param string $header The message headers - * @param string $body The message body - * @uses SMTP - * @access protected - * @return bool - */ - public function SmtpSend($header, $body) { - require_once $this->PluginDir . 'class.smtp.php'; - $bad_rcpt = array(); - - if(!$this->SmtpConnect()) { - throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL); - } - $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender; - if(!$this->smtp->Mail($smtp_from)) { - $this->SetError($this->Lang('from_failed') . $smtp_from); - $this->smtp->Reset(); - throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL); - } - - // Attempt to send attach all recipients - foreach($this->to as $to) { - if (!$this->smtp->Recipient($to[0])) { - $bad_rcpt[] = $to[0]; - // implement call back function if it exists - $isSent = 0; - $this->doCallback($isSent,$to[0],'','',$this->Subject,$body); - } else { - // implement call back function if it exists - $isSent = 1; - $this->doCallback($isSent,$to[0],'','',$this->Subject,$body); - } - } - foreach($this->cc as $cc) { - if (!$this->smtp->Recipient($cc[0])) { - $bad_rcpt[] = $cc[0]; - // implement call back function if it exists - $isSent = 0; - $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body); - } else { - // implement call back function if it exists - $isSent = 1; - $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body); - } - } - foreach($this->bcc as $bcc) { - if (!$this->smtp->Recipient($bcc[0])) { - $bad_rcpt[] = $bcc[0]; - // implement call back function if it exists - $isSent = 0; - $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body); - } else { - // implement call back function if it exists - $isSent = 1; - $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body); - } - } - - - if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses - $badaddresses = implode(', ', $bad_rcpt); - $this->setError($this->Lang('recipients_failed') . $badaddresses); - $this->smtp->Reset(); - throw new phpmailerException($this->ErrorInfo); - } - if(!$this->smtp->Data($header . $body)) { - $this->setError($this->Lang('data_not_accepted')); - $this->smtp->Reset(); - throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL); - } - if($this->SMTPKeepAlive == true) { - $this->smtp->Reset(); - } - return true; - } - - /** - * Initiates a connection to an SMTP server. - * Returns false if the operation failed. - * @uses SMTP - * @access public - * @return bool - */ - public function SmtpConnect() { - if(is_null($this->smtp)) { - $this->smtp = new SMTP(); - } - - $this->smtp->do_debug = $this->SMTPDebug; - $hosts = explode(';', $this->Host); - $index = 0; - $connection = $this->smtp->Connected(); - - // Retry while there is no connection - try { - while($index < count($hosts) && !$connection) { - $hostinfo = array(); - if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) { - $host = $hostinfo[1]; - $port = $hostinfo[2]; - } else { - $host = $hosts[$index]; - $port = $this->Port; - } - $hostA = explode("://", $host); - if (in_array(strtolower($hostA[0]), array('tls', 'ssl', 'tlsv1'))) { - $this->SMTPSecure = strtolower($hostA[0]); - $host = $hostA[1]; - } - - $tls = ($this->SMTPSecure == 'tls'); // starttls - switch($this->SMTPSecure) - { - case 'tls': // STARTTLS - $tls = true; - break; - case 'ssl': - $host = 'ssl://'.$host; - break; - case 'tlsv1': // require minimum tls version 1.0, no more ssl 2 or 3 - $host = 'tls://'.$host; - break; - } - - if ($this->smtp->Connect($host, $port, $this->Timeout)) { - - $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname()); - $this->smtp->Hello($hello); - - if ($tls) { - if (!$this->smtp->StartTLS()) { - throw new phpmailerException($this->Lang('tls')); - } - - //We must resend HELO after tls negotiation - $this->smtp->Hello($hello); - } - - $connection = true; - if ($this->SMTPAuth) { - if (!$this->smtp->Authenticate($this->Username, $this->Password)) { - throw new phpmailerException($this->Lang('authenticate')); - } - } - } - $index++; - if (!$connection) { - throw new phpmailerException($this->Lang('connect_host')); - } - } - } catch (phpmailerException $e) { - $this->smtp->Reset(); - throw $e; - } - return true; - } - - /** - * Closes the active SMTP session if one exists. - * @return void - */ - public function SmtpClose() { - if(!is_null($this->smtp)) { - if($this->smtp->Connected()) { - $this->smtp->Quit(); - $this->smtp->Close(); - } - } - } - - /** - * Sets the language for all class error messages. - * Returns false if it cannot load the language file. The default language is English. - * @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br") - * @param string $lang_path Path to the language file directory - * @access public - */ - function SetLanguage($langcode = 'en', $lang_path = 'language/') { - //Define full set of translatable strings - $PHPMAILER_LANG = array( - 'provide_address' => 'You must provide at least one recipient email address.', - 'mailer_not_supported' => ' mailer is not supported.', - 'execute' => 'Could not execute: ', - 'instantiate' => 'Could not instantiate mail function.', - 'authenticate' => 'SMTP Error: Could not authenticate.', - 'tls' => 'SMTP Error: Could not start TLS communication.', - 'from_failed' => 'The following From address failed: ', - 'recipients_failed' => 'SMTP Error: The following recipients failed: ', - 'data_not_accepted' => 'SMTP Error: Data not accepted.', - 'connect_host' => 'SMTP Error: Could not connect to SMTP host.', - 'file_access' => 'Could not access file: ', - 'file_open' => 'File Error: Could not open file: ', - 'encoding' => 'Unknown encoding: ', - 'signing' => 'Signing Error: ', - 'smtp_error' => 'SMTP server error: ', - 'empty_message' => 'Message body empty', - 'invalid_address' => 'Invalid address', - 'variable_set' => 'Cannot set or reset variable: ' - ); - //Overwrite language-specific strings. This way we'll never have missing translations - no more "language string failed to load"! - $l = true; - if ($langcode != 'en') { //There is no English translation file - $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php'; - } - $this->language = $PHPMAILER_LANG; - return ($l == true); //Returns false if language not found - } - - /** - * Return the current array of language strings - * @return array - */ - public function GetTranslations() { - return $this->language; - } - - ///////////////////////////////////////////////// - // METHODS, MESSAGE CREATION - ///////////////////////////////////////////////// - - /** - * Creates recipient headers. - * @access public - * @return string - */ - public function AddrAppend($type, $addr) { - $addr_str = $type . ': '; - $addresses = array(); - foreach ($addr as $a) { - $addresses[] = $this->AddrFormat($a); - } - $addr_str .= implode(', ', $addresses); - $addr_str .= $this->LE; - - return $addr_str; - } - - /** - * Formats an address correctly. - * @access public - * @return string - */ - public function AddrFormat($addr) { - if (empty($addr[1])) { - return $this->SecureHeader($addr[0]); - } else { - return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">"; - } - } - - /** - * Wraps message for use with mailers that do not - * automatically perform wrapping and for quoted-printable. - * Original written by philippe. - * @param string $message The message to wrap - * @param integer $length The line length to wrap to - * @param boolean $qp_mode Whether to run in Quoted-Printable mode - * @access public - * @return string - */ - public function WrapText($message, $length, $qp_mode = false) { - $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE; - // If utf-8 encoding is used, we will need to make sure we don't - // split multibyte characters when we wrap - $is_utf8 = (strtolower($this->CharSet) == "utf-8"); - - $message = $this->FixEOL($message); - if (substr($message, -1) == $this->LE) { - $message = substr($message, 0, -1); - } - - $line = explode($this->LE, $message); - $message = ''; - for ($i=0 ;$i < count($line); $i++) { - $line_part = explode(' ', $line[$i]); - $buf = ''; - for ($e = 0; $e $length)) { - $space_left = $length - strlen($buf) - 1; - if ($e != 0) { - if ($space_left > 20) { - $len = $space_left; - if ($is_utf8) { - $len = $this->UTF8CharBoundary($word, $len); - } elseif (substr($word, $len - 1, 1) == "=") { - $len--; - } elseif (substr($word, $len - 2, 1) == "=") { - $len -= 2; - } - $part = substr($word, 0, $len); - $word = substr($word, $len); - $buf .= ' ' . $part; - $message .= $buf . sprintf("=%s", $this->LE); - } else { - $message .= $buf . $soft_break; - } - $buf = ''; - } - while (strlen($word) > 0) { - $len = $length; - if ($is_utf8) { - $len = $this->UTF8CharBoundary($word, $len); - } elseif (substr($word, $len - 1, 1) == "=") { - $len--; - } elseif (substr($word, $len - 2, 1) == "=") { - $len -= 2; - } - $part = substr($word, 0, $len); - $word = substr($word, $len); - - if (strlen($word) > 0) { - $message .= $part . sprintf("=%s", $this->LE); - } else { - $buf = $part; - } - } - } else { - $buf_o = $buf; - $buf .= ($e == 0) ? $word : (' ' . $word); - - if (strlen($buf) > $length and $buf_o != '') { - $message .= $buf_o . $soft_break; - $buf = $word; - } - } - } - $message .= $buf . $this->LE; - } - - return $message; - } - - /** - * Finds last character boundary prior to maxLength in a utf-8 - * quoted (printable) encoded string. - * Original written by Colin Brown. - * @access public - * @param string $encodedText utf-8 QP text - * @param int $maxLength find last character boundary prior to this length - * @return int - */ - public function UTF8CharBoundary($encodedText, $maxLength) { - $foundSplitPos = false; - $lookBack = 3; - while (!$foundSplitPos) { - $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack); - $encodedCharPos = strpos($lastChunk, "="); - if ($encodedCharPos !== false) { - // Found start of encoded character byte within $lookBack block. - // Check the encoded byte value (the 2 chars after the '=') - $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2); - $dec = hexdec($hex); - if ($dec < 128) { // Single byte character. - // If the encoded char was found at pos 0, it will fit - // otherwise reduce maxLength to start of the encoded char - $maxLength = ($encodedCharPos == 0) ? $maxLength : - $maxLength - ($lookBack - $encodedCharPos); - $foundSplitPos = true; - } elseif ($dec >= 192) { // First byte of a multi byte character - // Reduce maxLength to split at start of character - $maxLength = $maxLength - ($lookBack - $encodedCharPos); - $foundSplitPos = true; - } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back - $lookBack += 3; - } - } else { - // No encoded character found - $foundSplitPos = true; - } - } - return $maxLength; - } - - - /** - * Set the body wrapping. - * @access public - * @return void - */ - public function SetWordWrap() { - if($this->WordWrap < 1) { - return; - } - - switch($this->message_type) { - case 'alt': - case 'alt_attachments': - $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap); - if (!empty($this->AltExtended)) $this->AltExtended = $this->WrapText($this->AltExtended, $this->WordWrap); - break; - default: - $this->Body = $this->WrapText($this->Body, $this->WordWrap); - break; - } - } - - /** - * Assembles message header. - * @access public - * @return string The assembled header - */ - public function CreateHeader() { - $result = ''; - - // Set the boundaries - $uniq_id = md5(uniqid(time())); - $this->boundary[1] = 'b1_' . $uniq_id; - $this->boundary[2] = 'b2_' . $uniq_id; - - $result .= $this->HeaderLine('Date', (!empty($this->RFCDateToSet)?$this->RFCDateToSet:self::RFCDate())); - if($this->Sender == '') { - $result .= $this->HeaderLine('Return-Path', trim($this->From)); - } else { - $result .= $this->HeaderLine('Return-Path', trim($this->Sender)); - } - - // To be created automatically by mail() - if($this->Mailer != 'mail') { - if ($this->SingleTo === true) { - foreach($this->to as $t) { - $this->SingleToArray[] = $this->AddrFormat($t); - } - } else { - if(count($this->to) > 0) { - $result .= $this->AddrAppend('To', $this->to); - } elseif (count($this->cc) == 0) { - $result .= $this->HeaderLine('To', 'undisclosed-recipients:;'); - } - } - } - - $from = array(); - $from[0][0] = trim($this->From); - $from[0][1] = $this->FromName; - $result .= $this->AddrAppend('From', $from); - - // sendmail and mail() extract Cc from the header before sending - if(count($this->cc) > 0) { - $result .= $this->AddrAppend('Cc', $this->cc); - } - - // sendmail and mail() extract Bcc from the header before sending - if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) { - $result .= $this->AddrAppend('Bcc', $this->bcc); - } - - if(count($this->ReplyTo) > 0) { - $result .= $this->AddrAppend('Reply-to', $this->ReplyTo); - } - - // mail() sets the subject itself - if($this->Mailer != 'mail') { - $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject))); - } - - if($this->MessageID != '') { - $result .= $this->HeaderLine('Message-ID',$this->MessageID); - } else { - $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE); - } - $result .= $this->HeaderLine('X-Priority', $this->Priority); - $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (phpmailer.sourceforge.net)'); - - if($this->ConfirmReadingTo != '') { - $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>'); - } - - // Add custom headers - for($index = 0; $index < count($this->CustomHeader); $index++) { - $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1]))); - } - if (!$this->sign_key_file) { - $result .= $this->HeaderLine('MIME-Version', '1.0'); - $result .= $this->GetMailMIME(); - } - - return $result; - } - - /** - * Returns the message MIME. - * @access public - * @return string - */ - public function GetMailMIME() { - $result = ''; - switch($this->message_type) { - case 'plain': - $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding); - $result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet); - break; - case 'attachments': - case 'alt_attachments': - if($this->InlineImageExists(true)){ - $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE); - } else { - $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;'); - $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"'); - } - break; - case 'alt': - $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;'); - $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"'); - break; - } - - if($this->Mailer != 'mail') { - $result .= $this->LE.$this->LE; - } - - return $result; - } - - /** - * Assembles the message body. Returns an empty string on failure. - * @access public - * @return string The assembled message body - */ - public function CreateBody() { - $body = ''; - - if ($this->sign_key_file) { - $body .= $this->GetMailMIME()."\n"; - } - - $this->SetWordWrap(); - - switch($this->message_type) { - case 'alt': - if (!empty($this->AltBody)) - { - $body .= $this->GetBoundary($this->boundary[1], '', $this->AltBodyContentType, ''); // may be set by client, defaults to text/plain - $body .= $this->EncodeString($this->AltBody, $this->Encoding); - $body .= $this->LE.$this->LE; - } - $body .= $this->GetBoundary($this->boundary[1], '', $this->BodyContentType, ''); //is dependent on IsHTML - $body .= $this->EncodeString($this->Body, $this->Encoding); - $body .= $this->LE.$this->LE; - if (!empty($this->AltExtended)) - { - $body .= $this->GetBoundary($this->boundary[1], '', $this->AltExtendedContentType, ''); // may be set by client, defaults to text/plain - $body .= $this->EncodeString($this->AltExtended, $this->Encoding); - $body .= $this->LE.$this->LE; - } - $body .= $this->EndBoundary($this->boundary[1]); - break; - case 'plain': - $body .= $this->EncodeString($this->Body, $this->Encoding); - break; - case 'attachments': - $body .= $this->GetBoundary($this->boundary[1], '', '', ''); - $body .= $this->EncodeString($this->Body, $this->Encoding); - $body .= $this->LE; - $body .= $this->AttachAll(); - break; - case 'alt_attachments': - $body .= sprintf("--%s%s", $this->boundary[1], $this->LE); - $body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE); - if (!empty($this->AltBody)) - { - $body .= $this->GetBoundary($this->boundary[2], '', $this->AltBodyContentType, '') . $this->LE; // Create text body - $body .= $this->EncodeString($this->AltBody, $this->Encoding); - $body .= $this->LE.$this->LE; - } - $body .= $this->GetBoundary($this->boundary[2], '', $this->BodyContentType, '') . $this->LE; // Create the HTML body - $body .= $this->EncodeString($this->Body, $this->Encoding); - $body .= $this->LE.$this->LE; - if (!empty($this->AltExtended)) - { - $body .= $this->GetBoundary($this->boundary[2], '', $this->AltExtendedContentType, ''); // may be set by client, defaults to text/plain - $body .= $this->EncodeString($this->AltExtended, $this->Encoding); - $body .= $this->LE.$this->LE; - } - $body .= $this->EndBoundary($this->boundary[2]); - $body .= $this->AttachAll(); - break; - } - - if ($this->IsError()) { - $body = ''; - } elseif ($this->sign_key_file) { - try { - $file = tempnam('', 'mail'); - file_put_contents($file, $body); //TODO check this worked - $signed = tempnam("", "signed"); - if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), NULL)) { - @unlink($file); - $body = file_get_contents($signed); - @unlink($signed); - } else { - @unlink($file); - @unlink($signed); - throw new phpmailerException($this->Lang("signing").openssl_error_string()); - } - } catch (phpmailerException $e) { - $body = ''; - if ($this->exceptions) { - throw $e; - } - } - } - - return $body; - } - - /** - * Returns the specified message boundary. - * boundary is set only after CreateHeader was called - * @param integer the boundary to fetch - * @return string/boolean - the boundary or false if not set (yet) - */ - public function FetchBoundary($num) - { - return isset($this->boundary[$num])? $this->boundary[$num]: false; - } - - /** - * Returns the start of a message boundary. - * @access private - */ - private function GetBoundary($boundary, $charSet, $contentType, $encoding) { - $result = ''; - if($charSet == '') { - $charSet = $this->CharSet; - } - if($contentType == '') { - $contentType = $this->ContentType; - } - if($encoding == '') { - $encoding = $this->Encoding; - } - $result .= $this->TextLine('--' . $boundary); - $result .= sprintf("Content-Type: %s; charset=\"%s\"", $contentType, $charSet); - $result .= $this->LE; - $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding); - $result .= $this->LE; - - return $result; - } - - /** - * Returns the end of a message boundary. - * @access private - */ - private function EndBoundary($boundary) { - return $this->LE . '--' . $boundary . '--' . $this->LE; - } - - /** - * Sets the message type. - * @access private - * @return void - */ - public function SetMessageType() { - if(count($this->attachment) < 1 && strlen($this->AltBody) < 1 && strlen($this->AltExtended) < 1) { - $this->message_type = 'plain'; - } else { - if(count($this->attachment) > 0) { - $this->message_type = 'attachments'; - } - if((strlen($this->AltBody) > 0 || strlen($this->AltExtended) > 0 ) && count($this->attachment) < 1) { - $this->message_type = 'alt'; - } - if((strlen($this->AltBody) > 0 || strlen($this->AltExtended) > 0 ) && count($this->attachment) > 0) { - $this->message_type = 'alt_attachments'; - } - } - } - - /** - * Returns a formatted header line. - * @access public - * @return string - */ - public function HeaderLine($name, $value) { - return $name . ': ' . $value . $this->LE; - } - - /** - * Returns a formatted mail line. - * @access public - * @return string - */ - public function TextLine($value) { - return $value . $this->LE; - } - - ///////////////////////////////////////////////// - // CLASS METHODS, ATTACHMENTS - ///////////////////////////////////////////////// - - /** - * Adds an attachment from a path on the filesystem. - * Returns false if the file could not be found - * or accessed. - * @param string $path Path to the attachment. - * @param string $name Overrides the attachment name. - * @param string $encoding File encoding (see $Encoding). - * @param string $type File extension (MIME) type. - * @return bool - */ - public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') { - try { - if ( !@is_file($path) ) { - throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE); - } - $filename = basename($path); - if ( $name == '' ) { - $name = $filename; - } - - $this->attachment[] = array( - 0 => $path, - 1 => $filename, - 2 => $name, - 3 => $encoding, - 4 => $type, - 5 => false, // isStringAttachment - 6 => 'attachment', - 7 => 0 - ); - - } catch (phpmailerException $e) { - $this->SetError($e->getMessage()); - if ($this->exceptions) { - throw $e; - } - echo $e->getMessage()."\n"; - if ( $e->getCode() == self::STOP_CRITICAL ) { - return false; - } - } - return true; - } - - /** - * Return the current array of attachments - * @return array - */ - public function GetAttachments() { - return $this->attachment; - } - - /** - * Attaches all fs, string, and binary attachments to the message. - * Returns an empty string on failure. - * @access private - * @return string - */ - private function AttachAll() { - // Return text of body - $mime = array(); - $cidUniq = array(); - $incl = array(); - - // Add all attachments - foreach ($this->attachment as $attachment) { - // Check for string attachment - $bString = $attachment[5]; - if ($bString) { - $string = $attachment[0]; - } else { - $path = $attachment[0]; - } - - if (in_array($attachment[0], $incl)) { continue; } - $filename = $attachment[1]; - $name = $attachment[2]; - $encoding = $attachment[3]; - $type = $attachment[4]; - $disposition = $attachment[6]; - $cid = $attachment[7]; - $incl[] = $attachment[0]; - if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; } - $cidUniq[$cid] = true; - - $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE); - if($disposition == 'part') { - $mime[] = sprintf("Content-Type: %s; charset=\"%s\"%s", $type, $this->CharSet, $this->LE); - } else { - $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE); - } - $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE); - - if($disposition == 'inline') { - $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE); - } - - if($disposition != "part") { - $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE); - } else { - $mime[] = sprintf("%s", $this->LE); - } - - // Encode as string attachment - if($bString) { - $mime[] = $this->EncodeString($string, $encoding); - if($this->IsError()) { - return ''; - } - $mime[] = $this->LE.$this->LE; - } else { - $mime[] = $this->EncodeFile($path, $encoding); - if($this->IsError()) { - $this->SetError(__METHOD__.'->'.'cowardly refuse to attach empty or missing file:'.($name?$name:$filename) ); - return ''; - } - $mime[] = $this->LE.$this->LE; - } - } - - $mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE); - - return join('', $mime); - } - - /** - * Encodes attachment in requested format. - * Returns an empty string on failure. - * @param string $path The full path to the file - * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable' - * @see EncodeFile() - * @access private - * @return string - */ - private function &EncodeFile($path, $encoding = 'base64') - { - if (function_exists('get_magic_quotes')) - { - function get_magic_quotes() - { - return false; - } - } - if (PHP_VERSION < 6) - { - if (function_exists('get_magic_quotes_runtime') && ($magic_quotes = get_magic_quotes_runtime())) set_magic_quotes_runtime(0); - } - try { - if ((@$file_buffer = file_get_contents($path))===false) - { - //throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE); - $this->SetError($this->Lang('file_open') . $path); - return ""; - } - if (strlen(trim($file_buffer))==0) // do the complaining one level up, where we may have the name of the file - { - $this->SetError($this->Lang('file_open') . $path. ':'.'is empty'); - return ""; - } - $file_buffer = $this->EncodeString($file_buffer, $encoding); - if (strlen(trim($file_buffer))==0) // do the complaining one level up, where we may have the name of the file - { - $this->SetError($this->Lang('file_open') . $path. ':'."is empty after encoding to $encoding"); - return ""; - } - if (PHP_VERSION < 6) - { - if ($magic_quotes) set_magic_quotes_runtime($magic_quotes); - } - return $file_buffer; - } catch (Exception $e) { - if (PHP_VERSION < 6) - { - if ($magic_quotes) set_magic_quotes_runtime($magic_quotes); - } - $this->SetError($e->getMessage()); - return ''; - } - } - - /** - * Encodes string to requested format. - * Returns an empty string on failure. - * @param string $str The text to encode - * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable' - * @access public - * @return string - */ - public function &EncodeString ($str, $encoding = 'base64') { - $encoded = ''; - switch(strtolower($encoding)) { - case 'base64': - $encoded = chunk_split(base64_encode($str), 76, $this->LE); - break; - case '7bit': - case '8bit': - $encoded = $this->FixEOL($str); - //Make sure it ends with a line break - if (substr($encoded, -(strlen($this->LE))) != $this->LE) - $encoded .= $this->LE; - break; - case 'binary': - $encoded = $str; - break; - case 'quoted-printable': - $encoded = $this->EncodeQP($str); - break; - default: - $this->SetError($this->Lang('encoding') . $encoding); - break; - } - return $encoded; - } - - /** - * Encode a header string to best (shortest) of Q, B, quoted or none. - * @access public - * @return string - */ - public function EncodeHeader($str, $position = 'text') { - $x = 0; - - switch (strtolower($position)) { - case 'phrase': - if (!preg_match('/[\200-\377]/', $str)) { - // Can't use addslashes as we don't know what value has magic_quotes_sybase - $encoded = addcslashes($str, "\0..\37\177\\\""); - if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) { - return ($encoded); - } else { - return ("\"$encoded\""); - } - } - $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches); - break; - case 'comment': - $x = preg_match_all('/[()"]/', $str, $matches); - // Fall-through - case 'text': - default: - $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches); - break; - } - - if ($x == 0) { - return ($str); - } - - $maxlen = 75 - 7 - strlen($this->CharSet); - // Try to select the encoding which should produce the shortest output - if (strlen($str)/3 < $x) { - $encoding = 'B'; - if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) { - // Use a custom function which correctly encodes and wraps long - // multibyte strings without breaking lines within a character - $encoded = $this->Base64EncodeWrapMB($str); - } else { - $encoded = base64_encode($str); - $maxlen -= $maxlen % 4; - $encoded = trim(chunk_split($encoded, $maxlen, "\n")); - } - } else { - $encoding = 'Q'; - $encoded = $this->EncodeQ($str, $position); - $encoded = $this->WrapText($encoded, $maxlen, true); - $encoded = str_replace('='.$this->LE, "\n", trim($encoded)); - } - - $encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded); - $encoded = trim(str_replace("\n", $this->LE, $encoded)); - - return $encoded; - } - - /** - * Checks if a string contains multibyte characters. - * @access public - * @param string $str multi-byte text to wrap encode - * @return bool - */ - public function HasMultiBytes($str) { - if (function_exists('mb_strlen')) { - return (strlen($str) > mb_strlen($str, $this->CharSet)); - } else { // Assume no multibytes (we can't handle without mbstring functions anyway) - return false; - } - } - - /** - * Correctly encodes and wraps long multibyte strings for mail headers - * without breaking lines within a character. - * Adapted from a function by paravoid at http://uk.php.net/manual/en/function.mb-encode-mimeheader.php - * @access public - * @param string $str multi-byte text to wrap encode - * @return string - */ - public function Base64EncodeWrapMB($str) { - $start = "=?".$this->CharSet."?B?"; - $end = "?="; - $encoded = ""; - - $mb_length = mb_strlen($str, $this->CharSet); - // Each line must have length <= 75, including $start and $end - $length = 75 - strlen($start) - strlen($end); - // Average multi-byte ratio - $ratio = $mb_length / strlen($str); - // Base64 has a 4:3 ratio - $offset = $avgLength = floor($length * $ratio * .75); - - for ($i = 0; $i < $mb_length; $i += $offset) { - $lookBack = 0; - - do { - $offset = $avgLength - $lookBack; - $chunk = mb_substr($str, $i, $offset, $this->CharSet); - $chunk = base64_encode($chunk); - $lookBack++; - } - while (strlen($chunk) > $length); - - $encoded .= $chunk . $this->LE; - } - - // Chomp the last linefeed - $encoded = substr($encoded, 0, -strlen($this->LE)); - return $encoded; - } - - /** - * Encode string to quoted-printable. - * Only uses standard PHP, slow, but will always work - * @access public - * @param string $string the text to encode - * @param integer $line_max Number of chars allowed on a line before wrapping - * @return string - */ - public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) { - $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'); - $lines = preg_split('/(?:\r\n|\r|\n)/', $input); - $eol = "\r\n"; - $escape = '='; - $output = ''; - while( list(, $line) = each($lines) ) { - $linlen = strlen($line); - $newline = ''; - for($i = 0; $i < $linlen; $i++) { - $c = substr( $line, $i, 1 ); - $dec = ord( $c ); - if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E - $c = '=2E'; - } - if ( $dec == 32 ) { - if ( $i == ( $linlen - 1 ) ) { // convert space at eol only - $c = '=20'; - } else if ( $space_conv ) { - $c = '=20'; - } - } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required - $h2 = floor($dec/16); - $h1 = floor($dec%16); - $c = $escape.$hex[$h2].$hex[$h1]; - } - if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted - $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay - $newline = ''; - // check if newline first character will be point or not - if ( $dec == 46 ) { - $c = '=2E'; - } - } - $newline .= $c; - } // end of for - $output .= $newline.$eol; - } // end of while - return $output; - } - - /** - * Encode string to RFC2045 (6.7) quoted-printable format - * Uses a PHP5 stream filter to do the encoding about 64x faster than the old version - * Also results in same content as you started with after decoding - * @see EncodeQPphp() - * @access public - * @param string $string the text to encode - * @param integer $line_max Number of chars allowed on a line before wrapping - * @param boolean $space_conv Dummy param for compatibility with existing EncodeQP function - * @return string - * @author Marcus Bointon - */ - public function EncodeQP($string, $line_max = 76, $space_conv = false) { - if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3) - //return quoted_printable_encode($string); - } - $filters = stream_get_filters(); - if (!in_array('convert.*', $filters)) { //Got convert stream filter? - return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation - } - $fp = fopen('php://temp/', 'r+'); - $string = preg_replace('/\r\n?/', $this->LE, $string); //Normalise line breaks - $params = array('line-length' => $line_max, 'line-break-chars' => $this->LE); - $s = stream_filter_append($fp, 'convert.quoted-printable-encode', STREAM_FILTER_READ, $params); - fputs($fp, $string); - rewind($fp); - $out = stream_get_contents($fp); - stream_filter_remove($s); - $out = preg_replace('/^\./m', '=2E', $out); //Encode . if it is first char on a line, workaround for bug in Exchange - fclose($fp); - return $out; - } - - /** - * Encode string to q encoding. - * @link http://tools.ietf.org/html/rfc2047 - * @param string $str the text to encode - * @param string $position Where the text is going to be used, see the RFC for what that means - * @access public - * @return string - */ - public function EncodeQ ($str, $position = 'text') { - // There should not be any EOL in the string - $encoded = preg_replace('/[\r\n]*/', '', $str); - - switch (strtolower($position)) { - case 'phrase': - $encoded = preg_replace_callback("/([^A-Za-z0-9!*+\/ -])/", function($matches) - { - return '='.sprintf('%02X', ord($matches[1])); - }, $encoded); - break; - case 'comment': - $encoded = preg_replace_callback("/([\(\)\"])/", function($matches) - { - return '='.sprintf('%02X', ord($matches[1])); - }, $encoded); - case 'text': - default: - // Replace every high ascii, control =, ? and _ characters - $encoded = preg_replace_callback('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/', function($matches) - { - return '='.sprintf('%02X', ord($matches[1])); - }, $encoded); - break; - } - - // Replace every spaces to _ (more readable than =20) - $encoded = str_replace(' ', '_', $encoded); - - return $encoded; - } - - /** - * Adds a string or binary attachment (non-filesystem) to the list. - * This method can be used to attach ascii or binary data, - * such as a BLOB record from a database. - * @param string $string String attachment data. - * @param string $filename Name of the attachment. - * @param string $encoding File encoding (see $Encoding). - * @param string $type File extension (MIME) type. - * @return void - */ - public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') { - // Append to $attachment array - $this->attachment[] = array( - 0 => $string, - 1 => $filename, - 2 => basename($filename), - 3 => $encoding, - 4 => $type, - 5 => true, // isStringAttachment - 6 => 'attachment', - 7 => 0 - ); - } - - /** - * Adds a string or binary attachment (non-filesystem) to the list. - * This method can be used to attach ascii or binary data, - * such as a BLOB record from a database. - * @param string $string String attachment data. - * @param string $filename Name of the attachment. - * @param string $encoding File encoding (see $Encoding). - * @param string $type File extension (MIME) type. - * @return void - */ - function AddStringPart($string, $filename, $encoding = "base64", $type = "application/octet-stream") { - // Append to $attachment array - $this->attachment[] = array( - 0 => $string, - 1 => $filename, - 2 => $filename, - 3 => $encoding, - 4 => $type, - 5 => true, // isString - 6 => "part", - 7 => 0 - ); - } - - /** - * Adds an embedded attachment. This can include images, sounds, and - * just about any other document. Make sure to set the $type to an - * image type. For JPEG images use "image/jpeg" and for GIF images - * use "image/gif". - * @param string $path Path to the attachment. - * @param string $cid Content ID of the attachment. Use this to identify - * the Id for accessing the image in an HTML form. - * @param string $name Overrides the attachment name. - * @param string $encoding File encoding (see $Encoding). - * @param string $type File extension (MIME) type. - * @return bool - */ - public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') { - - if ( !@is_file($path) ) { - $this->SetError($this->Lang('file_access') . $path); - return false; - } - - $filename = basename($path); - if ( $name == '' ) { - $name = $filename; - } - - // Append to $attachment array - $this->attachment[] = array( - 0 => $path, - 1 => $filename, - 2 => $name, - 3 => $encoding, - 4 => $type, - 5 => false, // isStringAttachment - 6 => 'inline', - 7 => $cid - ); - - return true; - } - - /** - * Returns true if an inline attachment is present. - * @access public - * @param bool $matchall - matchall attachments to decide. Helpful if you want to decide this is a multipart/mixed or multipart/related mail - * @return bool - */ - public function InlineImageExists($matchall = false) { - $i=0; - foreach($this->attachment as $attachment) { - if ($attachment[6] == 'inline') { - if ($matchall) { - $i++; - } else { - return true; - } - } - } - return ($matchall?($i>0 && $i===count($this->attachment)):false); - } - - ///////////////////////////////////////////////// - // CLASS METHODS, MESSAGE RESET - ///////////////////////////////////////////////// - - /** - * Clears all recipients assigned in the TO array. Returns void. - * @return void - */ - public function ClearAddresses() { - foreach($this->to as $to) { - unset($this->all_recipients[strtolower($to[0])]); - } - $this->to = array(); - } - - /** - * Clears all recipients assigned in the CC array. Returns void. - * @return void - */ - public function ClearCCs() { - foreach($this->cc as $cc) { - unset($this->all_recipients[strtolower($cc[0])]); - } - $this->cc = array(); - } - - /** - * Clears all recipients assigned in the BCC array. Returns void. - * @return void - */ - public function ClearBCCs() { - foreach($this->bcc as $bcc) { - unset($this->all_recipients[strtolower($bcc[0])]); - } - $this->bcc = array(); - } - - /** - * Clears all recipients assigned in the ReplyTo array. Returns void. - * @return void - */ - public function ClearReplyTos() { - $this->ReplyTo = array(); - } - - /** - * Clears all recipients assigned in the TO, CC and BCC - * array. Returns void. - * @return void - */ - public function ClearAllRecipients() { - $this->to = array(); - $this->cc = array(); - $this->bcc = array(); - $this->all_recipients = array(); - } - - /** - * Clears all previously set filesystem, string, and binary - * attachments. Returns void. - * @return void - */ - public function ClearAttachments() { - $this->attachment = array(); - } - - /** - * Clears all custom headers. Returns void. - * @return void - */ - public function ClearCustomHeaders() { - $this->CustomHeader = array(); - } - - public function getMessageHeader() { - if(!isset($this->sentHeader)) { - // Set whether the message is multipart/alternative - if(!empty($this->AltBody) || !empty($this->AltExtended)) $this->ContentType = "multipart/alternative"; - - $this->SetMessageType(); - $header = $this->CreateHeader(); - $this->sentHeader = $header; - } - - return $this->sentHeader; - } - - public function getMessageBody() { - if(!isset($this->sentBody)) { - // Set whether the message is multipart/alternative - if(!empty($this->AltBody) || !empty($this->AltExtended)) $this->ContentType = "multipart/alternative"; - - $this->SetMessageType(); - $body = $this->CreateBody(); - $this->sentBody = $body; - } - - return $this->sentBody; - } - - ///////////////////////////////////////////////// - // CLASS METHODS, MISCELLANEOUS - ///////////////////////////////////////////////// - - /** - * Adds the error message to the error container. - * @access protected - * @return void - */ - protected function SetError($msg) { - $this->error_count++; - if ($this->Mailer == 'smtp' and !is_null($this->smtp)) { - $lasterror = $this->smtp->getError(); - if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) { - $msg .= '

' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "

\n"; - } - } - if (empty($this->ErrorInfo) || strpos($this->ErrorInfo,$msg)===false) $this->ErrorInfo .= (empty($this->ErrorInfo)?'':'
').$msg; - } - - /** - * Returns the proper RFC 822 formatted date. - * @access public - * @return string - * @static - */ - public static function RFCDate() { - $tz = date('Z'); - $tzs = ($tz < 0) ? '-' : '+'; - $tz = abs($tz); - $tz = (int)($tz/3600)*100 + ($tz%3600)/60; - $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz); - - return $result; - } - - /** - * Returns the server hostname or 'localhost.localdomain' if unknown. - * @access private - * @return string - */ - private function ServerHostname() { - if (!empty($this->Hostname)) { - $result = $this->Hostname; - } elseif (isset($_SERVER['SERVER_NAME'])) { - $result = $_SERVER['SERVER_NAME']; - } else { - $result = 'localhost.localdomain'; - } - - return $result; - } - - /** - * Returns a message in the appropriate language. - * @access private - * @return string - */ - private function Lang($key) { - if(count($this->language) < 1) { - $this->SetLanguage('en'); // set the default language - } - - if(isset($this->language[$key])) { - return $this->language[$key]; - } else { - return 'Language string failed to load: ' . $key; - } - } - - /** - * Returns true if an error occurred. - * @access public - * @return bool - */ - public function IsError() { - return ($this->error_count > 0); - } - - /** - * Changes every end of line from CR or LF to CRLF. - * @access private - * @return string - */ - private function FixEOL($str) { - $str = str_replace("\r\n", "\n", $str); - $str = str_replace("\r", "\n", $str); - $str = str_replace("\n", $this->LE, $str); - return $str; - } - - /** - * Adds a custom header. - * @access public - * @return void - */ - public function AddCustomHeader($custom_header) { - $this->CustomHeader[] = explode(':', $custom_header, 2); - } - - /** - * Evaluates the message and returns modifications for inline images and backgrounds - * @access public - * @return $message - */ - public function MsgHTML($message, $basedir = '') { - preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images); - if(isset($images[2])) { - foreach($images[2] as $i => $url) { - // do not change urls for absolute images (thanks to corvuscorax) - if (!preg_match('#^[A-z]+://#',$url)) { - $filename = basename($url); - $directory = dirname($url); - ($directory == '.')?$directory='':''; - $cid = 'cid:' . md5($filename); - $ext = pathinfo($filename, PATHINFO_EXTENSION); - $mimeType = self::_mime_types($ext); - if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; } - if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; } - if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) { - $message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message); - } - } - } - } - $this->IsHTML(true); - $this->Body = $message; - $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message))); - if (!empty($textMsg) && empty($this->AltBody)) { - $this->AltBody = html_entity_decode($textMsg); - } - if (empty($this->AltBody)) { - $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n"; - } - } - - /** - * Gets the MIME type of the embedded or inline image - * @param string File extension - * @access public - * @return string MIME type of ext - * @static - */ - public static function _mime_types($ext = '') { - $mimes = array( - 'hqx' => 'application/mac-binhex40', - 'cpt' => 'application/mac-compactpro', - 'doc' => 'application/msword', - 'bin' => 'application/macbinary', - 'dms' => 'application/octet-stream', - 'lha' => 'application/octet-stream', - 'lzh' => 'application/octet-stream', - 'exe' => 'application/octet-stream', - 'class' => 'application/octet-stream', - 'psd' => 'application/octet-stream', - 'so' => 'application/octet-stream', - 'sea' => 'application/octet-stream', - 'dll' => 'application/octet-stream', - 'oda' => 'application/oda', - 'pdf' => 'application/pdf', - 'ai' => 'application/postscript', - 'eps' => 'application/postscript', - 'ps' => 'application/postscript', - 'smi' => 'application/smil', - 'smil' => 'application/smil', - 'mif' => 'application/vnd.mif', - 'xls' => 'application/vnd.ms-excel', - 'ppt' => 'application/vnd.ms-powerpoint', - 'wbxml' => 'application/vnd.wap.wbxml', - 'wmlc' => 'application/vnd.wap.wmlc', - 'dcr' => 'application/x-director', - 'dir' => 'application/x-director', - 'dxr' => 'application/x-director', - 'dvi' => 'application/x-dvi', - 'gtar' => 'application/x-gtar', - 'php' => 'application/x-httpd-php', - 'php4' => 'application/x-httpd-php', - 'php3' => 'application/x-httpd-php', - 'phtml' => 'application/x-httpd-php', - 'phps' => 'application/x-httpd-php-source', - 'js' => 'application/x-javascript', - 'swf' => 'application/x-shockwave-flash', - 'sit' => 'application/x-stuffit', - 'tar' => 'application/x-tar', - 'tgz' => 'application/x-tar', - 'xhtml' => 'application/xhtml+xml', - 'xht' => 'application/xhtml+xml', - 'zip' => 'application/zip', - 'mid' => 'audio/midi', - 'midi' => 'audio/midi', - 'mpga' => 'audio/mpeg', - 'mp2' => 'audio/mpeg', - 'mp3' => 'audio/mpeg', - 'aif' => 'audio/x-aiff', - 'aiff' => 'audio/x-aiff', - 'aifc' => 'audio/x-aiff', - 'ram' => 'audio/x-pn-realaudio', - 'rm' => 'audio/x-pn-realaudio', - 'rpm' => 'audio/x-pn-realaudio-plugin', - 'ra' => 'audio/x-realaudio', - 'rv' => 'video/vnd.rn-realvideo', - 'wav' => 'audio/x-wav', - 'bmp' => 'image/bmp', - 'gif' => 'image/gif', - 'jpeg' => 'image/jpeg', - 'jpg' => 'image/jpeg', - 'jpe' => 'image/jpeg', - 'png' => 'image/png', - 'tiff' => 'image/tiff', - 'tif' => 'image/tiff', - 'css' => 'text/css', - 'html' => 'text/html', - 'htm' => 'text/html', - 'shtml' => 'text/html', - 'txt' => 'text/plain', - 'text' => 'text/plain', - 'log' => 'text/plain', - 'rtx' => 'text/richtext', - 'rtf' => 'text/rtf', - 'xml' => 'text/xml', - 'xsl' => 'text/xml', - 'mpeg' => 'video/mpeg', - 'mpg' => 'video/mpeg', - 'mpe' => 'video/mpeg', - 'qt' => 'video/quicktime', - 'mov' => 'video/quicktime', - 'avi' => 'video/x-msvideo', - 'movie' => 'video/x-sgi-movie', - 'doc' => 'application/msword', - 'word' => 'application/msword', - 'xl' => 'application/excel', - 'eml' => 'message/rfc822' - ); - return (!isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)]; - } - - /** - * Set (or reset) Class Objects (variables) - * - * Usage Example: - * $page->set('X-Priority', '3'); - * - * @access public - * @param string $name Parameter Name - * @param mixed $value Parameter Value - * NOTE: will not work with arrays, there are no arrays to set/reset - * @todo Should this not be using __set() magic function? - */ - public function set($name, $value = '') { - try { - if (isset($this->$name) ) { - $this->$name = $value; - } else { - throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL); - } - } catch (Exception $e) { - $this->SetError($e->getMessage()); - if ($e->getCode() == self::STOP_CRITICAL) { - return false; - } - } - return true; - } - - /** - * Strips newlines to prevent header injection. - * @access public - * @param string $str String - * @return string - */ - public function SecureHeader($str) { - $str = str_replace("\r", '', $str); - $str = str_replace("\n", '', $str); - return trim($str); - } - - /** - * Set the private key file and password to sign the message. - * - * @access public - * @param string $key_filename Parameter File Name - * @param string $key_pass Password for private key - */ - public function Sign($cert_filename, $key_filename, $key_pass) { - $this->sign_cert_file = $cert_filename; - $this->sign_key_file = $key_filename; - $this->sign_key_pass = $key_pass; - } - - /** - * Set the private key file and password to sign the message. - * - * @access public - * @param string $key_filename Parameter File Name - * @param string $key_pass Password for private key - */ - public function DKIM_QP($txt) { - $tmp=""; - $line=""; - for ($i=0;$iDKIM_private); - if ($this->DKIM_passphrase!='') { - $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase); - } else { - $privKey = $privKeyStr; - } - if (openssl_sign($s, $signature, $privKey)) { - return base64_encode($signature); - } - } - - /** - * Generate DKIM Canonicalization Header - * - * @access public - * @param string $s Header - */ - public function DKIM_HeaderC($s) { - $s=preg_replace("/\r\n\s+/"," ",$s); - $lines=explode("\r\n",$s); - foreach ($lines as $key=>$line) { - list($heading,$value)=explode(":",$line,2); - $heading=strtolower($heading); - $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces - $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value - } - $s=implode("\r\n",$lines); - return $s; - } - - /** - * Generate DKIM Canonicalization Body - * - * @access public - * @param string $body Message Body - */ - public function DKIM_BodyC($body) { - if ($body == '') return "\r\n"; - // stabilize line endings - $body=str_replace("\r\n","\n",$body); - $body=str_replace("\n","\r\n",$body); - // END stabilize line endings - while (substr($body,strlen($body)-4,4) == "\r\n\r\n") { - $body=substr($body,0,strlen($body)-2); - } - return $body; - } - - /** - * Create the DKIM header, body, as new header - * - * @access public - * @param string $headers_line Header lines - * @param string $subject Subject - * @param string $body Body - */ - public function DKIM_Add($headers_line,$subject,$body) { - $DKIMsignatureType = 'rsa-sha1'; // Signature & hash algorithms - $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body - $DKIMquery = 'dns/txt'; // Query method - $DKIMtime = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone) - $subject_header = "Subject: $subject"; - $headers = explode("\r\n",$headers_line); - foreach($headers as $header) { - if (strpos($header,'From:') === 0) { - $from_header=$header; - } elseif (strpos($header,'To:') === 0) { - $to_header=$header; - } - } - $from = str_replace('|','=7C',$this->DKIM_QP($from_header)); - $to = str_replace('|','=7C',$this->DKIM_QP($to_header)); - $subject = str_replace('|','=7C',$this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable - $body = $this->DKIM_BodyC($body); - $DKIMlen = strlen($body) ; // Length of body - $DKIMb64 = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body - $ident = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";"; - $dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n". - "\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n". - "\th=From:To:Subject;\r\n". - "\td=" . $this->DKIM_domain . ";" . $ident . "\r\n". - "\tz=$from\r\n". - "\t|$to\r\n". - "\t|$subject;\r\n". - "\tbh=" . $DKIMb64 . ";\r\n". - "\tb="; - $toSign = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs); - $signed = $this->DKIM_Sign($toSign); - return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n"; - } - - protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) { - if (!empty($this->action_function) && function_exists($this->action_function)) { - $params = array($isSent,$to,$cc,$bcc,$subject,$body); - call_user_func_array($this->action_function,$params); - } - } -} - -class phpmailerException extends Exception { - public function errorMessage() { - $errorMsg = '' . $this->getMessage() . "
\n"; - return $errorMsg; - } -} -?> diff --git a/phpgwapi/inc/class.smtp.php b/phpgwapi/inc/class.smtp.php deleted file mode 100644 index 8cefb83e11..0000000000 --- a/phpgwapi/inc/class.smtp.php +++ /dev/null @@ -1,840 +0,0 @@ -smtp_conn = 0; - $this->error = null; - $this->helo_rply = null; - - $this->do_debug = 0; - } - - ///////////////////////////////////////////////// - // CONNECTION FUNCTIONS - ///////////////////////////////////////////////// - - /** - * Connect to the server specified on the port specified. - * If the port is not specified use the default SMTP_PORT. - * If tval is specified then a connection will try and be - * established with the server for that number of seconds. - * If tval is not specified the default is 30 seconds to - * try on the connection. - * - * SMTP CODE SUCCESS: 220 - * SMTP CODE FAILURE: 421 - * @access public - * @return bool - */ - public function Connect($host, $port = 0, $tval = 30) { - // set the error val to null so there is no confusion - $this->error = null; - - // make sure we are __not__ connected - if($this->connected()) { - // already connected, generate error - $this->error = array("error" => "Already connected to a server"); - return false; - } - - if(empty($port)) { - $port = $this->SMTP_PORT; - } - - // connect to the smtp server - $this->smtp_conn = @fsockopen($host, // the host of the server - $port, // the port to use - $errno, // error number if any - $errstr, // error message if any - $tval); // give up after ? secs - // verify we connected properly - if(empty($this->smtp_conn)) { - $this->error = array("error" => "Failed to connect to server", - "errno" => $errno, - "errstr" => $errstr); - if($this->do_debug >= 1) { - error_log(__METHOD__.' Line:'.__LINE__."->"."SMTP -> ERROR: " . $this->error["error"] . ": $errstr ($errno)" . $this->CRLF); - } - return false; - } - - // SMTP server can take longer to respond, give longer timeout for first read - // Windows does not have support for this timeout function - if(substr(PHP_OS, 0, 3) != "WIN") - socket_set_timeout($this->smtp_conn, $tval, 0); - - // get any announcement - $announce = $this->get_lines(); - - if($this->do_debug >= 2) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> FROM SERVER:" . $announce . $this->CRLF ); - } - - return true; - } - - /** - * Initiate a TLS communication with the server. - * - * SMTP CODE 220 Ready to start TLS - * SMTP CODE 501 Syntax error (no parameters allowed) - * SMTP CODE 454 TLS not available due to temporary reason - * @access public - * @return bool success - */ - public function StartTLS() { - $this->error = null; # to avoid confusion - - if(!$this->connected()) { - $this->error = array("error" => "Called StartTLS() without being connected"); - return false; - } - - fputs($this->smtp_conn,"STARTTLS" . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($this->do_debug >= 2) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> FROM SERVER:" . $rply . $this->CRLF ); - } - - if($code != 220) { - $this->error = - array("error" => "STARTTLS not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF ); - } - return false; - } - - // Begin encrypted connection - if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) { - // try a different method, as sometimes you must first switch to blocking mode, if you have problems with timeouts - stream_set_blocking($this->smtp_conn, true); - $retval = stream_socket_enable_crypto($this_smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT); - stream_set_blocking ($this->smtp_conn, false); - if (!$retval) return false; - } - - return true; - } - - /** - * Performs SMTP authentication. Must be run after running the - * Hello() method. Returns true if successfully authenticated. - * @access public - * @return bool - */ - public function Authenticate($username, $password) { - // Start authentication - fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($code != 334) { - $this->error = - array("error" => "AUTH not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF ); - } - return false; - } - - // Send encoded username - fputs($this->smtp_conn, base64_encode($username) . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($code != 334) { - $this->error = - array("error" => "Username not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF ); - } - return false; - } - - // Send encoded password - fputs($this->smtp_conn, base64_encode($password) . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($code != 235) { - $this->error = - array("error" => "Password not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF ); - } - return false; - } - - return true; - } - - /** - * Returns true if connected to a server otherwise false - * @access public - * @return bool - */ - public function Connected() { - if(!empty($this->smtp_conn)) { - $sock_status = socket_get_status($this->smtp_conn); - if($sock_status["eof"]) { - // the socket is valid but we are not connected - if($this->do_debug >= 1) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking if connected"); - } - $this->Close(); - return false; - } - return true; // everything looks good - } - return false; - } - - /** - * Closes the socket and cleans up the state of the class. - * It is not considered good to use this function without - * first trying to use QUIT. - * @access public - * @return void - */ - public function Close() { - $this->error = null; // so there is no confusion - $this->helo_rply = null; - if(!empty($this->smtp_conn)) { - // close the connection and cleanup - fclose($this->smtp_conn); - $this->smtp_conn = 0; - } - } - - ///////////////////////////////////////////////// - // SMTP COMMANDS - ///////////////////////////////////////////////// - - /** - * Issues a data command and sends the msg_data to the server - * finializing the mail transaction. $msg_data is the message - * that is to be send with the headers. Each header needs to be - * on a single line followed by a with the message headers - * and the message body being seperated by and additional . - * - * Implements rfc 821: DATA - * - * SMTP CODE INTERMEDIATE: 354 - * [data] - * . - * SMTP CODE SUCCESS: 250 - * SMTP CODE FAILURE: 552,554,451,452 - * SMTP CODE FAILURE: 451,554 - * SMTP CODE ERROR : 500,501,503,421 - * @access public - * @return bool - */ - public function Data($msg_data) { - $this->error = null; // so no confusion is caused - - if(!$this->connected()) { - $this->error = array( - "error" => "Called Data() without being connected"); - return false; - } - - fputs($this->smtp_conn,"DATA" . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($this->do_debug >= 2) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> FROM SERVER:" . $rply . $this->CRLF ); - } - - if($code != 354 && $code != 250) { - $this->error = - array("error" => "DATA command not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF ); - } - return false; - } - - /* the server is ready to accept data! - * according to rfc 821 we should not send more than 1000 - * including the CRLF - * characters on a single line so we will break the data up - * into lines by \r and/or \n then if needed we will break - * each of those into smaller lines to fit within the limit. - * in addition we will be looking for lines that start with - * a period '.' and append and additional period '.' to that - * line. NOTE: this does not count towards limit. - */ - - // normalize the line breaks so we know the explode works - $msg_data = str_replace("\r\n","\n",$msg_data); - $msg_data = str_replace("\r","\n",$msg_data); - $lines = explode("\n",$msg_data); - - /* we need to find a good way to determine is headers are - * in the msg_data or if it is a straight msg body - * currently I am assuming rfc 822 definitions of msg headers - * and if the first field of the first line (':' sperated) - * does not contain a space then it _should_ be a header - * and we can process all lines before a blank "" line as - * headers. - */ - - $field = substr($lines[0],0,strpos($lines[0],":")); - $in_headers = false; - if(!empty($field) && strpos($field," ")===false) { - $in_headers = true; - } - - $max_line_length = 998; // used below; set here for ease in change - - while(list(,$line) = @each($lines)) { - $lines_out = null; - if($line == "" && $in_headers) { - $in_headers = false; - } - // ok we need to break this line up into several smaller lines - while(strlen($line) > $max_line_length) { - $pos = strrpos(substr($line,0,$max_line_length)," "); - - // Patch to fix DOS attack - if(!$pos) { - $pos = $max_line_length - 1; - $lines_out[] = substr($line,0,$pos); - $line = substr($line,$pos); - } else { - $lines_out[] = substr($line,0,$pos); - $line = substr($line,$pos + 1); - } - - /* if processing headers add a LWSP-char to the front of new line - * rfc 822 on long msg headers - */ - if($in_headers) { - $line = "\t" . $line; - } - } - $lines_out[] = $line; - - // send the lines to the server - while(list(,$line_out) = @each($lines_out)) { - if(strlen($line_out) > 0) - { - if(substr($line_out, 0, 1) == ".") { - $line_out = "." . $line_out; - } - } - fputs($this->smtp_conn,$line_out . $this->CRLF); - } - } - - // message data has been sent - fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF); - - $rply = $this->get_lines(); - # if the server is slow try to get an answer within 30 seconds - $timeout_counter = 0; - while(($rply=="") && ($timeout_counter<30)) - { - $timeout_counter+=1; - sleep(1); - $rply = $this->get_lines(); - } - # still no response to our data -> fail! - if($rply=="") - { - $this->error = array("error" => "timeout from server after data sent.", - "smtp_code" => 0, - "smtp_msg" => "(nothing)"); - - if($this->do_debug >= 1) { - error_log(__METHOD__."->". "SMTP -> ERROR: " . $this->error["error"] . - ": " . $rply . $this->CRLF); - } - return false; - } - - $code = substr($rply,0,3); - - if($this->do_debug >= 2) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> FROM SERVER:" . $rply . $this->CRLF ); - } - - if($code != 250) { - $this->error = - array("error" => "DATA not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF ); - } - return false; - } - return true; - } - - /** - * Sends the HELO command to the smtp server. - * This makes sure that we and the server are in - * the same known state. - * - * Implements from rfc 821: HELO - * - * SMTP CODE SUCCESS: 250 - * SMTP CODE ERROR : 500, 501, 504, 421 - * @access public - * @return bool - */ - public function Hello($host = '') { - $this->error = null; // so no confusion is caused - - if(!$this->connected()) { - $this->error = array( - "error" => "Called Hello() without being connected"); - return false; - } - - // if hostname for HELO was not specified send default - if(empty($host)) { - // determine appropriate default to send to server - $host = "localhost"; - } - - // Send extended hello first (RFC 2821) - if(!$this->SendHello("EHLO", $host)) { - if(!$this->SendHello("HELO", $host)) { - return false; - } - } - - return true; - } - - /** - * Sends a HELO/EHLO command. - * @access private - * @return bool - */ - private function SendHello($hello, $host) { - fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($this->do_debug >= 2) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> FROM SERVER: " . $rply . $this->CRLF ); - } - - if($code != 250) { - $this->error = - array("error" => $hello . " not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF ); - } - return false; - } - - $this->helo_rply = $rply; - - return true; - } - - /** - * Starts a mail transaction from the email address specified in - * $from. Returns true if successful or false otherwise. If True - * the mail transaction is started and then one or more Recipient - * commands may be called followed by a Data command. - * - * Implements rfc 821: MAIL FROM: - * - * SMTP CODE SUCCESS: 250 - * SMTP CODE SUCCESS: 552,451,452 - * SMTP CODE SUCCESS: 500,501,421 - * @access public - * @return bool - */ - public function Mail($from) { - $this->error = null; // so no confusion is caused - - if(!$this->connected()) { - $this->error = array( - "error" => "Called Mail() without being connected"); - return false; - } - - $useVerp = ($this->do_verp ? "XVERP" : ""); - fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($this->do_debug >= 2) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> FROM SERVER:" . $rply . $this->CRLF ); - } - - if($code != 250) { - $this->error = - array("error" => "MAIL not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF ); - } - return false; - } - return true; - } - - /** - * Sends the quit command to the server and then closes the socket - * if there is no error or the $close_on_error argument is true. - * - * Implements from rfc 821: QUIT - * - * SMTP CODE SUCCESS: 221 - * SMTP CODE ERROR : 500 - * @access public - * @return bool - */ - public function Quit($close_on_error = true) { - $this->error = null; // so there is no confusion - - if(!$this->connected()) { - $this->error = array( - "error" => "Called Quit() without being connected"); - return false; - } - - // send the quit command to the server - fputs($this->smtp_conn,"QUIT" . $this->CRLF); - - // get any good-bye messages - $byemsg = $this->get_lines(); - - if($this->do_debug >= 2) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF ); - } - - $rval = true; - $e = null; - - $code = substr($byemsg,0,3); - if($code != 221) { - // use e as a tmp var cause Close will overwrite $this->error - $e = array("error" => "SMTP server rejected quit command", - "smtp_code" => $code, - "smtp_rply" => substr($byemsg,4)); - $rval = false; - if($this->do_debug >= 1) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF ); - } - } - - if(empty($e) || $close_on_error) { - $this->Close(); - } - - return $rval; - } - - /** - * Sends the command RCPT to the SMTP server with the TO: argument of $to. - * Returns true if the recipient was accepted false if it was rejected. - * - * Implements from rfc 821: RCPT TO: - * - * SMTP CODE SUCCESS: 250,251 - * SMTP CODE FAILURE: 550,551,552,553,450,451,452 - * SMTP CODE ERROR : 500,501,503,421 - * @access public - * @return bool - */ - public function Recipient($to) { - $this->error = null; // so no confusion is caused - - if(!$this->connected()) { - $this->error = array( - "error" => "Called Recipient() without being connected"); - return false; - } - - fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($this->do_debug >= 2) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> FROM SERVER:" . $rply . $this->CRLF ); - } - - if($code != 250 && $code != 251) { - $this->error = - array("error" => "RCPT not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF ); - } - return false; - } - return true; - } - - /** - * Sends the RSET command to abort and transaction that is - * currently in progress. Returns true if successful false - * otherwise. - * - * Implements rfc 821: RSET - * - * SMTP CODE SUCCESS: 250 - * SMTP CODE ERROR : 500,501,504,421 - * @access public - * @return bool - */ - public function Reset() { - $this->error = null; // so no confusion is caused - - if(!$this->connected()) { - $this->error = array( - "error" => "Called Reset() without being connected"); - return false; - } - - fputs($this->smtp_conn,"RSET" . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($this->do_debug >= 2) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> FROM SERVER:" . $rply . $this->CRLF ); - } - - if($code != 250) { - $this->error = - array("error" => "RSET failed", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF ); - } - return false; - } - - return true; - } - - /** - * Starts a mail transaction from the email address specified in - * $from. Returns true if successful or false otherwise. If True - * the mail transaction is started and then one or more Recipient - * commands may be called followed by a Data command. This command - * will send the message to the users terminal if they are logged - * in and send them an email. - * - * Implements rfc 821: SAML FROM: - * - * SMTP CODE SUCCESS: 250 - * SMTP CODE SUCCESS: 552,451,452 - * SMTP CODE SUCCESS: 500,501,502,421 - * @access public - * @return bool - */ - public function SendAndMail($from) { - $this->error = null; // so no confusion is caused - - if(!$this->connected()) { - $this->error = array( - "error" => "Called SendAndMail() without being connected"); - return false; - } - - fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF); - - $rply = $this->get_lines(); - $code = substr($rply,0,3); - - if($this->do_debug >= 2) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> FROM SERVER:" . $rply . $this->CRLF ); - } - - if($code != 250) { - $this->error = - array("error" => "SAML not accepted from server", - "smtp_code" => $code, - "smtp_msg" => substr($rply,4)); - if($this->do_debug >= 1) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF ); - } - return false; - } - return true; - } - - /** - * This is an optional command for SMTP that this class does not - * support. This method is here to make the RFC821 Definition - * complete for this class and __may__ be implimented in the future - * - * Implements from rfc 821: TURN - * - * SMTP CODE SUCCESS: 250 - * SMTP CODE FAILURE: 502 - * SMTP CODE ERROR : 500, 503 - * @access public - * @return bool - */ - public function Turn() { - $this->error = array("error" => "This method, TURN, of the SMTP ". - "is not implemented"); - if($this->do_debug >= 1) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF ); - } - return false; - } - - /** - * Get the current error - * @access public - * @return array - */ - public function getError() { - return $this->error; - } - - ///////////////////////////////////////////////// - // INTERNAL FUNCTIONS - ///////////////////////////////////////////////// - - /** - * Read in as many lines as possible - * either before eof or socket timeout occurs on the operation. - * With SMTP we can tell if we have more lines to read if the - * 4th character is '-' symbol. If it is a space then we don't - * need to read anything else. - * @access private - * @return string - */ - private function get_lines() { - $data = ""; - while($str = @fgets($this->smtp_conn,515)) { - if($this->do_debug >= 4) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF ); - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> get_lines(): \$str is \"$str\"" . $this->CRLF ); - } - $data .= $str; - if($this->do_debug >= 4) { - error_log(__METHOD__.' Line:'.__LINE__."->". "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF ); - } - // if 4th character is a space, we are done reading, break the loop - if(substr($str,3,1) == " ") { break; } - } - return $data; - } - -} - -?> diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php index 2a532ac4a4..b0c75794b5 100755 --- a/phpgwapi/inc/common_functions.inc.php +++ b/phpgwapi/inc/common_functions.inc.php @@ -150,12 +150,8 @@ if (!function_exists('imap_rfc822_write_address')) */ function imap_rfc822_write_address($mailbox, $host, $personal) { - if (is_array($personal)) { - foreach ($personal as $e) { - $p .= ($p?' ':'').$e; - } - $personal = $p; - } + if (is_array($personal)) $personal = implode(' ', $personal); + //if (!preg_match('/^[!#$%&\'*+/0-9=?A-Z^_`a-z{|}~-]+$/u', $personal)) // that's how I read the rfc(2)822 if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal)) // but quoting is never wrong, so quote more then necessary { diff --git a/phpgwapi/lang/phpmailer.lang-ar.php b/phpgwapi/lang/phpmailer.lang-ar.php deleted file mode 100644 index b7c5057d0c..0000000000 --- a/phpgwapi/lang/phpmailer.lang-ar.php +++ /dev/null @@ -1,27 +0,0 @@ - -*/ - -$PHPMAILER_LANG['authenticate'] = 'SMTP Error: لم نستطع تأكيد الهوية.'; -$PHPMAILER_LANG['connect_host'] = 'SMTP Error: لم نستطع الاتصال بمخدم SMTP.'; -$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: لم يتم قبول المعلومات .'; -//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; -$PHPMAILER_LANG['encoding'] = 'ترميز غير معروف: '; -$PHPMAILER_LANG['execute'] = 'لم أستطع تنفيذ : '; -$PHPMAILER_LANG['file_access'] = 'لم نستطع الوصول للملف: '; -$PHPMAILER_LANG['file_open'] = 'File Error: لم نستطع فتح الملف: '; -$PHPMAILER_LANG['from_failed'] = 'البريد التالي لم نستطع ارسال البريد له : '; -$PHPMAILER_LANG['instantiate'] = 'لم نستطع توفير خدمة البريد.'; -//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; -$PHPMAILER_LANG['mailer_not_supported'] = ' mailer غير مدعوم.'; -//$PHPMAILER_LANG['provide_address'] = 'You must provide at least one recipient email address.'; -$PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: الأخطاء التالية ' . - 'فشل في الارسال لكل من : '; -$PHPMAILER_LANG['signing'] = 'خطأ في التوقيع: '; -//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; -//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; -//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; -?> \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-br.php b/phpgwapi/lang/phpmailer.lang-br.php deleted file mode 100644 index 6afe60b18c..0000000000 --- a/phpgwapi/lang/phpmailer.lang-br.php +++ /dev/null @@ -1,26 +0,0 @@ - \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-ca.php b/phpgwapi/lang/phpmailer.lang-ca.php deleted file mode 100644 index 4a160a21eb..0000000000 --- a/phpgwapi/lang/phpmailer.lang-ca.php +++ /dev/null @@ -1,26 +0,0 @@ - \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-ch.php b/phpgwapi/lang/phpmailer.lang-ch.php deleted file mode 100644 index 31ebd861cb..0000000000 --- a/phpgwapi/lang/phpmailer.lang-ch.php +++ /dev/null @@ -1,26 +0,0 @@ - \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-cz.php b/phpgwapi/lang/phpmailer.lang-cz.php deleted file mode 100644 index 1c8b206392..0000000000 --- a/phpgwapi/lang/phpmailer.lang-cz.php +++ /dev/null @@ -1,25 +0,0 @@ - \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-de.php b/phpgwapi/lang/phpmailer.lang-de.php deleted file mode 100644 index b2a76ce1b5..0000000000 --- a/phpgwapi/lang/phpmailer.lang-de.php +++ /dev/null @@ -1,25 +0,0 @@ - \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-dk.php b/phpgwapi/lang/phpmailer.lang-dk.php deleted file mode 100644 index b26257316b..0000000000 --- a/phpgwapi/lang/phpmailer.lang-dk.php +++ /dev/null @@ -1,26 +0,0 @@ - -*/ - -$PHPMAILER_LANG['authenticate'] = 'SMTP fejl: Kunne ikke logge på.'; -$PHPMAILER_LANG['connect_host'] = 'SMTP fejl: Kunne ikke tilslutte SMTP serveren.'; -$PHPMAILER_LANG['data_not_accepted'] = 'SMTP fejl: Data kunne ikke accepteres.'; -//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; -$PHPMAILER_LANG['encoding'] = 'Ukendt encode-format: '; -$PHPMAILER_LANG['execute'] = 'Kunne ikke køre: '; -$PHPMAILER_LANG['file_access'] = 'Ingen adgang til fil: '; -$PHPMAILER_LANG['file_open'] = 'Fil fejl: Kunne ikke åbne filen: '; -$PHPMAILER_LANG['from_failed'] = 'Følgende afsenderadresse er forkert: '; -$PHPMAILER_LANG['instantiate'] = 'Kunne ikke initialisere email funktionen.'; -//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; -$PHPMAILER_LANG['mailer_not_supported'] = ' mailer understøttes ikke.'; -$PHPMAILER_LANG['provide_address'] = 'Du skal indtaste mindst en modtagers emailadresse.'; -$PHPMAILER_LANG['recipients_failed'] = 'SMTP fejl: Følgende modtagere er forkerte: '; -//$PHPMAILER_LANG['signing'] = 'Signing Error: '; -//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; -//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; -//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; -?> \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-es.php b/phpgwapi/lang/phpmailer.lang-es.php deleted file mode 100644 index 69b6817482..0000000000 --- a/phpgwapi/lang/phpmailer.lang-es.php +++ /dev/null @@ -1,26 +0,0 @@ - \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-et.php b/phpgwapi/lang/phpmailer.lang-et.php deleted file mode 100644 index cf61779b08..0000000000 --- a/phpgwapi/lang/phpmailer.lang-et.php +++ /dev/null @@ -1,26 +0,0 @@ - \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-fi.php b/phpgwapi/lang/phpmailer.lang-fi.php deleted file mode 100644 index 12a845aad6..0000000000 --- a/phpgwapi/lang/phpmailer.lang-fi.php +++ /dev/null @@ -1,27 +0,0 @@ - \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-fo.php b/phpgwapi/lang/phpmailer.lang-fo.php deleted file mode 100644 index 6bd9b0a213..0000000000 --- a/phpgwapi/lang/phpmailer.lang-fo.php +++ /dev/null @@ -1,27 +0,0 @@ - \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-fr.php b/phpgwapi/lang/phpmailer.lang-fr.php deleted file mode 100644 index c99ac3caf9..0000000000 --- a/phpgwapi/lang/phpmailer.lang-fr.php +++ /dev/null @@ -1,25 +0,0 @@ - \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-hu.php b/phpgwapi/lang/phpmailer.lang-hu.php deleted file mode 100644 index caca0b50f1..0000000000 --- a/phpgwapi/lang/phpmailer.lang-hu.php +++ /dev/null @@ -1,25 +0,0 @@ - \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-it.php b/phpgwapi/lang/phpmailer.lang-it.php deleted file mode 100644 index fc1fcb8d2e..0000000000 --- a/phpgwapi/lang/phpmailer.lang-it.php +++ /dev/null @@ -1,27 +0,0 @@ - -*/ - -$PHPMAILER_LANG['authenticate'] = 'SMTP Error: Impossibile autenticarsi.'; -$PHPMAILER_LANG['connect_host'] = 'SMTP Error: Impossibile connettersi all\'host SMTP.'; -$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: Data non accettati dal server.'; -//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; -$PHPMAILER_LANG['encoding'] = 'Encoding set dei caratteri sconosciuto: '; -$PHPMAILER_LANG['execute'] = 'Impossibile eseguire l\'operazione: '; -$PHPMAILER_LANG['file_access'] = 'Impossibile accedere al file: '; -$PHPMAILER_LANG['file_open'] = 'File Error: Impossibile aprire il file: '; -$PHPMAILER_LANG['from_failed'] = 'I seguenti indirizzi mittenti hanno generato errore: '; -$PHPMAILER_LANG['instantiate'] = 'Impossibile istanziare la funzione mail'; -//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; -$PHPMAILER_LANG['provide_address'] = 'Deve essere fornito almeno un indirizzo ricevente'; -$PHPMAILER_LANG['mailer_not_supported'] = 'Mailer non supportato'; -$PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: I seguenti indirizzi destinatari hanno generato errore: '; -//$PHPMAILER_LANG['signing'] = 'Signing Error: '; -//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; -//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; -//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; -?> \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-ja.php b/phpgwapi/lang/phpmailer.lang-ja.php deleted file mode 100644 index 63cfb23b6a..0000000000 --- a/phpgwapi/lang/phpmailer.lang-ja.php +++ /dev/null @@ -1,26 +0,0 @@ - \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-nl.php b/phpgwapi/lang/phpmailer.lang-nl.php deleted file mode 100644 index d2c380b09d..0000000000 --- a/phpgwapi/lang/phpmailer.lang-nl.php +++ /dev/null @@ -1,25 +0,0 @@ - \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-no.php b/phpgwapi/lang/phpmailer.lang-no.php deleted file mode 100644 index 65cb884399..0000000000 --- a/phpgwapi/lang/phpmailer.lang-no.php +++ /dev/null @@ -1,25 +0,0 @@ - \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-pl.php b/phpgwapi/lang/phpmailer.lang-pl.php deleted file mode 100644 index f4fd801d61..0000000000 --- a/phpgwapi/lang/phpmailer.lang-pl.php +++ /dev/null @@ -1,25 +0,0 @@ - \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-ro.php b/phpgwapi/lang/phpmailer.lang-ro.php deleted file mode 100644 index f6aa922556..0000000000 --- a/phpgwapi/lang/phpmailer.lang-ro.php +++ /dev/null @@ -1,27 +0,0 @@ - -*/ - -$PHPMAILER_LANG['authenticate'] = 'Eroare SMTP: Nu a functionat autentificarea.'; -$PHPMAILER_LANG['connect_host'] = 'Eroare SMTP: Nu m-am putut conecta la adresa SMTP.'; -$PHPMAILER_LANG['data_not_accepted'] = 'Eroare SMTP: Continutul mailului nu a fost acceptat.'; -//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; -$PHPMAILER_LANG['encoding'] = 'Encodare necunoscuta: '; -$PHPMAILER_LANG['execute'] = 'Nu pot executa: '; -$PHPMAILER_LANG['file_access'] = 'Nu pot accesa fisierul: '; -$PHPMAILER_LANG['file_open'] = 'Eroare de fisier: Nu pot deschide fisierul: '; -$PHPMAILER_LANG['from_failed'] = 'Urmatoarele adrese From au dat eroare: '; -$PHPMAILER_LANG['instantiate'] = 'Nu am putut instantia functia mail.'; -//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; -$PHPMAILER_LANG['mailer_not_supported'] = ' mailer nu este suportat.'; -$PHPMAILER_LANG['provide_address'] = 'Trebuie sa adaugati cel putin un recipient (adresa de mail).'; -$PHPMAILER_LANG['recipients_failed'] = 'Eroare SMTP: Urmatoarele adrese de mail au dat eroare: '; -//$PHPMAILER_LANG['signing'] = 'Signing Error: '; -//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; -//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; -//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; -?> \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-ru.php b/phpgwapi/lang/phpmailer.lang-ru.php deleted file mode 100644 index d6990525de..0000000000 --- a/phpgwapi/lang/phpmailer.lang-ru.php +++ /dev/null @@ -1,25 +0,0 @@ - -*/ - -$PHPMAILER_LANG['authenticate'] = 'Ошибка SMTP: ошибка авторизации.'; -$PHPMAILER_LANG['connect_host'] = 'Ошибка SMTP: не удается подключиться к серверу SMTP.'; -$PHPMAILER_LANG['data_not_accepted'] = 'Ошибка SMTP: данные не приняты.'; -//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; -$PHPMAILER_LANG['encoding'] = 'Неизвестный вид кодировки: '; -$PHPMAILER_LANG['execute'] = 'Невозможно выполнить команду: '; -$PHPMAILER_LANG['file_access'] = 'Нет доступа к файлу: '; -$PHPMAILER_LANG['file_open'] = 'Файловая ошибка: не удается открыть файл: '; -$PHPMAILER_LANG['from_failed'] = 'Неверный адрес отправителя: '; -$PHPMAILER_LANG['instantiate'] = 'Невозможно запустить функцию mail.'; -//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; -$PHPMAILER_LANG['provide_address'] = 'Пожалуйста, введите хотя бы один адрес e-mail получателя.'; -$PHPMAILER_LANG['mailer_not_supported'] = ' - почтовый сервер не поддерживается.'; -$PHPMAILER_LANG['recipients_failed'] = 'Ошибка SMTP: отправка по следующим адресам получателей не удалась: '; -//$PHPMAILER_LANG['signing'] = 'Signing Error: '; -//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; -//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; -//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; -?> \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-se.php b/phpgwapi/lang/phpmailer.lang-se.php deleted file mode 100644 index 67e05f59c6..0000000000 --- a/phpgwapi/lang/phpmailer.lang-se.php +++ /dev/null @@ -1,26 +0,0 @@ - -*/ - -$PHPMAILER_LANG['authenticate'] = 'SMTP fel: Kunde inte autentisera.'; -$PHPMAILER_LANG['connect_host'] = 'SMTP fel: Kunde inte ansluta till SMTP-server.'; -$PHPMAILER_LANG['data_not_accepted'] = 'SMTP fel: Data accepterades inte.'; -//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; -$PHPMAILER_LANG['encoding'] = 'Okänt encode-format: '; -$PHPMAILER_LANG['execute'] = 'Kunde inte köra: '; -$PHPMAILER_LANG['file_access'] = 'Ingen åtkomst till fil: '; -$PHPMAILER_LANG['file_open'] = 'Fil fel: Kunde inte öppna fil: '; -$PHPMAILER_LANG['from_failed'] = 'Följande avsändaradress är felaktig: '; -$PHPMAILER_LANG['instantiate'] = 'Kunde inte initiera e-postfunktion.'; -//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; -$PHPMAILER_LANG['provide_address'] = 'Du måste ange minst en mottagares e-postadress.'; -$PHPMAILER_LANG['mailer_not_supported'] = ' mailer stöds inte.'; -$PHPMAILER_LANG['recipients_failed'] = 'SMTP fel: Följande mottagare är felaktig: '; -//$PHPMAILER_LANG['signing'] = 'Signing Error: '; -//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; -//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; -//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; -?> \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-tr.php b/phpgwapi/lang/phpmailer.lang-tr.php deleted file mode 100644 index d24627a49a..0000000000 --- a/phpgwapi/lang/phpmailer.lang-tr.php +++ /dev/null @@ -1,27 +0,0 @@ - \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-zh.php b/phpgwapi/lang/phpmailer.lang-zh.php deleted file mode 100644 index fef66f8cb1..0000000000 --- a/phpgwapi/lang/phpmailer.lang-zh.php +++ /dev/null @@ -1,26 +0,0 @@ - -*/ - -$PHPMAILER_LANG['authenticate'] = 'SMTP 錯誤：登錄失敗。'; -$PHPMAILER_LANG['connect_host'] = 'SMTP 錯誤：無法連接到 SMTP 主機。'; -$PHPMAILER_LANG['data_not_accepted'] = 'SMTP 錯誤：數據不被接受。'; -//$PHPMAILER_LANG['empty_message'] = 'Message body empty'; -$PHPMAILER_LANG['encoding'] = '未知編碼: '; -$PHPMAILER_LANG['file_access'] = '無法訪問文件：'; -$PHPMAILER_LANG['file_open'] = '文件錯誤：無法打開文件：'; -$PHPMAILER_LANG['from_failed'] = '發送地址錯誤：'; -$PHPMAILER_LANG['execute'] = '無法執行：'; -$PHPMAILER_LANG['instantiate'] = '未知函數調用。'; -//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; -$PHPMAILER_LANG['provide_address'] = '必須提供至少一個收件人地址。'; -$PHPMAILER_LANG['mailer_not_supported'] = '發信客戶端不被支持。'; -$PHPMAILER_LANG['recipients_failed'] = 'SMTP 錯誤：收件人地址錯誤：'; -//$PHPMAILER_LANG['signing'] = 'Signing Error: '; -//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; -//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; -//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; -?> \ No newline at end of file diff --git a/phpgwapi/lang/phpmailer.lang-zh_cn.php b/phpgwapi/lang/phpmailer.lang-zh_cn.php deleted file mode 100644 index b188404359..0000000000 --- a/phpgwapi/lang/phpmailer.lang-zh_cn.php +++ /dev/null @@ -1,26 +0,0 @@ - -*/ - -$PHPMAILER_LANG['authenticate'] = 'SMTP 错误：登录失败。'; -$PHPMAILER_LANG['connect_host'] = 'SMTP 错误：无法连接到 SMTP 主机。'; -$PHPMAILER_LANG['data_not_accepted'] = 'SMTP 错误：数据不被接受。'; -//$P$PHPMAILER_LANG['empty_message'] = 'Message body empty'; -$PHPMAILER_LANG['encoding'] = '未知编码: '; -$PHPMAILER_LANG['execute'] = '无法执行：'; -$PHPMAILER_LANG['file_access'] = '无法访问文件：'; -$PHPMAILER_LANG['file_open'] = '文件错误：无法打开文件：'; -$PHPMAILER_LANG['from_failed'] = '发送地址错误：'; -$PHPMAILER_LANG['instantiate'] = '未知函数调用。'; -//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is invalid: '; -$PHPMAILER_LANG['mailer_not_supported'] = '发信客户端不被支持。'; -$PHPMAILER_LANG['provide_address'] = '必须提供至少一个收件人地址。'; -$PHPMAILER_LANG['recipients_failed'] = 'SMTP 错误：收件人地址错误：'; -//$PHPMAILER_LANG['signing'] = 'Signing Error: '; -//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.'; -//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; -//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: '; -?> \ No newline at end of file