From: Roland Häder Date: Fri, 5 Mar 2010 14:17:56 +0000 (+0000) Subject: PHPMailer updated to 2.0.4 excluding phpdocs directory X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=e21643e2e189fce46c94e060caee67ca507ccf51 PHPMailer updated to 2.0.4 excluding phpdocs directory --- diff --git a/.gitattributes b/.gitattributes index 0760a985ff..f2ec42f3ad 100644 --- a/.gitattributes +++ b/.gitattributes @@ -614,8 +614,10 @@ inc/phpmailer/examples/test_gmail.php -text inc/phpmailer/examples/test_mail.php -text inc/phpmailer/examples/test_sendmail.php -text inc/phpmailer/examples/test_smtp.php -text +inc/phpmailer/language/phpmailer.lang-ar.php -text inc/phpmailer/language/phpmailer.lang-br.php -text inc/phpmailer/language/phpmailer.lang-ca.php -text +inc/phpmailer/language/phpmailer.lang-ch.php -text inc/phpmailer/language/phpmailer.lang-cz.php -text inc/phpmailer/language/phpmailer.lang-de.php -text inc/phpmailer/language/phpmailer.lang-de.zip -text @@ -628,7 +630,7 @@ inc/phpmailer/language/phpmailer.lang-fo.php -text inc/phpmailer/language/phpmailer.lang-fr.php -text inc/phpmailer/language/phpmailer.lang-hu.php -text inc/phpmailer/language/phpmailer.lang-it.php -text -inc/phpmailer/language/phpmailer.lang-ja.php -text +inc/phpmailer/language/phpmailer.lang-ja.php -text svneol=unset#application/octet-stream inc/phpmailer/language/phpmailer.lang-nl.php -text inc/phpmailer/language/phpmailer.lang-no.php -text inc/phpmailer/language/phpmailer.lang-pl.php -text @@ -636,6 +638,8 @@ inc/phpmailer/language/phpmailer.lang-ro.php -text inc/phpmailer/language/phpmailer.lang-ru.php -text inc/phpmailer/language/phpmailer.lang-se.php -text inc/phpmailer/language/phpmailer.lang-tr.php -text +inc/phpmailer/language/phpmailer.lang-zh.php -text +inc/phpmailer/language/phpmailer.lang-zh_cn.php -text inc/phpmailer/phpdoc/PHPMailer/PHPMailer.html -text inc/phpmailer/phpdoc/PHPMailer/SMTP.html -text inc/phpmailer/phpdoc/PHPMailer/_class_phpmailer_php.html -text diff --git a/inc/functions.php b/inc/functions.php index 9c3cc70ca6..8cf9ab360b 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -634,7 +634,7 @@ function sendRawEmail ($toEmail, $subject, $message, $from) { $mail = new PHPMailer(); // Set charset to UTF-8 - $mail->CharSet('UTF-8'); + $mail->CharSet = 'UTF-8'; // Path for PHPMailer $mail->PluginDir = sprintf("%sinc/phpmailer/", getConfig('PATH')); diff --git a/inc/phpmailer/ChangeLog.txt b/inc/phpmailer/ChangeLog.txt index ed992db3f6..172a85eac6 100644 --- a/inc/phpmailer/ChangeLog.txt +++ b/inc/phpmailer/ChangeLog.txt @@ -1,5 +1,9 @@ ChangeLog +Version 2.0.4 (April 02 2009) +* fixed == in class.smtp.php +- NOTE: this is it folks, our last PHPMailer to support PHP4 + Version 2.0.3 (November 08 2008) * fixed line 1041 in class.smtp.php (endless loop from missing = sign) * fixed duplicate images in email body diff --git a/inc/phpmailer/README b/inc/phpmailer/README index 57a9f4bc5c..ad988dc9b0 100644 --- a/inc/phpmailer/README +++ b/inc/phpmailer/README @@ -9,7 +9,12 @@ PHPMailer Full Featured Email Transfer Class for PHP ========================================== -Version 2.3 (November 08, 2008) +Version 2.0.4 (April 02, 2009) + +This is the last version to support PHP4. We've made the move to PHP5 and +all of our efforts now are into PHPMailer for PHP5/6. + +Version 2.0.3 (November 08, 2008) PHP4 continues to be a major platform for developers. We are responding to the emails received to continue development for PHP4 with this diff --git a/inc/phpmailer/class.phpmailer.php b/inc/phpmailer/class.phpmailer.php index 6fa18175b1..afb71b25f5 100644 --- a/inc/phpmailer/class.phpmailer.php +++ b/inc/phpmailer/class.phpmailer.php @@ -2,7 +2,7 @@ /*~ class.phpmailer.php .---------------------------------------------------------------------------. | Software: PHPMailer - PHP email class | -| Version: 2.0.3 | +| Version: 2.0.4 | | Contact: via sourceforge.net support pages (also www.codeworxtech.com) | | Info: http://phpmailer.sourceforge.net | | Support: http://sourceforge.net/projects/phpmailer/ | @@ -28,7 +28,7 @@ * PHPMailer - PHP email transport class * @package PHPMailer * @author Andy Prevost - * @copyright 2004 - 2008 Andy Prevost + * @copyright 2004 - 2009 Andy Prevost */ class PHPMailer { @@ -114,7 +114,7 @@ class PHPMailer { * characters. * @var int */ - var $WordWrap = '0'; + var $WordWrap = 0; /** * Method to send mail: ("mail", "sendmail", or "smtp"). @@ -139,7 +139,7 @@ class PHPMailer { * Holds PHPMailer version. * @var string */ - var $Version = "2.0.3"; + var $Version = "2.0.4"; /** * Sets the email address that a reading confirmation will be sent. @@ -156,7 +156,7 @@ class PHPMailer { var $Hostname = ''; /** - * Sets the message id to be used in the Message-Id header. + * Sets the message ID to be used in the Message-Id header. * If empty, a unique id will be generated. * @var string */ @@ -255,8 +255,8 @@ class PHPMailer { var $message_type = ''; var $boundary = array(); var $language = array(); - var $error_count = '0'; - var $LE = "\r\n"; + var $error_count = 0; + var $LE = "\n"; var $sign_cert_file = ""; var $sign_key_file = ""; var $sign_key_pass = ""; @@ -392,7 +392,7 @@ class PHPMailer { $this->ContentType = 'multipart/alternative'; } - $this->error_count = '0'; // reset errors + $this->error_count = 0; // reset errors $this->SetMessageType(); $header .= $this->CreateHeader(); $body = $this->CreateBody(); @@ -462,7 +462,7 @@ class PHPMailer { function MailSend($header, $body) { $to = ''; - for($i = '0'; $i < count($this->to); $i++) { + for($i = 0; $i < count($this->to); $i++) { if($i != 0) { $to .= ', '; } $to .= $this->AddrFormat($this->to[$i]); } @@ -527,24 +527,24 @@ class PHPMailer { } /* Attempt to send attach all recipients */ - for($i = '0'; $i < count($this->to); $i++) { + for($i = 0; $i < count($this->to); $i++) { if(!$this->smtp->Recipient($this->to[$i][0])) { $bad_rcpt[] = $this->to[$i][0]; } } - for($i = '0'; $i < count($this->cc); $i++) { + for($i = 0; $i < count($this->cc); $i++) { if(!$this->smtp->Recipient($this->cc[$i][0])) { $bad_rcpt[] = $this->cc[$i][0]; } } - for($i = '0'; $i < count($this->bcc); $i++) { + for($i = 0; $i < count($this->bcc); $i++) { if(!$this->smtp->Recipient($this->bcc[$i][0])) { $bad_rcpt[] = $this->bcc[$i][0]; } } if(count($bad_rcpt) > 0) { // Create error message - for($i = '0'; $i < count($bad_rcpt); $i++) { + for($i = 0; $i < count($bad_rcpt); $i++) { if($i != 0) { $error .= ', '; } @@ -583,13 +583,13 @@ class PHPMailer { $this->smtp->do_debug = $this->SMTPDebug; $hosts = explode(';', $this->Host); - $index = '0'; + $index = 0; $connection = ($this->smtp->Connected()); /* Retry while there is no connection */ while($index < count($hosts) && $connection == false) { $hostinfo = array(); - if(isInStringIgnoreCase('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) { + if(eregi('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) { $host = $hostinfo[1]; $port = $hostinfo[2]; } else { @@ -730,7 +730,7 @@ class PHPMailer { for ($i=0 ;$i < count($line); $i++) { $line_part = explode(' ', $line[$i]); $buf = ''; - for ($e = '0'; $e $length)) { $space_left = $length - strlen($buf) - 1; @@ -773,7 +773,7 @@ class PHPMailer { } } else { $buf_o = $buf; - $buf .= ($e == '0') ? $word : (' ' . $word); + $buf .= ($e == 0) ? $word : (' ' . $word); if (strlen($buf) > $length and $buf_o != '') { $message .= $buf_o . $soft_break; @@ -810,7 +810,7 @@ class PHPMailer { 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 = ($encodedCharPos == 0) ? $maxLength : $maxLength - ($lookBack - $encodedCharPos); $foundSplitPos = true; } elseif ($dec >= 192) { // First byte of a multi byte character @@ -874,7 +874,7 @@ class PHPMailer { if($this->Mailer != 'mail') { if(count($this->to) > 0) { $result .= $this->AddrAppend('To', $this->to); - } elseif (count($this->cc) == '0') { + } elseif (count($this->cc) == 0) { $result .= $this->HeaderLine('To', 'undisclosed-recipients:;'); } } @@ -904,9 +904,9 @@ class PHPMailer { } if($this->MessageID != '') { - $result .= $this->HeaderLine('Message-Id',$this->MessageID); + $result .= $this->HeaderLine('Message-ID',$this->MessageID); } else { - $result .= sprintf("Message-Id: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE); + $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 (phpmailer.sourceforge.net) [version ' . $this->Version . ']'); @@ -916,7 +916,7 @@ class PHPMailer { } // Add custom headers - for($index = '0'; $index < count($this->CustomHeader); $index++) { + 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) { @@ -1140,7 +1140,7 @@ class PHPMailer { $this->attachment[$cur][4] = $type; $this->attachment[$cur][5] = false; // isStringAttachment $this->attachment[$cur][6] = 'attachment'; - $this->attachment[$cur][7] = '0'; + $this->attachment[$cur][7] = 0; return true; } @@ -1156,7 +1156,7 @@ class PHPMailer { $mime = array(); /* Add all attachments */ - for($i = '0'; $i < count($this->attachment); $i++) { + for($i = 0; $i < count($this->attachment); $i++) { /* Check for string attachment */ $bString = $this->attachment[$i][5]; if ($bString) { @@ -1177,7 +1177,7 @@ class PHPMailer { $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE); if($disposition == 'inline') { - $mime[] = sprintf("Content-Id: <%s>%s", $cid, $this->LE); + $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE); } $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE); @@ -1262,7 +1262,7 @@ class PHPMailer { * @return string */ function EncodeHeader ($str, $position = 'text') { - $x = '0'; + $x = 0; switch (strtolower($position)) { case 'phrase': @@ -1286,7 +1286,7 @@ class PHPMailer { break; } - if ($x == '0') { + if ($x == 0) { return ($str); } @@ -1351,8 +1351,8 @@ class PHPMailer { // Base64 has a 4:3 ratio $offset = $avgLength = floor($length * $ratio * .75); - for ($i = '0'; $i < $mb_length; $i += $offset) { - $lookBack = '0'; + for ($i = 0; $i < $mb_length; $i += $offset) { + $lookBack = 0; do { $offset = $avgLength - $lookBack; @@ -1384,10 +1384,10 @@ class PHPMailer { while( list(, $line) = each($lines) ) { $linlen = strlen($line); $newline = ''; - for($i = '0'; $i < $linlen; $i++) { + 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 + if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E $c = '=2E'; } if ( $dec == 32 ) { @@ -1465,7 +1465,7 @@ class PHPMailer { $this->attachment[$cur][4] = $type; $this->attachment[$cur][5] = true; // isString $this->attachment[$cur][6] = 'attachment'; - $this->attachment[$cur][7] = '0'; + $this->attachment[$cur][7] = 0; } /** @@ -1474,7 +1474,7 @@ class PHPMailer { * 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 + * @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). @@ -1514,7 +1514,7 @@ class PHPMailer { */ function InlineImageExists() { $result = false; - for($i = '0'; $i < count($this->attachment); $i++) { + for($i = 0; $i < count($this->attachment); $i++) { if($this->attachment[$i][6] == 'inline') { $result = true; break; diff --git a/inc/phpmailer/class.pop3.php b/inc/phpmailer/class.pop3.php index 3dd53b8ced..0a6d8d45aa 100644 --- a/inc/phpmailer/class.pop3.php +++ b/inc/phpmailer/class.pop3.php @@ -2,7 +2,7 @@ /*~ class.pop3.php .---------------------------------------------------------------------------. | Software: PHPMailer - PHP email class | -| Version: 2.0.3 | +| Version: 2.0.4 | | Contact: via sourceforge.net support pages (also www.codeworxtech.com) | | Info: http://phpmailer.sourceforge.net | | Support: http://sourceforge.net/projects/phpmailer/ | @@ -114,7 +114,7 @@ class POP3 */ function POP3 () { - $this->pop_conn = '0'; + $this->pop_conn = 0; $this->connected = false; $this->error = null; } @@ -128,7 +128,7 @@ class POP3 * @param string $username * @param string $password */ - function Authorise ($host, $port = false, $tval = false, $username, $password, $debug_level = '0') + function Authorise ($host, $port = false, $tval = false, $username, $password, $debug_level = 0) { $this->host = $host; diff --git a/inc/phpmailer/class.smtp.php b/inc/phpmailer/class.smtp.php index 50779bf967..be084a116e 100644 --- a/inc/phpmailer/class.smtp.php +++ b/inc/phpmailer/class.smtp.php @@ -2,7 +2,7 @@ /*~ class.smtp.php .---------------------------------------------------------------------------. | Software: PHPMailer - PHP email class | -| Version: 2.0.3 | +| Version: 2.0.4 | | Contact: via sourceforge.net support pages (also www.codeworxtech.com) | | Info: http://phpmailer.sourceforge.net | | Support: http://sourceforge.net/projects/phpmailer/ | @@ -73,11 +73,11 @@ class SMTP * @return void */ function SMTP() { - $this->smtp_conn = '0'; + $this->smtp_conn = 0; $this->error = null; $this->helo_rply = null; - $this->do_debug = '0'; + $this->do_debug = 0; } /************************************************************* @@ -252,7 +252,7 @@ class SMTP if(!empty($this->smtp_conn)) { # close the connection and cleanup fclose($this->smtp_conn); - $this->smtp_conn = '0'; + $this->smtp_conn = 0; } } @@ -1038,7 +1038,7 @@ class SMTP */ function get_lines() { $data = ""; - while($str == @fgets($this->smtp_conn,515)) { + while($str = @fgets($this->smtp_conn,515)) { if($this->do_debug >= 4) { echo "SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF; diff --git a/inc/phpmailer/language/phpmailer.lang-ar.php b/inc/phpmailer/language/phpmailer.lang-ar.php new file mode 100644 index 0000000000..c7f343ae2b --- /dev/null +++ b/inc/phpmailer/language/phpmailer.lang-ar.php @@ -0,0 +1,26 @@ + + */ + +$PHPMAILER_LANG = array(); + +$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['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/inc/phpmailer/language/phpmailer.lang-br.php b/inc/phpmailer/language/phpmailer.lang-br.php index abb2fed08f..dece2256af 100644 --- a/inc/phpmailer/language/phpmailer.lang-br.php +++ b/inc/phpmailer/language/phpmailer.lang-br.php @@ -1,23 +1,23 @@ - \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-ca.php b/inc/phpmailer/language/phpmailer.lang-ca.php index c5ca72b9cf..dfc8370efe 100644 --- a/inc/phpmailer/language/phpmailer.lang-ca.php +++ b/inc/phpmailer/language/phpmailer.lang-ca.php @@ -1,24 +1,24 @@ - \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-ch.php b/inc/phpmailer/language/phpmailer.lang-ch.php new file mode 100644 index 0000000000..5251402b04 --- /dev/null +++ b/inc/phpmailer/language/phpmailer.lang-ch.php @@ -0,0 +1,24 @@ + \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-cz.php b/inc/phpmailer/language/phpmailer.lang-cz.php index 48e4669e25..80b4eea1d8 100644 --- a/inc/phpmailer/language/phpmailer.lang-cz.php +++ b/inc/phpmailer/language/phpmailer.lang-cz.php @@ -1,26 +1,23 @@ - \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-de.php b/inc/phpmailer/language/phpmailer.lang-de.php index 843971b965..7e23f4be07 100644 --- a/inc/phpmailer/language/phpmailer.lang-de.php +++ b/inc/phpmailer/language/phpmailer.lang-de.php @@ -1,26 +1,24 @@ - \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-dk.php b/inc/phpmailer/language/phpmailer.lang-dk.php index 8c1f595431..120fd3bb4b 100644 --- a/inc/phpmailer/language/phpmailer.lang-dk.php +++ b/inc/phpmailer/language/phpmailer.lang-dk.php @@ -1,25 +1,23 @@ - */ - -$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 = 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['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-en.php b/inc/phpmailer/language/phpmailer.lang-en.php index f0e7be3fa6..41906b1e7f 100644 --- a/inc/phpmailer/language/phpmailer.lang-en.php +++ b/inc/phpmailer/language/phpmailer.lang-en.php @@ -1,25 +1,23 @@ - \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-es.php b/inc/phpmailer/language/phpmailer.lang-es.php index 493e9b414d..b0d7d22e4d 100644 --- a/inc/phpmailer/language/phpmailer.lang-es.php +++ b/inc/phpmailer/language/phpmailer.lang-es.php @@ -1,25 +1,23 @@ - \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-et.php b/inc/phpmailer/language/phpmailer.lang-et.php index 40cfc62237..943680cd1e 100644 --- a/inc/phpmailer/language/phpmailer.lang-et.php +++ b/inc/phpmailer/language/phpmailer.lang-et.php @@ -2,23 +2,23 @@ /** * PHPMailer language file. * Estonian Version - * By Indrek Päri + * By Indrek Päri */ $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/inc/phpmailer/language/phpmailer.lang-fi.php b/inc/phpmailer/language/phpmailer.lang-fi.php index 1c4feace2d..970ebc030d 100644 --- a/inc/phpmailer/language/phpmailer.lang-fi.php +++ b/inc/phpmailer/language/phpmailer.lang-fi.php @@ -1,25 +1,24 @@ - \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-fo.php b/inc/phpmailer/language/phpmailer.lang-fo.php index 5cb24ced2a..b09414b196 100644 --- a/inc/phpmailer/language/phpmailer.lang-fo.php +++ b/inc/phpmailer/language/phpmailer.lang-fo.php @@ -1,27 +1,25 @@ - \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-fr.php b/inc/phpmailer/language/phpmailer.lang-fr.php index e00dac7098..b40ec215d4 100644 --- a/inc/phpmailer/language/phpmailer.lang-fr.php +++ b/inc/phpmailer/language/phpmailer.lang-fr.php @@ -1,25 +1,23 @@ - \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-hu.php b/inc/phpmailer/language/phpmailer.lang-hu.php index f97e0d9e49..5fac38a09f 100644 --- a/inc/phpmailer/language/phpmailer.lang-hu.php +++ b/inc/phpmailer/language/phpmailer.lang-hu.php @@ -1,25 +1,23 @@ - \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-it.php b/inc/phpmailer/language/phpmailer.lang-it.php index 4efb46a415..76a9f3a59c 100644 --- a/inc/phpmailer/language/phpmailer.lang-it.php +++ b/inc/phpmailer/language/phpmailer.lang-it.php @@ -1,29 +1,26 @@ -*/ - -$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'. - 'destinatari hanno generato errore: '; -$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 = 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'. + 'destinatari hanno generato errore: '; +$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['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-ja.php b/inc/phpmailer/language/phpmailer.lang-ja.php index 92e2b66627..6848ca380f 100644 Binary files a/inc/phpmailer/language/phpmailer.lang-ja.php and b/inc/phpmailer/language/phpmailer.lang-ja.php differ diff --git a/inc/phpmailer/language/phpmailer.lang-nl.php b/inc/phpmailer/language/phpmailer.lang-nl.php index 459de614ee..269b1522a7 100644 --- a/inc/phpmailer/language/phpmailer.lang-nl.php +++ b/inc/phpmailer/language/phpmailer.lang-nl.php @@ -1,25 +1,23 @@ - \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-no.php b/inc/phpmailer/language/phpmailer.lang-no.php index 06d93107ac..184d8857f3 100644 --- a/inc/phpmailer/language/phpmailer.lang-no.php +++ b/inc/phpmailer/language/phpmailer.lang-no.php @@ -1,25 +1,23 @@ - \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-pl.php b/inc/phpmailer/language/phpmailer.lang-pl.php index 2b342a3ae5..bbc9cc9a8a 100644 --- a/inc/phpmailer/language/phpmailer.lang-pl.php +++ b/inc/phpmailer/language/phpmailer.lang-pl.php @@ -1,25 +1,23 @@ - \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-ro.php b/inc/phpmailer/language/phpmailer.lang-ro.php index dbc4b38d13..4c6a4683d1 100644 --- a/inc/phpmailer/language/phpmailer.lang-ro.php +++ b/inc/phpmailer/language/phpmailer.lang-ro.php @@ -1,24 +1,24 @@ - */ - -$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 = 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['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-ru.php b/inc/phpmailer/language/phpmailer.lang-ru.php index 996d1881e8..bc2dc2d5e9 100644 --- a/inc/phpmailer/language/phpmailer.lang-ru.php +++ b/inc/phpmailer/language/phpmailer.lang-ru.php @@ -1,24 +1,23 @@ - */ - -$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 = 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['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-se.php b/inc/phpmailer/language/phpmailer.lang-se.php index dea6e6417e..f9100a67fc 100644 --- a/inc/phpmailer/language/phpmailer.lang-se.php +++ b/inc/phpmailer/language/phpmailer.lang-se.php @@ -1,25 +1,23 @@ - */ - -$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 = 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['smtp_error'] = 'SMTP server error: '; ?> \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-tr.php b/inc/phpmailer/language/phpmailer.lang-tr.php index 4e3e675ce8..99c5ac421f 100644 --- a/inc/phpmailer/language/phpmailer.lang-tr.php +++ b/inc/phpmailer/language/phpmailer.lang-tr.php @@ -1,26 +1,24 @@ - \ No newline at end of file diff --git a/inc/phpmailer/language/phpmailer.lang-zh.php b/inc/phpmailer/language/phpmailer.lang-zh.php new file mode 100644 index 0000000000..31c10faae6 --- /dev/null +++ b/inc/phpmailer/language/phpmailer.lang-zh.php @@ -0,0 +1,23 @@ + + */ + +$PHPMAILER_LANG = array(); +$PHPMAILER_LANG['provide_address'] = '必須提供至少一個收件人地址。'; +$PHPMAILER_LANG['mailer_not_supported'] = '發信客戶端不被支持。'; +$PHPMAILER_LANG['execute'] = '無法執行：'; +$PHPMAILER_LANG['instantiate'] = '未知函數調用。'; +$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/inc/phpmailer/language/phpmailer.lang-zh_cn.php b/inc/phpmailer/language/phpmailer.lang-zh_cn.php new file mode 100644 index 0000000000..b01d806f06 --- /dev/null +++ b/inc/phpmailer/language/phpmailer.lang-zh_cn.php @@ -0,0 +1,24 @@ + + */ + +$PHPMAILER_LANG = array(); + +$PHPMAILER_LANG["provide_address"] = '必须提供至少一个收件人地址。'; +$PHPMAILER_LANG["mailer_not_supported"] = '发信客户端不被支持。'; +$PHPMAILER_LANG["execute"] = '无法执行：'; +$PHPMAILER_LANG["instantiate"] = '未知函数调用。'; +$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/inc/phpmailer/test/phpmailer_test.php b/inc/phpmailer/test/phpmailer_test.php index 495173dc08..22d6f42b8e 100644 --- a/inc/phpmailer/test/phpmailer_test.php +++ b/inc/phpmailer/test/phpmailer_test.php @@ -6,8 +6,8 @@ $INCLUDE_DIR = "../"; -include("phpunit.php"); -include($INCLUDE_DIR . "class.phpmailer.php"); +require("phpunit.php"); +require($INCLUDE_DIR . "class.phpmailer.php"); error_reporting(E_ALL); /** @@ -69,7 +69,7 @@ class phpmailerTest extends TestCase $this->Mail->Subject = "Unit Test"; $this->Mail->Body = ""; $this->Mail->AltBody = ""; - $this->Mail->WordWrap = '0'; + $this->Mail->WordWrap = 0; $this->Mail->Host = $global_vars["mail_host"]; $this->Mail->Port = 25; $this->Mail->Helo = "localhost.localdomain"; @@ -145,7 +145,7 @@ class phpmailerTest extends TestCase { $ReportBody .= "Attachments:" . $eol; $ReportBody .= $bullet_start; - for($i = '0'; $i < count($this->Mail->attachment); $i++) + for($i = 0; $i < count($this->Mail->attachment); $i++) { $ReportBody .= $bullet . "Name: " . $this->Mail->attachment[$i][1] . ", "; $ReportBody .= "Encoding: " . $this->Mail->attachment[$i][3] . ", "; @@ -161,7 +161,7 @@ class phpmailerTest extends TestCase $ReportBody .= "-------" . $eol; $ReportBody .= $bullet_start; - for($i = '0'; $i < count($this->ChangeLog); $i++) + for($i = 0; $i < count($this->ChangeLog); $i++) { $ReportBody .= $bullet . $this->ChangeLog[$i][0] . " was changed to [" . $this->ChangeLog[$i][1] . "]" . $eol; @@ -176,7 +176,7 @@ class phpmailerTest extends TestCase $ReportBody .= "-----" . $eol; $ReportBody .= $bullet_start; - for($i = '0'; $i < count($this->NoteLog); $i++) + for($i = 0; $i < count($this->NoteLog); $i++) { $ReportBody .= $bullet . $this->NoteLog[$i] . $eol; } diff --git a/inc/phpmailer/test/phpunit.php b/inc/phpmailer/test/phpunit.php index 02c58e2d48..1d508680cc 100644 --- a/inc/phpmailer/test/phpunit.php +++ b/inc/phpmailer/test/phpunit.php @@ -5,7 +5,7 @@ // Written by Fred Yankowski // OntoSys, Inc // -// $Id: phpunit.php 880 2009-03-07 02:55:57Z quix0r $ +// $Id: phpunit.php,v 1.1 2002/03/30 19:32:17 bmatzelle Exp $ // Copyright (c) 2000 Fred Yankowski @@ -113,7 +113,7 @@ class TestCase extends Assert /* implements Test */ { $testResult = $this->_createResult(); $this->fResult = $testResult; $testResult->run(&$this); - $this->fResult = '0'; + $this->fResult = 0; return $testResult; } @@ -235,7 +235,7 @@ class TestSuite /* implements Test */ { function countTestCases() { /* Number of TestCases comprising this TestSuite (including those in any constituent TestSuites) */ - $count = '0'; + $count = 0; reset($fTests); while (list($na, $test_case) = each($this->fTests)) { $count += $test_case->countTestCases(); @@ -268,7 +268,7 @@ class TestFailure { class TestResult { /* Collect the results of running a set of TestCases. */ var $fFailures = array(); - var $fRunTests = '0'; + var $fRunTests = 0; var $fStop = false; function TestResult() { } @@ -331,7 +331,7 @@ class TextTestResult extends TestResult { $nFailures = $this->countFailures(); printf("

%s test%s run
", $nRun, ($nRun == 1) ? '' : 's'); printf("%s failure%s.
\n", $nFailures, ($nFailures == 1) ? '' : 's'); - if ($nFailures == '0') + if ($nFailures == 0) return; print("

    \n");