diff --git a/class.phpmailer.php b/class.phpmailer.php index c45de92cf..623d316dd 100644 --- a/class.phpmailer.php +++ b/class.phpmailer.php @@ -539,29 +539,28 @@ public function MailSend($header, $body) { * @return Bool * Carl Corliss */ - function SmtpSend_AddRecipients($recipients, &$bad_recipients = array(), &$was_throttled = false, &$throttle_total = -1) { - - $total_recipients = count($recipients); - $return_value = true; - - for ($i = 0; $i < $total_recipients; $i++) { - if (!$this->smtp->Recipient($recipients[$i])) { - $error = $this->smtp->getLastError(); - if (isset($error['smtp_code']) && + function SmtpSend_AddRecipients($recipients, &$bad_recipients = array(), &$was_throttled = false, &$throttle_total = -1) { + $total_recipients = count($recipients); + $return_value = true; + + for ($i = 0; $i < $total_recipients; $i++) { + if (!$this->smtp->Recipient($recipients[$i])) { + $error = $this->smtp->getLastError(); + if (isset($error['smtp_code']) && ($error['smtp_code'] == 451 || $error['smtp_code'] == 452)) { $was_throttled = true; - $throttle_total = ($i - 1); + $throttle_total = $i; $return_value = false; break; - } else { - $bad_recipients[] = $recipients[$i]; - $return_value = false; - } - } - } - return $return_value; - } - + } else { + $bad_recipients[] = $recipients[$i]; + $return_value = false; + } + } + } + return $return_value; + } + /** * Sends mail via SMTP using PhpSMTP * Returns false if there is a bad MAIL FROM, RCPT, or DATA input. @@ -608,58 +607,58 @@ public function SmtpSend($header, $body) { $this->SetError($this->Lang('from_failed') . $smtp_from); $this->smtp->Reset(); return false; - } + } if (!$this->SmtpSend_AddRecipients($bucket, $bad_rcpt, $was_throttled)) { if (!$was_throttled && !count($bad_rcpt)) { $this->SetError($this->Lang('recipients_failed') . join(', ', $bucket)); $this->smtp->Reset(); return false; - } - } + } + } if (count($bad_rcpt) > 0) { // Create error message $this->SetError('Error Unknown: ' . $this->Lang('recipients_failed') . join(', ', $bad_rcpt)); $this->smtp->Reset(); return false; - } + } if (!$this->smtp->Data($header . $body)) { $this->SetError($this->Lang('data_not_accepted')); $this->smtp->Reset(); return false; - } + } $this->smtp->Reset(); - } + } if ($this->SMTPKeepAlive == true) { $this->smtp->Reset(); } else { $this->SmtpClose(); } - } else { // No problems adding recipients - proceed normally if (count($bad_rcpt) > 0) { // Create error message $this->SetError('Unknown Error: ' . $this->Lang('recipients_failed') . join(', ', $bad_rcpt)); - $this->smtp->Reset(); - return false; - } + $this->smtp->Reset(); + return false; + } if (!$this->smtp->Data($header . $body)) { - $this->SetError($this->Lang('data_not_accepted')); - $this->smtp->Reset(); - return false; - } + $this->SetError($this->Lang('data_not_accepted')); + $this->smtp->Reset(); + return false; + } if ($this->SMTPKeepAlive == true) { - $this->smtp->Reset(); - } else { - $this->SmtpClose(); + $this->smtp->Reset(); + } else { + $this->SmtpClose(); + } } + return true; } - } /** * Initiates a connection to an SMTP server. @@ -752,19 +751,20 @@ public function SmtpClose() { function SetLanguage($lang_type = 'en', $lang_path = 'language/') { if( !(@include $lang_path.'phpmailer.lang-'.$lang_type.'.php') ) { $PHPMAILER_LANG = array(); - $PHPMAILER_LANG["provide_address"] = 'You must provide at least one ' . - $PHPMAILER_LANG["mailer_not_supported"] = ' mailer is not supported.'; - $PHPMAILER_LANG["execute"] = 'Could not execute: '; - $PHPMAILER_LANG["instantiate"] = 'Could not instantiate mail function.'; - $PHPMAILER_LANG["authenticate"] = 'SMTP Error: Could not authenticate.'; - $PHPMAILER_LANG["from_failed"] = 'The following From address failed: '; - $PHPMAILER_LANG["recipients_failed"] = 'SMTP Error: The following ' . - $PHPMAILER_LANG["data_not_accepted"] = 'SMTP Error: Data not accepted.'; - $PHPMAILER_LANG["connect_host"] = 'SMTP Error: Could not connect to SMTP host.'; - $PHPMAILER_LANG["file_access"] = 'Could not access file: '; - $PHPMAILER_LANG["file_open"] = 'File Error: Could not open file: '; - $PHPMAILER_LANG["encoding"] = 'Unknown encoding: '; - $PHPMAILER_LANG["signing"] = 'Signing Error: '; + $PHPMAILER_LANG['provide_address'] = 'You must provide at least one recipient email address.'; + $PHPMAILER_LANG['mailer_not_supported'] = ' mailer is not supported.'; + $PHPMAILER_LANG['execute'] = 'Could not execute: '; + $PHPMAILER_LANG['instantiate'] = 'Could not instantiate mail function.'; + $PHPMAILER_LANG['authenticate'] = 'SMTP Error: Could not authenticate.'; + $PHPMAILER_LANG['from_failed'] = 'The following From address failed: '; + $PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: The following ' . + $PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: Data not accepted.'; + $PHPMAILER_LANG['connect_host'] = 'SMTP Error: Could not connect to SMTP host.'; + $PHPMAILER_LANG['file_access'] = 'Could not access file: '; + $PHPMAILER_LANG['file_open'] = 'File Error: Could not open file: '; + $PHPMAILER_LANG['encoding'] = 'Unknown encoding: '; + $PHPMAILER_LANG['signing'] = 'Signing Error: '; + $PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; } $this->language = $PHPMAILER_LANG; return true; @@ -1324,20 +1324,20 @@ public function AttachAll() { public function EncodeFile ($path, $encoding = 'base64') { if(!@$fd = fopen($path, 'rb')) { $this->SetError($this->Lang('file_open') . $path); + fclose($fd); return ''; } if (function_exists('get_magic_quotes')) { function get_magic_quotes() { return false; } -} + } if (PHP_VERSION < 6) { $magic_quotes = get_magic_quotes_runtime(); set_magic_quotes_runtime(0); } $file_buffer = file_get_contents($path); $file_buffer = $this->EncodeString($file_buffer, $encoding); - fclose($fd); if (PHP_VERSION < 6) { set_magic_quotes_runtime($magic_quotes); } return $file_buffer; } @@ -1686,6 +1686,9 @@ public function InlineImageExists() { * @return void */ public function ClearAddresses() { + foreach($this->to as $to) { + unset($this->all_recipients[strtolower($to[0])]); + } $this->to = array(); } @@ -1694,6 +1697,9 @@ public function ClearAddresses() { * @return void */ public function ClearCCs() { + foreach($this->cc as $cc) { + unset($this->all_recipients[strtolower($cc[0])]); + } $this->cc = array(); } @@ -1702,6 +1708,9 @@ public function ClearCCs() { * @return void */ public function ClearBCCs() { + foreach($this->bcc as $bcc) { + unset($this->all_recipients[strtolower($bcc[0])]); + } $this->bcc = array(); } @@ -1722,6 +1731,7 @@ public function ClearAllRecipients() { $this->to = array(); $this->cc = array(); $this->bcc = array(); + $this->all_recipients = array(); } /** @@ -1747,12 +1757,19 @@ public function ClearCustomHeaders() { /** * Adds the error message to the error container. + * Also gets SMTP error if there is one * Returns void. * @access private * @return void */ private 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"; + } + } $this->ErrorInfo = $msg; } @@ -1995,18 +2012,10 @@ public function set ( $name, $value = '' ) { * * @access public * @param string $filename Parameter File Name + * @return string (or boolean false if it fails to read for any reason) */ public function getFile($filename) { - $return = ''; - if ($fp = fopen($filename, 'rb')) { - while (!feof($fp)) { - $return .= fread($fp, 1024); - } - fclose($fp); - return $return; - } else { - return false; - } + return @file_get_contents($filename); } /** @@ -2036,4 +2045,4 @@ public function Sign($cert_filename, $key_filename, $key_pass) { } } -?> \ No newline at end of file +?> diff --git a/class.smtp.php b/class.smtp.php index d10d6c3f7..6195953f4 100644 --- a/class.smtp.php +++ b/class.smtp.php @@ -61,7 +61,7 @@ class SMTP { * Sets whether debugging is turned on * @var bool */ - public $do_debug; // the level of debug to perform + public $do_debug = false; // the level of debug to perform /** * Sets VERP use on/off (default is off) @@ -1109,6 +1109,15 @@ public function client_send($data) { return fputs($this->smtp_conn, $data); } + /** + * Get the current error + * @access public + * @return array + */ + public function getError() { + return $this->error; + } + /******************************************************************* * INTERNAL FUNCTIONS * ******************************************************************/ @@ -1144,4 +1153,4 @@ private function get_lines() { } -?> \ No newline at end of file +?> diff --git a/examples/test1.php b/examples/test1.php index 5e9a72faf..da532252b 100644 --- a/examples/test1.php +++ b/examples/test1.php @@ -3,14 +3,17 @@ include_once('../class.phpmailer.php'); $mail = new PHPMailer(); +$mail->isSMTP(); + +// $mail->SMTPDebug = true; $body = $mail->getFile('contents.html'); $body = eregi_replace("[\]",'',$body); $subject = eregi_replace("[\]",'',$subject); -$mail->From = "name@yourdomain.com"; -$mail->FromName = "First Last"; +$mail->From = "rabbitt@tranquillo.net"; +$mail->FromName = "Carl P. Corliss"; $mail->Subject = "PHPMailer Test Subject"; @@ -18,7 +21,10 @@ $mail->MsgHTML($body); -$mail->AddAddress("whoto@otherdomain.com", "John Doe"); +for ($i = 1; $i <= 50; $i++) { + $mail->AddAddress("rabbitt+test-$i@gmail.com", "Carl P. Corliss (test #$i)"); + $mail->AddCC("rabbitt+test-".($i+50)."@tranquillo.net", "Carl P. Corliss (test #".($i+50).")"); +} if(!$mail->Send()) { echo 'Failed to send mail'; @@ -26,4 +32,3 @@ echo 'Mail sent'; } -?> diff --git a/language/phpmailer.lang-ar.php b/language/phpmailer.lang-ar.php index d4bdd780a..c7f343ae2 100644 --- a/language/phpmailer.lang-ar.php +++ b/language/phpmailer.lang-ar.php @@ -2,24 +2,25 @@ /** * PHPMailer language file. * Arabic Version, UTF-8 - * by : bahjat al mostafa */ + * by : bahjat al mostafa */ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'You must provide at least one ' . +$PHPMAILER_LANG['provide_address'] = 'You must provide at least one ' . 'recipient email address.'; -$PHPMAILER_LANG["mailer_not_supported"] = ' mailer غير مدعوم.'; -$PHPMAILER_LANG["execute"] = 'لم أستطع تنفيذ : '; -$PHPMAILER_LANG["instantiate"] = 'لم نستطع توفير خدمة البريد.'; -$PHPMAILER_LANG["authenticate"] = 'SMTP Error: لم نستطع تأكيد الهوية.'; -$PHPMAILER_LANG["from_failed"] = 'البريد التالي لم نستطع ارسال البريد له : '; -$PHPMAILER_LANG["recipients_failed"] = 'SMTP Error: الأخطاء التالية ' . +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer غير مدعوم.'; +$PHPMAILER_LANG['execute'] = 'لم أستطع تنفيذ : '; +$PHPMAILER_LANG['instantiate'] = 'لم نستطع توفير خدمة البريد.'; +$PHPMAILER_LANG['authenticate'] = 'SMTP Error: لم نستطع تأكيد الهوية.'; +$PHPMAILER_LANG['from_failed'] = 'البريد التالي لم نستطع ارسال البريد له : '; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: الأخطاء التالية ' . 'فشل في الارسال لكل من : '; -$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Error: لم يتم قبول المعلومات .'; -$PHPMAILER_LANG["connect_host"] = 'SMTP Error: لم نستطع الاتصال بمخدم SMTP.'; -$PHPMAILER_LANG["file_access"] = 'لم نستطع الوصول للملف: '; -$PHPMAILER_LANG["file_open"] = 'File Error: لم نستطع فتح الملف: '; -$PHPMAILER_LANG["encoding"] = 'ترميز غير معروف: '; -$PHPMAILER_LANG["signing"] = 'خطأ في التوقيع: '; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: لم يتم قبول المعلومات .'; +$PHPMAILER_LANG['connect_host'] = 'SMTP Error: لم نستطع الاتصال بمخدم SMTP.'; +$PHPMAILER_LANG['file_access'] = 'لم نستطع الوصول للملف: '; +$PHPMAILER_LANG['file_open'] = 'File Error: لم نستطع فتح الملف: '; +$PHPMAILER_LANG['encoding'] = 'ترميز غير معروف: '; +$PHPMAILER_LANG['signing'] = 'خطأ في التوقيع: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-br.php b/language/phpmailer.lang-br.php index abb2fed08..d2e975350 100644 --- a/language/phpmailer.lang-br.php +++ b/language/phpmailer.lang-br.php @@ -6,18 +6,18 @@ */ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'Você deve fornecer pelo menos um endereço de destinatário de email.'; -$PHPMAILER_LANG["mailer_not_supported"] = ' mailer não suportado.'; -$PHPMAILER_LANG["execute"] = 'Não foi possível executar: '; -$PHPMAILER_LANG["instantiate"] = 'Não foi possível instanciar a função mail.'; -$PHPMAILER_LANG["authenticate"] = 'Erro de SMTP: Não foi possível autenticar.'; -$PHPMAILER_LANG["from_failed"] = 'Os endereços de rementente a seguir falharam: '; -$PHPMAILER_LANG["recipients_failed"] = 'Erro de SMTP: Os endereços de destinatário a seguir falharam: '; -$PHPMAILER_LANG["data_not_accepted"] = 'Erro de SMTP: Dados não aceitos.'; -$PHPMAILER_LANG["connect_host"] = 'Erro de SMTP: Não foi possível conectar com o servidor SMTP.'; -$PHPMAILER_LANG["file_access"] = 'Não foi possível acessar o arquivo: '; -$PHPMAILER_LANG["file_open"] = 'Erro de Arquivo: Não foi possível abrir o arquivo: '; -$PHPMAILER_LANG["encoding"] = 'Codificação desconhecida: '; -$PHPMAILER_LANG["signing"] = 'Signing Error: '; - +$PHPMAILER_LANG['provide_address'] = 'Você deve fornecer pelo menos um endereço de destinatário de email.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer não suportado.'; +$PHPMAILER_LANG['execute'] = 'Não foi possível executar: '; +$PHPMAILER_LANG['instantiate'] = 'Não foi possível instanciar a função mail.'; +$PHPMAILER_LANG['authenticate'] = 'Erro de SMTP: Não foi possível autenticar.'; +$PHPMAILER_LANG['from_failed'] = 'Os endereços de rementente a seguir falharam: '; +$PHPMAILER_LANG['recipients_failed'] = 'Erro de SMTP: Os endereços de destinatário a seguir falharam: '; +$PHPMAILER_LANG['data_not_accepted'] = 'Erro de SMTP: Dados não aceitos.'; +$PHPMAILER_LANG['connect_host'] = 'Erro de SMTP: Não foi possível conectar com o servidor SMTP.'; +$PHPMAILER_LANG['file_access'] = 'Não foi possível acessar o arquivo: '; +$PHPMAILER_LANG['file_open'] = 'Erro de Arquivo: Não foi possível abrir o arquivo: '; +$PHPMAILER_LANG['encoding'] = 'Codificação desconhecida: '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-ca.php b/language/phpmailer.lang-ca.php index c5ca72b9c..bb1004479 100644 --- a/language/phpmailer.lang-ca.php +++ b/language/phpmailer.lang-ca.php @@ -7,18 +7,18 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'S\'ha de proveir almenys una adreça d\'email com a destinatari.'; -$PHPMAILER_LANG["mailer_not_supported"] = ' mailer no està suportat'; -$PHPMAILER_LANG["execute"] = 'No es pot executar: '; -$PHPMAILER_LANG["instantiate"] = 'No s\'ha pogut crear una instància de la funció Mail.'; -$PHPMAILER_LANG["authenticate"] = 'Error SMTP: No s\'hapogut autenticar.'; -$PHPMAILER_LANG["from_failed"] = 'La(s) següent(s) adreces de remitent han fallat: '; -$PHPMAILER_LANG["recipients_failed"] = 'Error SMTP: Els següents destinataris han fallat: '; -$PHPMAILER_LANG["data_not_accepted"] = 'Error SMTP: Dades no acceptades.'; -$PHPMAILER_LANG["connect_host"] = 'Error SMTP: No es pot connectar al servidor SMTP.'; -$PHPMAILER_LANG["file_access"] = 'No es pot accedir a l\'arxiu: '; -$PHPMAILER_LANG["file_open"] = 'Error d\'Arxiu: No es pot obrir l\'arxiu: '; -$PHPMAILER_LANG["encoding"] = 'Codificació desconeguda: '; -$PHPMAILER_LANG["signing"] = 'Signing Error: '; - +$PHPMAILER_LANG['provide_address'] = 'S\'ha de proveir almenys una adreça d\'email com a destinatari.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer no està suportat'; +$PHPMAILER_LANG['execute'] = 'No es pot executar: '; +$PHPMAILER_LANG['instantiate'] = 'No s\'ha pogut crear una instància de la funció Mail.'; +$PHPMAILER_LANG['authenticate'] = 'Error SMTP: No s\'hapogut autenticar.'; +$PHPMAILER_LANG['from_failed'] = 'La(s) següent(s) adreces de remitent han fallat: '; +$PHPMAILER_LANG['recipients_failed'] = 'Error SMTP: Els següents destinataris han fallat: '; +$PHPMAILER_LANG['data_not_accepted'] = 'Error SMTP: Dades no acceptades.'; +$PHPMAILER_LANG['connect_host'] = 'Error SMTP: No es pot connectar al servidor SMTP.'; +$PHPMAILER_LANG['file_access'] = 'No es pot accedir a l\'arxiu: '; +$PHPMAILER_LANG['file_open'] = 'Error d\'Arxiu: No es pot obrir l\'arxiu: '; +$PHPMAILER_LANG['encoding'] = 'Codificació desconeguda: '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-ch.php b/language/phpmailer.lang-ch.php index cf7ea410c..5251402b0 100644 --- a/language/phpmailer.lang-ch.php +++ b/language/phpmailer.lang-ch.php @@ -1,24 +1,24 @@ - \ No newline at end of file diff --git a/language/phpmailer.lang-cz.php b/language/phpmailer.lang-cz.php index 48e4669e2..2c6b35359 100644 --- a/language/phpmailer.lang-cz.php +++ b/language/phpmailer.lang-cz.php @@ -6,21 +6,18 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'Musíte zadat alespoò jednu ' . - 'emailovou adresu pøíjemce.'; +$PHPMAILER_LANG["provide_address"] = 'Musíte zadat alespoò jednu emailovou adresu pøíjemce.'; $PHPMAILER_LANG["mailer_not_supported"] = ' mailový klient není podporován.'; $PHPMAILER_LANG["execute"] = 'Nelze provést: '; $PHPMAILER_LANG["instantiate"] = 'Nelze vytvoøit instanci emailové funkce.'; $PHPMAILER_LANG["authenticate"] = 'SMTP Error: Chyba autentikace.'; $PHPMAILER_LANG["from_failed"] = 'Následující adresa From je nesprávná: '; -$PHPMAILER_LANG["recipients_failed"] = 'SMTP Error: Adresy pøíjemcù ' . - 'nejsou správné ' . +$PHPMAILER_LANG["recipients_failed"] = 'SMTP Error: Adresy pøíjemcù nejsou správné ' . $PHPMAILER_LANG["data_not_accepted"] = 'SMTP Error: Data nebyla pøijata'; -$PHPMAILER_LANG["connect_host"] = 'SMTP Error: Nelze navázat spojení se ' . - ' SMTP serverem.'; +$PHPMAILER_LANG["connect_host"] = 'SMTP Error: Nelze navázat spojení se SMTP serverem.'; $PHPMAILER_LANG["file_access"] = 'Soubor nenalezen: '; $PHPMAILER_LANG["file_open"] = 'File Error: Nelze otevøít soubor pro ètení: '; $PHPMAILER_LANG["encoding"] = 'Neznámé kódování: '; $PHPMAILER_LANG["signing"] = 'Signing Error: '; - +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-de.php b/language/phpmailer.lang-de.php index f980c9751..eab106110 100644 --- a/language/phpmailer.lang-de.php +++ b/language/phpmailer.lang-de.php @@ -7,20 +7,18 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'Bitte geben Sie mindestens eine ' . - 'Empfänger Emailadresse an.'; -$PHPMAILER_LANG["mailer_not_supported"] = ' mailer wird nicht unterstützt.'; -$PHPMAILER_LANG["execute"] = 'Konnte folgenden Befehl nicht ausführen: '; -$PHPMAILER_LANG["instantiate"] = 'Mail Funktion konnte nicht initialisiert werden.'; -$PHPMAILER_LANG["authenticate"] = 'SMTP Fehler: Authentifizierung fehlgeschlagen.'; -$PHPMAILER_LANG["from_failed"] = 'Die folgende Absenderadresse ist nicht korrekt: '; -$PHPMAILER_LANG["recipients_failed"] = 'SMTP Fehler: Die folgenden ' . - 'Empfänger sind nicht korrekt: '; -$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Fehler: Daten werden nicht akzeptiert.'; -$PHPMAILER_LANG["connect_host"] = 'SMTP Fehler: Konnte keine Verbindung zum SMTP-Host herstellen.'; -$PHPMAILER_LANG["file_access"] = 'Zugriff auf folgende Datei fehlgeschlagen: '; -$PHPMAILER_LANG["file_open"] = 'Datei Fehler: konnte folgende Datei nicht öffnen: '; -$PHPMAILER_LANG["encoding"] = 'Unbekanntes Encoding-Format: '; -$PHPMAILER_LANG["signing"] = 'Fehler beim Signieren: '; - +$PHPMAILER_LANG['provide_address'] = 'Bitte geben Sie mindestens eine Empfänger Emailadresse an.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer wird nicht unterstützt.'; +$PHPMAILER_LANG['execute'] = 'Konnte folgenden Befehl nicht ausführen: '; +$PHPMAILER_LANG['instantiate'] = 'Mail Funktion konnte nicht initialisiert werden.'; +$PHPMAILER_LANG['authenticate'] = 'SMTP Fehler: Authentifizierung fehlgeschlagen.'; +$PHPMAILER_LANG['from_failed'] = 'Die folgende Absenderadresse ist nicht korrekt: '; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP Fehler: Die folgenden Empfänger sind nicht korrekt: '; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Fehler: Daten werden nicht akzeptiert.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP Fehler: Konnte keine Verbindung zum SMTP-Host herstellen.'; +$PHPMAILER_LANG['file_access'] = 'Zugriff auf folgende Datei fehlgeschlagen: '; +$PHPMAILER_LANG['file_open'] = 'Datei Fehler: konnte folgende Datei nicht öffnen: '; +$PHPMAILER_LANG['encoding'] = 'Unbekanntes Encoding-Format: '; +$PHPMAILER_LANG['signing'] = 'Fehler beim Signieren: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-dk.php b/language/phpmailer.lang-dk.php index 1580da698..defe5b68e 100644 --- a/language/phpmailer.lang-dk.php +++ b/language/phpmailer.lang-dk.php @@ -6,20 +6,18 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'Du skal indtaste mindst en ' . - 'modtagers emailadresse.'; -$PHPMAILER_LANG["mailer_not_supported"] = ' mailer understøttes ikke.'; -$PHPMAILER_LANG["execute"] = 'Kunne ikke køre: '; -$PHPMAILER_LANG["instantiate"] = 'Kunne ikke initialisere email funktionen.'; -$PHPMAILER_LANG["authenticate"] = 'SMTP fejl: Kunne ikke logge på.'; -$PHPMAILER_LANG["from_failed"] = 'Følgende afsenderadresse er forkert: '; -$PHPMAILER_LANG["recipients_failed"] = 'SMTP fejl: Følgende' . - 'modtagere er forkerte: '; -$PHPMAILER_LANG["data_not_accepted"] = 'SMTP fejl: Data kunne ikke accepteres.'; -$PHPMAILER_LANG["connect_host"] = 'SMTP fejl: Kunne ikke tilslutte SMTP serveren.'; -$PHPMAILER_LANG["file_access"] = 'Ingen adgang til fil: '; -$PHPMAILER_LANG["file_open"] = 'Fil fejl: Kunne ikke åbne filen: '; -$PHPMAILER_LANG["encoding"] = 'Ukendt encode-format: '; -$PHPMAILER_LANG["signing"] = 'Signing Error: '; - +$PHPMAILER_LANG['provide_address'] = 'Du skal indtaste mindst en modtagers emailadresse.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer understøttes ikke.'; +$PHPMAILER_LANG['execute'] = 'Kunne ikke køre: '; +$PHPMAILER_LANG['instantiate'] = 'Kunne ikke initialisere email funktionen.'; +$PHPMAILER_LANG['authenticate'] = 'SMTP fejl: Kunne ikke logge på.'; +$PHPMAILER_LANG['from_failed'] = 'Følgende afsenderadresse er forkert: '; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP fejl: Følgende modtagere er forkerte: '; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP fejl: Data kunne ikke accepteres.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP fejl: Kunne ikke tilslutte SMTP serveren.'; +$PHPMAILER_LANG['file_access'] = 'Ingen adgang til fil: '; +$PHPMAILER_LANG['file_open'] = 'Fil fejl: Kunne ikke åbne filen: '; +$PHPMAILER_LANG['encoding'] = 'Ukendt encode-format: '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-en.php b/language/phpmailer.lang-en.php index f0e7be3fa..770431936 100644 --- a/language/phpmailer.lang-en.php +++ b/language/phpmailer.lang-en.php @@ -6,20 +6,18 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'You must provide at least one ' . - 'recipient email address.'; -$PHPMAILER_LANG["mailer_not_supported"] = ' mailer is not supported.'; -$PHPMAILER_LANG["execute"] = 'Could not execute: '; -$PHPMAILER_LANG["instantiate"] = 'Could not instantiate mail function.'; -$PHPMAILER_LANG["authenticate"] = 'SMTP Error: Could not authenticate.'; -$PHPMAILER_LANG["from_failed"] = 'The following From address failed: '; -$PHPMAILER_LANG["recipients_failed"] = 'SMTP Error: The following ' . - 'recipients failed: '; -$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Error: Data not accepted.'; -$PHPMAILER_LANG["connect_host"] = 'SMTP Error: Could not connect to SMTP host.'; -$PHPMAILER_LANG["file_access"] = 'Could not access file: '; -$PHPMAILER_LANG["file_open"] = 'File Error: Could not open file: '; -$PHPMAILER_LANG["encoding"] = 'Unknown encoding: '; -$PHPMAILER_LANG["signing"] = 'Signing Error: '; - +$PHPMAILER_LANG['provide_address'] = 'You must provide at least one recipient email address.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer is not supported.'; +$PHPMAILER_LANG['execute'] = 'Could not execute: '; +$PHPMAILER_LANG['instantiate'] = 'Could not instantiate mail function.'; +$PHPMAILER_LANG['authenticate'] = 'SMTP Error: Could not authenticate.'; +$PHPMAILER_LANG['from_failed'] = 'The following From address failed: '; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: The following recipients failed: '; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: Data not accepted.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP Error: Could not connect to SMTP host.'; +$PHPMAILER_LANG['file_access'] = 'Could not access file: '; +$PHPMAILER_LANG['file_open'] = 'File Error: Could not open file: '; +$PHPMAILER_LANG['encoding'] = 'Unknown encoding: '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-es.php b/language/phpmailer.lang-es.php index 7a1c5c1ae..b14b747af 100644 --- a/language/phpmailer.lang-es.php +++ b/language/phpmailer.lang-es.php @@ -6,20 +6,18 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'Debe proveer al menos una ' . - 'dirección de email como destinatario.'; -$PHPMAILER_LANG["mailer_not_supported"] = ' mailer no está soportado.'; -$PHPMAILER_LANG["execute"] = 'No puedo ejecutar: '; -$PHPMAILER_LANG["instantiate"] = 'No pude crear una instancia de la función Mail.'; -$PHPMAILER_LANG["authenticate"] = 'Error SMTP: No se pudo autentificar.'; -$PHPMAILER_LANG["from_failed"] = 'La(s) siguiente(s) direcciones de remitente fallaron: '; -$PHPMAILER_LANG["recipients_failed"] = 'Error SMTP: Los siguientes ' . - 'destinatarios fallaron: '; -$PHPMAILER_LANG["data_not_accepted"] = 'Error SMTP: Datos no aceptados.'; -$PHPMAILER_LANG["connect_host"] = 'Error SMTP: No puedo conectar al servidor SMTP.'; -$PHPMAILER_LANG["file_access"] = 'No puedo acceder al archivo: '; -$PHPMAILER_LANG["file_open"] = 'Error de Archivo: No puede abrir el archivo: '; -$PHPMAILER_LANG["encoding"] = 'Codificación desconocida: '; -$PHPMAILER_LANG["signing"] = 'Error al firmar: '; - +$PHPMAILER_LANG['provide_address'] = 'Debe proveer al menos una dirección de email como destinatario.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer no está soportado.'; +$PHPMAILER_LANG['execute'] = 'No puedo ejecutar: '; +$PHPMAILER_LANG['instantiate'] = 'No pude crear una instancia de la función Mail.'; +$PHPMAILER_LANG['authenticate'] = 'Error SMTP: No se pudo autentificar.'; +$PHPMAILER_LANG['from_failed'] = 'La(s) siguiente(s) direcciones de remitente fallaron: '; +$PHPMAILER_LANG['recipients_failed'] = 'Error SMTP: Los siguientes destinatarios fallaron: '; +$PHPMAILER_LANG['data_not_accepted'] = 'Error SMTP: Datos no aceptados.'; +$PHPMAILER_LANG['connect_host'] = 'Error SMTP: No puedo conectar al servidor SMTP.'; +$PHPMAILER_LANG['file_access'] = 'No puedo acceder al archivo: '; +$PHPMAILER_LANG['file_open'] = 'Error de Archivo: No puede abrir el archivo: '; +$PHPMAILER_LANG['encoding'] = 'Codificación desconocida: '; +$PHPMAILER_LANG['signing'] = 'Error al firmar: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-et.php b/language/phpmailer.lang-et.php index e495f684b..943680cd1 100644 --- a/language/phpmailer.lang-et.php +++ b/language/phpmailer.lang-et.php @@ -7,18 +7,18 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'Te peate määrama vähemalt ühe saaja e-posti aadressi.'; -$PHPMAILER_LANG["mailer_not_supported"] = ' maileri tugi puudub.'; -$PHPMAILER_LANG["execute"] = 'Tegevus ebaõnnestus: '; -$PHPMAILER_LANG["instantiate"] = 'mail funktiooni käivitamine ebaõnnestus.'; -$PHPMAILER_LANG["authenticate"] = 'SMTP Viga: Autoriseerimise viga.'; -$PHPMAILER_LANG["from_failed"] = 'Järgnev saatja e-posti aadress on vigane: '; -$PHPMAILER_LANG["recipients_failed"] = 'SMTP Viga: Järgnevate saajate e-posti aadressid on vigased: '; -$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Viga: Vigased andmed.'; -$PHPMAILER_LANG["connect_host"] = 'SMTP Viga: Ei õnnestunud luua ühendust SMTP serveriga.'; -$PHPMAILER_LANG["file_access"] = 'Pole piisavalt õiguseid järgneva faili avamiseks: '; -$PHPMAILER_LANG["file_open"] = 'Faili Viga: Faili avamine ebaõnnestus: '; -$PHPMAILER_LANG["encoding"] = 'Tundmatu Unknown kodeering: '; -$PHPMAILER_LANG["signing"] = 'Signing Error: '; - +$PHPMAILER_LANG['provide_address'] = 'Te peate määrama vähemalt ühe saaja e-posti aadressi.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' maileri tugi puudub.'; +$PHPMAILER_LANG['execute'] = 'Tegevus ebaõnnestus: '; +$PHPMAILER_LANG['instantiate'] = 'mail funktiooni käivitamine ebaõnnestus.'; +$PHPMAILER_LANG['authenticate'] = 'SMTP Viga: Autoriseerimise viga.'; +$PHPMAILER_LANG['from_failed'] = 'Järgnev saatja e-posti aadress on vigane: '; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP Viga: Järgnevate saajate e-posti aadressid on vigased: '; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Viga: Vigased andmed.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP Viga: Ei õnnestunud luua ühendust SMTP serveriga.'; +$PHPMAILER_LANG['file_access'] = 'Pole piisavalt õiguseid järgneva faili avamiseks: '; +$PHPMAILER_LANG['file_open'] = 'Faili Viga: Faili avamine ebaõnnestus: '; +$PHPMAILER_LANG['encoding'] = 'Tundmatu Unknown kodeering: '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-fi.php b/language/phpmailer.lang-fi.php index 599c686d5..b58ffc3e9 100644 --- a/language/phpmailer.lang-fi.php +++ b/language/phpmailer.lang-fi.php @@ -7,19 +7,18 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'Aseta vähintään yksi vastaanottajan ' . - 'sähköpostiosoite.'; -$PHPMAILER_LANG["mailer_not_supported"] = 'postivälitintyyppiä ei tueta.'; -$PHPMAILER_LANG["execute"] = 'Suoritus epäonnistui: '; -$PHPMAILER_LANG["instantiate"] = 'mail-funktion luonti epäonnistui.'; -$PHPMAILER_LANG["authenticate"] = 'SMTP-virhe: käyttäjätunnistus epäonnistui.'; -$PHPMAILER_LANG["from_failed"] = 'Seuraava lähettäjän osoite on virheellinen: '; -$PHPMAILER_LANG["recipients_failed"] = 'SMTP-virhe: seuraava vastaanottaja osoite on virheellinen.'; -$PHPMAILER_LANG["data_not_accepted"] = 'SMTP-virhe: data on virheellinen.'; -$PHPMAILER_LANG["connect_host"] = 'SMTP-virhe: yhteys palvelimeen ei onnistu.'; -$PHPMAILER_LANG["file_access"] = 'Seuraavaan tiedostoon ei ole oikeuksia: '; -$PHPMAILER_LANG["file_open"] = 'Tiedostovirhe: Ei voida avata tiedostoa: '; -$PHPMAILER_LANG["encoding"] = 'Tuntematon koodaustyyppi: '; -$PHPMAILER_LANG["signing"] = 'Signing Error: '; - +$PHPMAILER_LANG['provide_address'] = 'Aseta vähintään yksi vastaanottajan sähköpostiosoite.'; +$PHPMAILER_LANG['mailer_not_supported'] = 'postivälitintyyppiä ei tueta.'; +$PHPMAILER_LANG['execute'] = 'Suoritus epäonnistui: '; +$PHPMAILER_LANG['instantiate'] = 'mail-funktion luonti epäonnistui.'; +$PHPMAILER_LANG['authenticate'] = 'SMTP-virhe: käyttäjätunnistus epäonnistui.'; +$PHPMAILER_LANG['from_failed'] = 'Seuraava lähettäjän osoite on virheellinen: '; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP-virhe: seuraava vastaanottaja osoite on virheellinen.'; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP-virhe: data on virheellinen.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP-virhe: yhteys palvelimeen ei onnistu.'; +$PHPMAILER_LANG['file_access'] = 'Seuraavaan tiedostoon ei ole oikeuksia: '; +$PHPMAILER_LANG['file_open'] = 'Tiedostovirhe: Ei voida avata tiedostoa: '; +$PHPMAILER_LANG['encoding'] = 'Tuntematon koodaustyyppi: '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-fo.php b/language/phpmailer.lang-fo.php index 5cb24ced2..57f417832 100644 --- a/language/phpmailer.lang-fo.php +++ b/language/phpmailer.lang-fo.php @@ -8,20 +8,18 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'Tú skal uppgeva minst ' . - 'móttakara-emailadressu(r).'; -$PHPMAILER_LANG["mailer_not_supported"] = ' er ikki supporterað.'; -$PHPMAILER_LANG["execute"] = 'Kundi ikki útføra: '; -$PHPMAILER_LANG["instantiate"] = 'Kuni ikki instantiera mail funktión.'; -$PHPMAILER_LANG["authenticate"] = 'SMTP feilur: Kundi ikki góðkenna.'; -$PHPMAILER_LANG["from_failed"] = 'fylgjandi Frá/From adressa miseydnaðist: '; -$PHPMAILER_LANG["recipients_failed"] = 'SMTP Feilur: Fylgjandi ' . - 'móttakarar miseydnaðust: '; -$PHPMAILER_LANG["data_not_accepted"] = 'SMTP feilur: Data ikki góðkent.'; -$PHPMAILER_LANG["connect_host"] = 'SMTP feilur: Kundi ikki knýta samband við SMTP vert.'; -$PHPMAILER_LANG["file_access"] = 'Kundi ikki tilganga fílu: '; -$PHPMAILER_LANG["file_open"] = 'Fílu feilur: Kundi ikki opna fílu: '; -$PHPMAILER_LANG["encoding"] = 'Ókend encoding: '; -$PHPMAILER_LANG["signing"] = 'Signing Error: '; - +$PHPMAILER_LANG['provide_address'] = 'Tú skal uppgeva minst móttakara-emailadressu(r).'; +$PHPMAILER_LANG['mailer_not_supported'] = ' er ikki supporterað.'; +$PHPMAILER_LANG['execute'] = 'Kundi ikki útføra: '; +$PHPMAILER_LANG['instantiate'] = 'Kuni ikki instantiera mail funktión.'; +$PHPMAILER_LANG['authenticate'] = 'SMTP feilur: Kundi ikki góðkenna.'; +$PHPMAILER_LANG['from_failed'] = 'fylgjandi Frá/From adressa miseydnaðist: '; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP Feilur: Fylgjandi móttakarar miseydnaðust: '; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP feilur: Data ikki góðkent.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP feilur: Kundi ikki knýta samband við SMTP vert.'; +$PHPMAILER_LANG['file_access'] = 'Kundi ikki tilganga fílu: '; +$PHPMAILER_LANG['file_open'] = 'Fílu feilur: Kundi ikki opna fílu: '; +$PHPMAILER_LANG['encoding'] = 'Ókend encoding: '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-fr.php b/language/phpmailer.lang-fr.php index e00dac709..8c9fe7b43 100644 --- a/language/phpmailer.lang-fr.php +++ b/language/phpmailer.lang-fr.php @@ -6,20 +6,18 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'Vous devez fournir au moins une ' . - 'adresse de destinataire.'; -$PHPMAILER_LANG["mailer_not_supported"] = ' client de messagerie non supporté.'; -$PHPMAILER_LANG["execute"] = 'Impossible de lancer l\'exécution : '; -$PHPMAILER_LANG["instantiate"] = 'Impossible d\'instancier la fonction mail.'; -$PHPMAILER_LANG["authenticate"] = 'Erreur SMTP : Echec de l\'authentification.'; -$PHPMAILER_LANG["from_failed"] = 'L\'adresse d\'expéditeur suivante a échouée : '; -$PHPMAILER_LANG["recipients_failed"] = 'Erreur SMTP : Les destinataires ' . - 'suivants sont en erreur : '; -$PHPMAILER_LANG["data_not_accepted"] = 'Erreur SMTP : Données incorrects.'; -$PHPMAILER_LANG["connect_host"] = 'Erreur SMTP : Impossible de se connecter au serveur SMTP.'; -$PHPMAILER_LANG["file_access"] = 'Impossible d\'accéder au fichier : '; -$PHPMAILER_LANG["file_open"] = 'Erreur Fichier : ouverture impossible : '; -$PHPMAILER_LANG["encoding"] = 'Encodage inconnu : '; -$PHPMAILER_LANG["signing"] = 'Signing Error: '; - +$PHPMAILER_LANG['provide_address'] = 'Vous devez fournir au moins une adresse de destinataire.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' client de messagerie non supporté.'; +$PHPMAILER_LANG['execute'] = 'Impossible de lancer l\'exécution : '; +$PHPMAILER_LANG['instantiate'] = 'Impossible d\'instancier la fonction mail.'; +$PHPMAILER_LANG['authenticate'] = 'Erreur SMTP : Echec de l\'authentification.'; +$PHPMAILER_LANG['from_failed'] = 'L\'adresse d\'expéditeur suivante a échouée : '; +$PHPMAILER_LANG['recipients_failed'] = 'Erreur SMTP : Les destinataires suivants sont en erreur : '; +$PHPMAILER_LANG['data_not_accepted'] = 'Erreur SMTP : Données incorrects.'; +$PHPMAILER_LANG['connect_host'] = 'Erreur SMTP : Impossible de se connecter au serveur SMTP.'; +$PHPMAILER_LANG['file_access'] = 'Impossible d\'accéder au fichier : '; +$PHPMAILER_LANG['file_open'] = 'Erreur Fichier : ouverture impossible : '; +$PHPMAILER_LANG['encoding'] = 'Encodage inconnu : '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-hu.php b/language/phpmailer.lang-hu.php index f97e0d9e4..06ca03868 100644 --- a/language/phpmailer.lang-hu.php +++ b/language/phpmailer.lang-hu.php @@ -6,20 +6,18 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'Meg kell adnod legalább egy ' . - 'címzett email címet.'; -$PHPMAILER_LANG["mailer_not_supported"] = ' levelezõ nem támogatott.'; -$PHPMAILER_LANG["execute"] = 'Nem tudtam végrehajtani: '; -$PHPMAILER_LANG["instantiate"] = 'Nem sikerült példányosítani a mail funkciót.'; -$PHPMAILER_LANG["authenticate"] = 'SMTP Hiba: Sikertelen autentikáció.'; -$PHPMAILER_LANG["from_failed"] = 'Az alábbi Feladó cím hibás: '; -$PHPMAILER_LANG["recipients_failed"] = 'SMTP Hiba: Az alábbi ' . - 'címzettek hibásak: '; -$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Hiba: Nem elfogadható adat.'; -$PHPMAILER_LANG["connect_host"] = 'SMTP Hiba: Nem tudtam csatlakozni az SMTP host-hoz.'; -$PHPMAILER_LANG["file_access"] = 'Nem sikerült elérni a következõ fájlt: '; -$PHPMAILER_LANG["file_open"] = 'Fájl Hiba: Nem sikerült megnyitni a következõ fájlt: '; -$PHPMAILER_LANG["encoding"] = 'Ismeretlen kódolás: '; -$PHPMAILER_LANG["signing"] = 'Signing Error: '; - +$PHPMAILER_LANG['provide_address'] = 'Meg kell adnod legalább egy címzett email címet.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' levelezõ nem támogatott.'; +$PHPMAILER_LANG['execute'] = 'Nem tudtam végrehajtani: '; +$PHPMAILER_LANG['instantiate'] = 'Nem sikerült példányosítani a mail funkciót.'; +$PHPMAILER_LANG['authenticate'] = 'SMTP Hiba: Sikertelen autentikáció.'; +$PHPMAILER_LANG['from_failed'] = 'Az alábbi Feladó cím hibás: '; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP Hiba: Az alábbi címzettek hibásak: '; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Hiba: Nem elfogadható adat.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP Hiba: Nem tudtam csatlakozni az SMTP host-hoz.'; +$PHPMAILER_LANG['file_access'] = 'Nem sikerült elérni a következõ fájlt: '; +$PHPMAILER_LANG['file_open'] = 'Fájl Hiba: Nem sikerült megnyitni a következõ fájlt: '; +$PHPMAILER_LANG['encoding'] = 'Ismeretlen kódolás: '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-it.php b/language/phpmailer.lang-it.php index 9bb3a5581..b9c89d781 100644 --- a/language/phpmailer.lang-it.php +++ b/language/phpmailer.lang-it.php @@ -7,23 +7,20 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'Deve essere fornito almeno un'. - ' indirizzo ricevente'; -$PHPMAILER_LANG["mailer_not_supported"] = 'Mailer non supportato'; -$PHPMAILER_LANG["execute"] = "Impossibile eseguire l'operazione: "; -$PHPMAILER_LANG["instantiate"] = 'Impossibile istanziare la funzione mail'; -$PHPMAILER_LANG["authenticate"] = 'SMTP Error: Impossibile autenticarsi.'; -$PHPMAILER_LANG["from_failed"] = 'I seguenti indirizzi mittenti hanno'. - ' generato errore: '; -$PHPMAILER_LANG["recipients_failed"] = 'SMTP Error: I seguenti indirizzi'. +$PHPMAILER_LANG['provide_address'] = 'Deve essere fornito almeno un indirizzo ricevente'; +$PHPMAILER_LANG['mailer_not_supported'] = 'Mailer non supportato'; +$PHPMAILER_LANG['execute'] = 'Impossibile eseguire l\'operazione: '; +$PHPMAILER_LANG['instantiate'] = 'Impossibile istanziare la funzione mail'; +$PHPMAILER_LANG['authenticate'] = 'SMTP Error: Impossibile autenticarsi.'; +$PHPMAILER_LANG['from_failed'] = 'I seguenti indirizzi mittenti hanno generato errore: '; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: I seguenti indirizzi'. 'destinatari hanno generato errore: '; -$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Error: Data non accettati dal'. +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: Data non accettati dal'. 'server.'; -$PHPMAILER_LANG["connect_host"] = 'SMTP Error: Impossibile connettersi'. - ' all\'host SMTP.'; -$PHPMAILER_LANG["file_access"] = 'Impossibile accedere al file: '; -$PHPMAILER_LANG["file_open"] = 'File Error: Impossibile aprire il file: '; -$PHPMAILER_LANG["encoding"] = 'Encoding set dei caratteri sconosciuto: '; -$PHPMAILER_LANG["signing"] = 'Signing Error: '; - +$PHPMAILER_LANG['connect_host'] = 'SMTP Error: Impossibile connettersi all\'host SMTP.'; +$PHPMAILER_LANG['file_access'] = 'Impossibile accedere al file: '; +$PHPMAILER_LANG['file_open'] = 'File Error: Impossibile aprire il file: '; +$PHPMAILER_LANG['encoding'] = 'Encoding set dei caratteri sconosciuto: '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-ja.php b/language/phpmailer.lang-ja.php index 92e2b6662..c9b81c155 100644 Binary files a/language/phpmailer.lang-ja.php and b/language/phpmailer.lang-ja.php differ diff --git a/language/phpmailer.lang-nl.php b/language/phpmailer.lang-nl.php index 63107fb58..6d9b33659 100644 --- a/language/phpmailer.lang-nl.php +++ b/language/phpmailer.lang-nl.php @@ -6,20 +6,18 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'Er moet tenmiste één ' . - 'ontvanger emailadres opgegeven worden.'; -$PHPMAILER_LANG["mailer_not_supported"] = ' mailer wordt niet ondersteund.'; -$PHPMAILER_LANG["execute"] = 'Kon niet uitvoeren: '; -$PHPMAILER_LANG["instantiate"] = 'Kon mail functie niet initialiseren.'; -$PHPMAILER_LANG["authenticate"] = 'SMTP Fout: authenticatie mislukt.'; -$PHPMAILER_LANG["from_failed"] = 'De volgende afzender adressen zijn mislukt: '; -$PHPMAILER_LANG["recipients_failed"] = 'SMTP Fout: De volgende ' . - 'ontvangers zijn mislukt: '; -$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Fout: Data niet geaccepteerd.'; -$PHPMAILER_LANG["connect_host"] = 'SMTP Fout: Kon niet verbinden met SMTP host.'; -$PHPMAILER_LANG["file_access"] = 'Kreeg geen toegang tot bestand: '; -$PHPMAILER_LANG["file_open"] = 'Bestandsfout: Kon bestand niet openen: '; -$PHPMAILER_LANG["encoding"] = 'Onbekende codering: '; -$PHPMAILER_LANG["signing"] = 'Signing Error: '; - +$PHPMAILER_LANG['provide_address'] = 'Er moet tenmiste één ontvanger emailadres opgegeven worden.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer wordt niet ondersteund.'; +$PHPMAILER_LANG['execute'] = 'Kon niet uitvoeren: '; +$PHPMAILER_LANG['instantiate'] = 'Kon mail functie niet initialiseren.'; +$PHPMAILER_LANG['authenticate'] = 'SMTP Fout: authenticatie mislukt.'; +$PHPMAILER_LANG['from_failed'] = 'De volgende afzender adressen zijn mislukt: '; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP Fout: De volgende ontvangers zijn mislukt: '; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Fout: Data niet geaccepteerd.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP Fout: Kon niet verbinden met SMTP host.'; +$PHPMAILER_LANG['file_access'] = 'Kreeg geen toegang tot bestand: '; +$PHPMAILER_LANG['file_open'] = 'Bestandsfout: Kon bestand niet openen: '; +$PHPMAILER_LANG['encoding'] = 'Onbekende codering: '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-no.php b/language/phpmailer.lang-no.php index 06d93107a..77b30a4ed 100644 --- a/language/phpmailer.lang-no.php +++ b/language/phpmailer.lang-no.php @@ -6,20 +6,18 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'Du må ha med minst en' . - 'mottager adresse.'; -$PHPMAILER_LANG["mailer_not_supported"] = ' mailer er ikke supportert.'; -$PHPMAILER_LANG["execute"] = 'Kunne ikke utføre: '; -$PHPMAILER_LANG["instantiate"] = 'Kunne ikke instantiate mail funksjonen.'; -$PHPMAILER_LANG["authenticate"] = 'SMTP Feil: Kunne ikke authentisere.'; -$PHPMAILER_LANG["from_failed"] = 'Følgende Fra feilet: '; -$PHPMAILER_LANG["recipients_failed"] = 'SMTP Feil: Følgende' . - 'mottagere feilet: '; -$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Feil: Data ble ikke akseptert.'; -$PHPMAILER_LANG["connect_host"] = 'SMTP Feil: Kunne ikke koble til SMTP host.'; -$PHPMAILER_LANG["file_access"] = 'Kunne ikke få tilgang til filen: '; -$PHPMAILER_LANG["file_open"] = 'Fil feil: Kunne ikke åpne filen: '; -$PHPMAILER_LANG["encoding"] = 'Ukjent encoding: '; -$PHPMAILER_LANG["signing"] = 'Signing Error: '; - +$PHPMAILER_LANG['provide_address'] = 'Du må ha med minst en mottager adresse.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer er ikke supportert.'; +$PHPMAILER_LANG['execute'] = 'Kunne ikke utføre: '; +$PHPMAILER_LANG['instantiate'] = 'Kunne ikke instantiate mail funksjonen.'; +$PHPMAILER_LANG['authenticate'] = 'SMTP Feil: Kunne ikke authentisere.'; +$PHPMAILER_LANG['from_failed'] = 'Følgende Fra feilet: '; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP Feil: Følgende mottagere feilet: '; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Feil: Data ble ikke akseptert.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP Feil: Kunne ikke koble til SMTP host.'; +$PHPMAILER_LANG['file_access'] = 'Kunne ikke få tilgang til filen: '; +$PHPMAILER_LANG['file_open'] = 'Fil feil: Kunne ikke åpne filen: '; +$PHPMAILER_LANG['encoding'] = 'Ukjent encoding: '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-pl.php b/language/phpmailer.lang-pl.php index 2b342a3ae..20820d2fc 100644 --- a/language/phpmailer.lang-pl.php +++ b/language/phpmailer.lang-pl.php @@ -1,25 +1,23 @@ \ No newline at end of file diff --git a/language/phpmailer.lang-ro.php b/language/phpmailer.lang-ro.php index 3c8bc117e..01cb6bf9c 100644 --- a/language/phpmailer.lang-ro.php +++ b/language/phpmailer.lang-ro.php @@ -7,18 +7,18 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'Trebuie sa adaugati cel putin un recipient (adresa de mail).'; -$PHPMAILER_LANG["mailer_not_supported"] = ' mailer nu este suportat.'; -$PHPMAILER_LANG["execute"] = 'Nu pot executa: '; -$PHPMAILER_LANG["instantiate"] = 'Nu am putut instantia functia mail.'; -$PHPMAILER_LANG["authenticate"] = 'Eroare SMTP: Nu a functionat autentificarea.'; -$PHPMAILER_LANG["from_failed"] = 'Urmatoarele adrese From au dat eroare: '; -$PHPMAILER_LANG["recipients_failed"] = 'Eroare SMTP: Urmatoarele adrese de mail au dat eroare: '; -$PHPMAILER_LANG["data_not_accepted"] = 'Eroare SMTP: Continutul mailului nu a fost acceptat.'; -$PHPMAILER_LANG["connect_host"] = 'Eroare SMTP: Nu m-am putut conecta la adresa SMTP.'; -$PHPMAILER_LANG["file_access"] = 'Nu pot accesa fisierul: '; -$PHPMAILER_LANG["file_open"] = 'Eroare de fisier: Nu pot deschide fisierul: '; -$PHPMAILER_LANG["encoding"] = 'Encodare necunoscuta: '; -$PHPMAILER_LANG["signing"] = 'Signing Error: '; - +$PHPMAILER_LANG['provide_address'] = 'Trebuie sa adaugati cel putin un recipient (adresa de mail).'; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer nu este suportat.'; +$PHPMAILER_LANG['execute'] = 'Nu pot executa: '; +$PHPMAILER_LANG['instantiate'] = 'Nu am putut instantia functia mail.'; +$PHPMAILER_LANG['authenticate'] = 'Eroare SMTP: Nu a functionat autentificarea.'; +$PHPMAILER_LANG['from_failed'] = 'Urmatoarele adrese From au dat eroare: '; +$PHPMAILER_LANG['recipients_failed'] = 'Eroare SMTP: Urmatoarele adrese de mail au dat eroare: '; +$PHPMAILER_LANG['data_not_accepted'] = 'Eroare SMTP: Continutul mailului nu a fost acceptat.'; +$PHPMAILER_LANG['connect_host'] = 'Eroare SMTP: Nu m-am putut conecta la adresa SMTP.'; +$PHPMAILER_LANG['file_access'] = 'Nu pot accesa fisierul: '; +$PHPMAILER_LANG['file_open'] = 'Eroare de fisier: Nu pot deschide fisierul: '; +$PHPMAILER_LANG['encoding'] = 'Encodare necunoscuta: '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-ru.php b/language/phpmailer.lang-ru.php index e456c493e..7619c293a 100644 --- a/language/phpmailer.lang-ru.php +++ b/language/phpmailer.lang-ru.php @@ -5,20 +5,19 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = ', e-mail ' . - '.'; -$PHPMAILER_LANG["mailer_not_supported"] = ' - .'; -$PHPMAILER_LANG["execute"] = ' : '; -$PHPMAILER_LANG["instantiate"] = ' mail.'; -$PHPMAILER_LANG["authenticate"] = ' SMTP: .'; -$PHPMAILER_LANG["from_failed"] = ' : '; -$PHPMAILER_LANG["recipients_failed"] = ' SMTP: ' . - ' : '; -$PHPMAILER_LANG["data_not_accepted"] = ' SMTP: .'; -$PHPMAILER_LANG["connect_host"] = ' SMTP: SMTP.'; -$PHPMAILER_LANG["file_access"] = ' : '; -$PHPMAILER_LANG["file_open"] = ' : : '; -$PHPMAILER_LANG["encoding"] = ' : '; -$PHPMAILER_LANG["signing"] = 'Signing Error: '; - +$PHPMAILER_LANG['provide_address'] = 'Пожалуйста, введите хотя бы один адрес e-mail получателя.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' - почтовый сервер не поддерживается.'; +$PHPMAILER_LANG['execute'] = 'Невозможно выполнить команду: '; +$PHPMAILER_LANG['instantiate'] = 'Невозможно запустить функцию mail.'; +$PHPMAILER_LANG['authenticate'] = 'Ошибка SMTP: ошибка авторизации.'; +$PHPMAILER_LANG['from_failed'] = 'Неверный адрес отправителя: '; +$PHPMAILER_LANG['recipients_failed'] = 'Ошибка SMTP: отправка по следующим ' . + 'адресам получателей не удалась: '; +$PHPMAILER_LANG['data_not_accepted'] = 'Ошибка SMTP: данные не приняты.'; +$PHPMAILER_LANG['connect_host'] = 'Ошибка SMTP: не удается подключиться к серверу SMTP.'; +$PHPMAILER_LANG['file_access'] = 'Нет доступа к файлу: '; +$PHPMAILER_LANG['file_open'] = 'Файловая ошибка: не удается открыть файл: '; +$PHPMAILER_LANG['encoding'] = 'Неизвестный вид кодировки: '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-se.php b/language/phpmailer.lang-se.php index 1526b6cc0..461d10bde 100644 --- a/language/phpmailer.lang-se.php +++ b/language/phpmailer.lang-se.php @@ -6,20 +6,18 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'Du måste ange minst en ' . - 'mottagares e-postadress.'; -$PHPMAILER_LANG["mailer_not_supported"] = ' mailer stöds inte.'; -$PHPMAILER_LANG["execute"] = 'Kunde inte köra: '; -$PHPMAILER_LANG["instantiate"] = 'Kunde inte initiera e-postfunktion.'; -$PHPMAILER_LANG["authenticate"] = 'SMTP fel: Kunde inte autentisera.'; -$PHPMAILER_LANG["from_failed"] = 'Följande avsändaradress är felaktig: '; -$PHPMAILER_LANG["recipients_failed"] = 'SMTP fel: Följande ' . - 'mottagare är felaktig: '; -$PHPMAILER_LANG["data_not_accepted"] = 'SMTP fel: Data accepterades inte.'; -$PHPMAILER_LANG["connect_host"] = 'SMTP fel: Kunde inte ansluta till SMTP-server.'; -$PHPMAILER_LANG["file_access"] = 'Ingen åtkomst till fil: '; -$PHPMAILER_LANG["file_open"] = 'Fil fel: Kunde inte öppna fil: '; -$PHPMAILER_LANG["encoding"] = 'Okänt encode-format: '; -$PHPMAILER_LANG["signing"] = 'Signing Error: '; - +$PHPMAILER_LANG['provide_address'] = 'Du måste ange minst en mottagares e-postadress.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailer stöds inte.'; +$PHPMAILER_LANG['execute'] = 'Kunde inte köra: '; +$PHPMAILER_LANG['instantiate'] = 'Kunde inte initiera e-postfunktion.'; +$PHPMAILER_LANG['authenticate'] = 'SMTP fel: Kunde inte autentisera.'; +$PHPMAILER_LANG['from_failed'] = 'Följande avsändaradress är felaktig: '; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP fel: Följande mottagare är felaktig: '; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP fel: Data accepterades inte.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP fel: Kunde inte ansluta till SMTP-server.'; +$PHPMAILER_LANG['file_access'] = 'Ingen åtkomst till fil: '; +$PHPMAILER_LANG['file_open'] = 'Fil fel: Kunde inte öppna fil: '; +$PHPMAILER_LANG['encoding'] = 'Okänt encode-format: '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-tr.php b/language/phpmailer.lang-tr.php index 4f22dba13..cdc32e5c8 100644 --- a/language/phpmailer.lang-tr.php +++ b/language/phpmailer.lang-tr.php @@ -7,20 +7,18 @@ $PHPMAILER_LANG = array(); -$PHPMAILER_LANG["provide_address"] = 'En az bir tane mail adresi belirtmek zorundasýnýz ' . - 'alýcýnýn email adresi.'; -$PHPMAILER_LANG["mailer_not_supported"] = ' mailler desteklenmemektedir.'; -$PHPMAILER_LANG["execute"] = 'Çalýþtýrýlamýyor: '; -$PHPMAILER_LANG["instantiate"] = 'Örnek mail fonksiyonu yaratýlamadý.'; -$PHPMAILER_LANG["authenticate"] = 'SMTP Hatasý: Doðrulanamýyor.'; -$PHPMAILER_LANG["from_failed"] = 'Baþarýsýz olan gönderici adresi: '; -$PHPMAILER_LANG["recipients_failed"] = 'SMTP Hatasý: ' . - 'alýcýlara ulaþmadý: '; -$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Hatasý: Veri kabul edilmedi.'; -$PHPMAILER_LANG["connect_host"] = 'SMTP Hatasý: SMTP hosta baðlanýlamýyor.'; -$PHPMAILER_LANG["file_access"] = 'Dosyaya eriþilemiyor: '; -$PHPMAILER_LANG["file_open"] = 'Dosya Hatasý: Dosya açýlamýyor: '; -$PHPMAILER_LANG["encoding"] = 'Bilinmeyen þifreleme: '; -$PHPMAILER_LANG["signing"] = 'Signing Error: '; - +$PHPMAILER_LANG['provide_address'] = 'En az bir tane mail adresi belirtmek zorundasýnýz alýcýnýn email adresi.'; +$PHPMAILER_LANG['mailer_not_supported'] = ' mailler desteklenmemektedir.'; +$PHPMAILER_LANG['execute'] = 'Çalýþtýrýlamýyor: '; +$PHPMAILER_LANG['instantiate'] = 'Örnek mail fonksiyonu yaratýlamadý.'; +$PHPMAILER_LANG['authenticate'] = 'SMTP Hatasý: Doðrulanamýyor.'; +$PHPMAILER_LANG['from_failed'] = 'Baþarýsýz olan gönderici adresi: '; +$PHPMAILER_LANG['recipients_failed'] = 'SMTP Hatasý: alýcýlara ulaþmadý: '; +$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Hatasý: Veri kabul edilmedi.'; +$PHPMAILER_LANG['connect_host'] = 'SMTP Hatasý: SMTP hosta baðlanýlamýyor.'; +$PHPMAILER_LANG['file_access'] = 'Dosyaya eriþilemiyor: '; +$PHPMAILER_LANG['file_open'] = 'Dosya Hatasý: Dosya açýlamýyor: '; +$PHPMAILER_LANG['encoding'] = 'Bilinmeyen þifreleme: '; +$PHPMAILER_LANG['signing'] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/language/phpmailer.lang-zh.php b/language/phpmailer.lang-zh.php index 0814b2f42..31c10faae 100644 --- a/language/phpmailer.lang-zh.php +++ b/language/phpmailer.lang-zh.php @@ -1,4 +1,4 @@ - \ No newline at end of file diff --git a/language/phpmailer.lang-zh_cn.php b/language/phpmailer.lang-zh_cn.php index c4bd9d39c..b01d806f0 100644 --- a/language/phpmailer.lang-zh_cn.php +++ b/language/phpmailer.lang-zh_cn.php @@ -20,4 +20,5 @@ $PHPMAILER_LANG["file_open"] = '文件错误：无法打开文件：'; $PHPMAILER_LANG["encoding"] = '未知编码: '; $PHPMAILER_LANG["signing"] = 'Signing Error: '; +$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/test/phpmailer_test.php b/test/phpmailer_test.php index 61456c47d..5ee74ec16 100644 --- a/test/phpmailer_test.php +++ b/test/phpmailer_test.php @@ -515,8 +515,8 @@ function test_Error() { $this->assert($this->Mail->IsError() == false, "Error found"); $this->assert($this->Mail->Send() == false, "Send succeeded"); $this->assert($this->Mail->IsError(), "No error found"); - $this->assertEquals('You must provide at least one ' . - 'recipient email address.', $this->Mail->ErrorInfo); + //Note that this is language dependent + $this->assertEquals('You must provide at least one recipient email address.', $this->Mail->ErrorInfo); $this->Mail->AddAddress(get("mail_to")); $this->assert($this->Mail->Send(), "Send failed"); } @@ -530,9 +530,58 @@ function test_Addressing() { $this->assert($this->Mail->AddBCC('c@example.com'), 'BCC addressing failed'); $this->assert(!$this->Mail->AddBCC('c@example.com'), 'BCC duplicate addressing failed'); $this->assert(!$this->Mail->AddBCC('a@example.com'), 'BCC duplicate Addressing failed (2)'); + $this->Mail->ClearAddresses(); + $this->assert($this->Mail->AddAddress('a@example.com'), 'Addressing after clear failed'); + $this->Mail->ClearCCs(); + $this->assert($this->Mail->AddAddress('b@example.com'), 'CC addressing after clear failed'); + $this->Mail->ClearBCCs(); + $this->assert($this->Mail->AddAddress('c@example.com'), 'BCC addressing after clear failed'); + $this->Mail->AddAddress('a@example.com'); + $this->Mail->AddCC('b@example.com'); + $this->Mail->AddBCC('c@example.com'); + $this->Mail->ClearAllRecipients(); //Not much of a test, but helps coverage } -} - + + // Check that we are not missing any translations in any langauges + function test_Translations() { + //Extend this array as new strings are added + $expectedtranslations = array( + 'provide_address', + 'mailer_not_supported', + 'execute', + 'instantiate', + 'authenticate', + 'from_failed', + 'recipients_failed', + 'data_not_accepted', + 'connect_host', + 'file_access', + 'file_open', + 'encoding', + 'signing', + 'smtp_error' + ); + try { + foreach (new DirectoryIterator('../language') as $langfile) { + if (!preg_match('/^phpmailer\.lang-/', $langfile)) continue; //Skip non-language files + $PHPMAILER_LANG = array(); + include '../language/'.$langfile; + foreach($expectedtranslations as $string) { + $this->assert(isset($PHPMAILER_LANG[$string]), 'Translation missing; \''.$string.'\' in '.$langfile); + } + } + } + catch(Exception $e) { + $this->assert(false, 'No language files found!'); + } + } + + //Check that getFile works + function test_getFile() { + $a = $this->Mail->getFile('../class.phpmailer.php'); //Point at any non-empty file + $this->assert(($a !== false), 'GetFile failed to read a file.'); + } +} /** * Create and run test instance. */ @@ -561,8 +610,13 @@ function get($sName) { } ?> - + + + + PHPMailer Unit Tests +

phpmailer Unit Test

By entering a SMTP hostname it will automatically perform tests with SMTP. diff --git a/test/phpunit.php b/test/phpunit.php index 7d1a64a33..1f80ae102 100644 --- a/test/phpunit.php +++ b/test/phpunit.php @@ -352,14 +352,14 @@ function report() { } function _startTest($test) { - printf("%s ", $test->name()); + printf("%s: ", $test->name()); flush(); } function _endTest($test) { $outcome = $test->failed() ? "FAIL" - : "ok"; + : "Pass"; printf("$outcome
\n"); flush(); }