[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] [20879] Update phpmailer to latest from upstream
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] [20879] Update phpmailer to latest from upstream |
|
Date: |
Sun, 22 Nov 2009 19:32:36 +0000 |
Revision: 20879
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20879
Author: sigurdne
Date: 2009-11-22 19:32:35 +0000 (Sun, 22 Nov 2009)
Log Message:
-----------
Update phpmailer to latest from upstream
Modified Paths:
--------------
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/README
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.phpmailer.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.pop3.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.smtp.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/extending.html
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/faq.html
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/contents.html
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/index.html
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-br.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ca.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-cz.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-de.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-dk.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-es.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-et.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-fi.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-fo.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-fr.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-hu.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-it.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ja.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-nl.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-no.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-pl.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ro.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ru.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-se.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-tr.php
Added Paths:
-----------
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/aboutus.html
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/changelog.txt
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/Callback_function_notes.txt
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/DomainKeys_notes.txt
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/Note_for_SMTP_debugging.txt
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_db_smtp_basic.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_mail_advanced.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_mail_basic.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_pop_before_smtp_advanced.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_pop_before_smtp_basic.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_sendmail_advanced.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_sendmail_basic.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_advanced.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_advanced_no_auth.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_basic.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_basic_no_auth.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_gmail_advanced.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_gmail_basic.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ar.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ch.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-zh.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-zh_cn.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/contents.html
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/phpmailerTest.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/test_callback.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/testemail.php
Removed Paths:
-------------
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/ChangeLog.txt
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/codeworxtech.html
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/images/bkgrnd.gif
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/images/phpmailer.png
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/pop3_before_smtp_test.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_gmail.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_mail.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_sendmail.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-en.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/phpdoc/
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/phpmailer_test.php
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/phpunit.php
Deleted: people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/ChangeLog.txt
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/ChangeLog.txt
2009-11-22 16:31:30 UTC (rev 20878)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/ChangeLog.txt
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,307 +0,0 @@
-ChangeLog
-
-NOTE: THIS VERSION OF PHPMAILER IS DESIGNED FOR PHP5/PHP6. IT WILL NOT WORK
WITH PHP4.
-
-Version 2.2 () July 15 2008
-
-* Fixed redirect issue (display of UTF-8 in thank you redirect)
-* fixed error in getResponse function declaration (class.pop3.php)
-* PHPMailer now PHP6 compliant
-* fixed line 1092 in class.smtp.php (endless loop from missing = sign)
-
-Version 2.1 (Wed, June 04 2008)
-
-** NOTE: WE HAVE A NEW LANGUAGE VARIABLE FOR DIGITALLY SIGNED S/MIME EMAILS.
- IF YOU CAN HELP WITH LANGUAGES OTHER THAN ENGLISH AND SPANISH, IT WOULD BE
- APPRECIATED.
-
-* added S/MIME functionality (ability to digitally sign emails)
- BIG THANKS TO "sergiocambra" for posting this patch back in November 2007.
- The "Signed Emails" functionality adds the Sign method to pass the private
key
- filename and the password to read it, and then email will be sent with
- content-type multipart/signed and with the digital signature attached.
-* fully compatible with E_STRICT error level
- - Please note:
- In about half the test environments this development version was subjected
- to, an error was thrown for the date() functions used (line 1565 and 1569).
- This is NOT a PHPMailer error, it is the result of an incorrectly
configured
- PHP5 installation. The fix is to modify your 'php.ini' file and include the
- date.timezone = America/New York
- directive, to your own server timezone
- - If you do get this error, and are unable to access your php.ini file:
- In your PHP script, add
- date_default_timezone_set('America/Toronto');
- - do not try to use
- $myVar = date_default_timezone_get();
- as a test, it will throw an error.
-* added ability to define path (mainly for embedded images)
- function MsgHTML($message,$basedir='') ... where:
- $basedir is the fully qualified path
-* fixed MsgHTML() function:
- - Embedded Images where images are specified by <protocol>:// will not be
altered or embedded
-* fixed the return value of SMTP exit code ( pclose )
-* addressed issue of multibyte characters in subject line and truncating
-* added ability to have user specified Message ID
- (default is still that PHPMailer create a unique Message ID)
-* corrected unidentified message type to 'application/octet-stream'
-* fixed chunk_split() multibyte issue (thanks to Colin Brown, et al).
-* added check for added attachments
-* enhanced conversion of HTML to text in MsgHTML (thanks to "brunny")
-
-Version 2.1.0beta2 (Sun, Dec 02 2007)
-* implemented updated EncodeQP (thanks to coolbru, aka Marcus Bointon)
-* finished all testing, all known bugs corrected, enhancements tested
-- note: will NOT work with PHP4.
-
-please note, this is BETA software
-** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS
-INTENDED STRICTLY FOR TESTING
-
-Version 2.1.0beta1
-please note, this is BETA software
-** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS
-INTENDED STRICTLY FOR TESTING
-
-Version 2.0.0 rc2 (Fri, Nov 16 2007), interim release
-* implements new property to control VERP in class.smtp.php
- example (requires instantiating class.smtp.php):
- $mail->do_verp = true;
-* POP-before-SMTP functionality included, thanks to Richard Davey
- (see class.pop3.php & pop3_before_smtp_test.php for examples)
-* included example showing how to use PHPMailer with GMAIL
-* fixed the missing Cc in SendMail() and Mail()
-
-******************
-A note on sending bulk emails:
-
-If the email you are sending is not personalized, consider using the
-"undisclosed-recipient:;" strategy. That is, put all of your recipients
-in the Bcc field and set the To field to "undisclosed-recipients:;".
-It's a lot faster (only one send) and saves quite a bit on resources.
-Contrary to some opinions, this will not get you listed in spam engines -
-it's a legitimate way for you to send emails.
-
-A partial example for use with PHPMailer:
-
-$mail->AddAddress("undisclosed-recipients:;");
-$mail->AddBCC("address@hidden,address@hidden,address@hidden");
-
-Many email service providers restrict the number of emails that can be sent
-in any given time period. Often that is between 50 - 60 emails maximum
-per hour or per send session.
-
-If that's the case, then break up your Bcc lists into chunks that are one
-less than your limit, and put a pause in your script.
-*******************
-
-Version 2.0.0 rc1 (Thu, Nov 08 2007), interim release
-* dramatically simplified using inline graphics ... it's fully automated and
requires no user input
-* added automatic document type detection for attachments and pictures
-* added MsgHTML() function to replace Body tag for HTML emails
-* fixed the SendMail security issues (input validation vulnerability)
-* enhanced the AddAddresses functionality so that the "Name" portion is used
in the email address
-* removed the need to use the AltBody method (set from the HTML, or default
text used)
-* set the PHP Mail() function as the default (still support SendMail, SMTP
Mail)
-* removed the need to set the IsHTML property (set automatically)
-* added Estonian language file by Indrek Päri
-* added header injection patch
-* added "set" method to permit users to create their own pseudo-properties
like 'X-Headers', etc.
- example of use:
- $mail->set('X-Priority', '3');
- $mail->set('X-MSMail-Priority', 'Normal');
-* fixed warning message in SMTP get_lines method
-* added TLS/SSL SMTP support
- example of use:
- $mail = new PHPMailer();
- $mail->Mailer = "smtp";
- $mail->Host = "smtp.example.com";
- $mail->SMTPSecure = "tls"; // option
- //$mail->SMTPSecure = "ssl"; // option
- ...
- $mail->Send();
-* PHPMailer has been tested with PHP4 (4.4.7) and PHP5 (5.2.7)
-* Works with PHP installed as a module or as CGI-PHP
-- NOTE: will NOT work with PHP5 in E_STRICT error mode
-
-Version 1.73 (Sun, Jun 10 2005)
-* Fixed denial of service bug: http://www.cybsec.com/vuln/PHPMailer-DOS.pdf
-* Now has a total of 20 translations
-* Fixed alt attachments bug: http://tinyurl.com/98u9k
-
-Version 1.72 (Wed, May 25 2004)
-* Added Dutch, Swedish, Czech, Norwegian, and Turkish translations.
-* Received: Removed this method because spam filter programs like
-SpamAssassin reject this header.
-* Fixed error count bug.
-* SetLanguage default is now "language/".
-* Fixed magic_quotes_runtime bug.
-
-Version 1.71 (Tue, Jul 28 2003)
-* Made several speed enhancements
-* Added German and Italian translation files
-* Fixed HELO/AUTH bugs on keep-alive connects
-* Now provides an error message if language file does not load
-* Fixed attachment EOL bug
-* Updated some unclear documentation
-* Added additional tests and improved others
-
-Version 1.70 (Mon, Jun 20 2003)
-* Added SMTP keep-alive support
-* Added IsError method for error detection
-* Added error message translation support (SetLanguage)
-* Refactored many methods to increase library performance
-* Hello now sends the newer EHLO message before HELO as per RFC 2821
-* Removed the boundary class and replaced it with GetBoundary
-* Removed queue support methods
-* New $Hostname variable
-* New Message-ID header
-* Received header reformat
-* Helo variable default changed to $Hostname
-* Removed extra spaces in Content-Type definition (#667182)
-* Return-Path should be set to Sender when set
-* Adds Q or B encoding to headers when necessary
-* quoted-encoding should now encode NULs \000
-* Fixed encoding of body/AltBody (#553370)
-* Adds "To: undisclosed-recipients:;" when all recipients are hidden (BCC)
-* Multiple bug fixes
-
-Version 1.65 (Fri, Aug 09 2002)
-* Fixed non-visible attachment bug (#585097) for Outlook
-* SMTP connections are now closed after each transaction
-* Fixed SMTP::Expand return value
-* Converted SMTP class documentation to phpDocumentor format
-
-Version 1.62 (Wed, Jun 26 2002)
-* Fixed multi-attach bug
-* Set proper word wrapping
-* Reduced memory use with attachments
-* Added more debugging
-* Changed documentation to phpDocumentor format
-
-Version 1.60 (Sat, Mar 30 2002)
-* Sendmail pipe and address patch (Christian Holtje)
-* Added embedded image and read confirmation support (A. Ognio)
-* Added unit tests
-* Added SMTP timeout support (*nix only)
-* Added possibly temporary PluginDir variable for SMTP class
-* Added LE message line ending variable
-* Refactored boundary and attachment code
-* Eliminated SMTP class warnings
-* Added SendToQueue method for future queuing support
-
-Version 1.54 (Wed, Dec 19 2001)
-* Add some queuing support code
-* Fixed a pesky multi/alt bug
-* Messages are no longer forced to have "To" addresses
-
-Version 1.50 (Thu, Nov 08 2001)
-* Fix extra lines when not using SMTP mailer
-* Set WordWrap variable to int with a zero default
-
-Version 1.47 (Tue, Oct 16 2001)
-* Fixed Received header code format
-* Fixed AltBody order error
-* Fixed alternate port warning
-
-Version 1.45 (Tue, Sep 25 2001)
-* Added enhanced SMTP debug support
-* Added support for multiple ports on SMTP
-* Added Received header for tracing
-* Fixed AddStringAttachment encoding
-* Fixed possible header name quote bug
-* Fixed wordwrap() trim bug
-* Couple other small bug fixes
-
-Version 1.41 (Wed, Aug 22 2001)
-* Fixed AltBody bug w/o attachments
-* Fixed rfc_date() for certain mail servers
-
-Version 1.40 (Sun, Aug 12 2001)
-* Added multipart/alternative support (AltBody)
-* Documentation update
-* Fixed bug in Mercury MTA
-
-Version 1.29 (Fri, Aug 03 2001)
-* Added AddStringAttachment() method
-* Added SMTP authentication support
-
-Version 1.28 (Mon, Jul 30 2001)
-* Fixed a typo in SMTP class
-* Fixed header issue with Imail (win32) SMTP server
-* Made fopen() calls for attachments use "rb" to fix win32 error
-
-Version 1.25 (Mon, Jul 02 2001)
-* Added RFC 822 date fix (Patrice)
-* Added improved error handling by adding a $ErrorInfo variable
-* Removed MailerDebug variable (obsolete with new error handler)
-
-Version 1.20 (Mon, Jun 25 2001)
-* Added quoted-printable encoding (Patrice)
-* Set Version as public and removed PrintVersion()
-* Changed phpdoc to only display public variables and methods
-
-Version 1.19 (Thu, Jun 21 2001)
-* Fixed MS Mail header bug
-* Added fix for Bcc problem with mail(). *Does not work on Win32*
- (See PHP bug report: http://www.php.net/bugs.php?id=11616)
-* mail() no longer passes a fifth parameter when not needed
-
-Version 1.15 (Fri, Jun 15 2001)
-[Note: these changes contributed by Patrice Fournier]
-* Changed all remaining \n to \r\n
-* Bcc: header no longer writen to message except
-when sent directly to sendmail
-* Added a small message to non-MIME compliant mail reader
-* Added Sender variable to change the Sender email
-used in -f for sendmail/mail and in 'MAIL FROM' for smtp mode
-* Changed boundary setting to a place it will be set only once
-* Removed transfer encoding for whole message when using multipart
-* Message body now uses Encoding in multipart messages
-* Can set encoding and type to attachments 7bit, 8bit
-and binary attachment are sent as is, base64 are encoded
-* Can set Encoding to base64 to send 8 bits body
-through 7 bits servers
-
-Version 1.10 (Tue, Jun 12 2001)
-* Fixed win32 mail header bug (printed out headers in message body)
-
-Version 1.09 (Fri, Jun 08 2001)
-* Changed date header to work with Netscape mail programs
-* Altered phpdoc documentation
-
-Version 1.08 (Tue, Jun 05 2001)
-* Added enhanced error-checking
-* Added phpdoc documentation to source
-
-Version 1.06 (Fri, Jun 01 2001)
-* Added optional name for file attachments
-
-Version 1.05 (Tue, May 29 2001)
-* Code cleanup
-* Eliminated sendmail header warning message
-* Fixed possible SMTP error
-
-Version 1.03 (Thu, May 24 2001)
-* Fixed problem where qmail sends out duplicate messages
-
-Version 1.02 (Wed, May 23 2001)
-* Added multiple recipient and attachment Clear* methods
-* Added Sendmail public variable
-* Fixed problem with loading SMTP library multiple times
-
-Version 0.98 (Tue, May 22 2001)
-* Fixed problem with redundant mail hosts sending out multiple messages
-* Added additional error handler code
-* Added AddCustomHeader() function
-* Added support for Microsoft mail client headers (affects priority)
-* Fixed small bug with Mailer variable
-* Added PrintVersion() function
-
-Version 0.92 (Tue, May 15 2001)
-* Changed file names to class.phpmailer.php and class.smtp.php to match
- current PHP class trend.
-* Fixed problem where body not being printed when a message is attached
-* Several small bug fixes
-
-Version 0.90 (Tue, April 17 2001)
-* Intial public release
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/README
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/README 2009-11-22
16:31:30 UTC (rev 20878)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/README 2009-11-22
19:32:35 UTC (rev 20879)
@@ -9,6 +9,42 @@
Full Featured Email Transfer Class for PHP
==========================================
+Version 5.0.0 (April 02, 2009)
+
+With the release of this version, we are initiating a new version numbering
+system to differentiate from the PHP4 version of PHPMailer.
+
+Most notable in this release is fully object oriented code.
+
+We now have available the PHPDocumentor (phpdocs) documentation. This is
+separate from the regular download to keep file sizes down. Please see the
+download area of http://phpmailer.codeworxtech.com.
+
+We also have created a new test script (see /test_script) that you can use
+right out of the box. Copy the /test_script folder directly to your server (in
+the same structure ... with class.phpmailer.php and class.smtp.php in the
+folder above it. Then launch the test script with:
+http://www.yourdomain.com/phpmailer/test_script/index.php
+from this one script, you can test your server settings for mail(), sendmail
(or
+qmail), and SMTP. This will email you a sample email (using contents.html for
+the email body) and two attachments. One of the attachments is used as an
inline
+image to demonstrate how PHPMailer will automatically detect if attachments are
+the same source as inline graphics and only include one version. Once you click
+the Submit button, the results will be displayed including any SMTP debug
+information and send status. We will also display a version of the script that
+you can cut and paste to include in your projects. Enjoy!
+
+Version 2.3 (November 08, 2008)
+
+We have removed the /phpdoc from the downloads. All documentation is now on
+the http://phpmailer.codeworxtech.com website.
+
+The phpunit.php has been updated to support PHP5.
+
+For all other changes and notes, please see the changelog.
+
+Donations are accepted at PayPal with our id "address@hidden".
+
Version 2.2 (July 15 2008)
- see the changelog.
@@ -108,7 +144,7 @@
programs are COM components only available on Windows. They are also a
little pricey for smaller projects.
-Since I do Linux development I\x92ve missed these tools for my PHP coding.
+Since I do Linux development I�ve missed these tools for my PHP coding.
So I built a version myself that implements the same methods (object
calls) that the Windows-based components do. It is open source and the
LGPL license allows you to place the class in your proprietary PHP
@@ -119,14 +155,14 @@
Copy class.phpmailer.php into your php.ini include_path. If you are
using the SMTP mailer then place class.smtp.php in your path as well.
-In the language directory you will find several files like
-phpmailer.lang-en.php. If you look right before the .php extension
-that there are two letters. These represent the language type of the
-translation file. For instance "en" is the English file and "br" is
-the Portuguese file. Chose the file that best fits with your language
-and place it in the PHP include path. If your language is English
-then you have nothing more to do. If it is a different language then
-you must point PHPMailer to the correct translation. To do this, call
+In the language directory you will find several files like
+phpmailer.lang-en.php. If you look right before the .php extension
+that there are two letters. These represent the language type of the
+translation file. For instance "en" is the English file and "br" is
+the Portuguese file. Chose the file that best fits with your language
+and place it in the PHP include path. If your language is English
+then you have nothing more to do. If it is a different language then
+you must point PHPMailer to the correct translation. To do this, call
the PHPMailer SetLanguage method like so:
// To load the Portuguese version
Added: people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/aboutus.html
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/aboutus.html
(rev 0)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/aboutus.html
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,169 @@
+<html>
+<head>
+<style>
+body, p, li, td {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 12px;
+}
+ul {
+ margin:0 0px 0 15px;
+ padding:0;
+}
+div.width {
+ width: 760px;
+ text-align: left;
+}
+</style>
+<script>
+<!--
+var popsite="http://phpmailer.codeworxtech.com";
+var
withfeatures="width=960,height=760,scrollbars=1,resizable=1,toolbar=1,location=1,menubar=1,status=1,directories=0"
+var once_per_session=0
+function get_cookie(Name) {
+ var search = Name + "="
+ var returnvalue = "";
+ if (document.cookie.length > 0) {
+ offset = document.cookie.indexOf(search)
+ if (offset != -1) { // if cookie exists
+ offset += search.length
+ // set index of beginning of value
+ end = document.cookie.indexOf(";", offset);
+ // set index of end of cookie value
+ if (end == -1)
+ end = document.cookie.length;
+ returnvalue=unescape(document.cookie.substring(offset, end))
+ }
+ }
+ return returnvalue;
+}
+function loadornot(){
+ if (get_cookie('popsite')=='') {
+ loadpopsite()
+ document.cookie="popsite=yes"
+ }
+}
+function loadpopsite(){
+ win2=window.open(popsite,"",withfeatures)
+ win2.blur()
+ window.focus()
+}
+if (once_per_session==0) {
+ loadpopsite()
+} else {
+ loadornot()
+}
+-->
+</script>
+</head>
+<body>
+<center>
+<div class="width">
+<hr>
+The http://phpmailer.codeworxtech.com/ website now carries a few
+advertisements through the Google Adsense network to help offset
+some of our costs.<br />
+Thanks ....<br />
+<hr>
+<p>PHPMailer is the world's leading email transport class and downloaded an
+average of more than 32,000 each month. In March 2009, PHPMailer was downloaded
+more than 31,000 times -- that's an average of 1,000 downloads daily. Our
thanks
+to our new users and loyal users. We understand you have many choices available
+to select from and we thank you for select our fast and stable tool for your
+website and projects.</p>
+<p>Credits:<br>
+PHPMailer's original founder is Brent Matzelle. The current team is:<br>
+Project Administrator: Andy Prevost (codeworxtech),
+<a href="mailto:address@hidden";>
address@hidden</a><br>
+Author: Andy Prevost (codeworxtech) address@hidden<br>
+Author: Marcus Bointon (coolbru) <a href="mailto:address@hidden";>
address@hidden</a></p>
+<p>PHPMailer is used in many projects ranging from Open Source to commercial
+packages. Our LGPL licensing terms are very flexible and allow for including
+PHPMailer to enhance projects of all types. If you discover PHPMailer being
used
+in a project, please let us know about it.</p>
+<p><strong>WHY USE OUR TOOLS & WHAT'S IN IT FOR YOU?</strong></p>
+<p>A valid question. We're developers too. We've been writing software,
primarily for the internet, for more than 15 years. Along the way, there are
two major things that had tremendous impact of our company: PHP and Open
Source. PHP is without doubt the most popular platform for the internet. There
has been more progress in this area of technology because of Open Source
software than in any other IT segment. We have used many open source tools,
some as learning tools, some as components in projects we were working on. To
us, it's not about popularity ... we're committed to robust, stable, and
efficient tools you can use to get your projects in your user's hands quickly.
So the shorter answer: what's in it for you? rapid development and rapid
deployment without fuss and with straight forward open source licensing.</p>
+<p>Now, here's our team:</p>
+<table width="100%" cellpadding="5" style="border-collapse: collapse"
border="1">
+ <tr>
+ <th><b>About Andy Prevost, AKA "codeworxtech".</b></th>
+ <th><b>About Marcus Bointon, AKA "coolbru".</b></th>
+ </tr>
+ <tr>
+ <td width="50%" valign="top">
+ <p><a href="http://www.codeworxtech.com";>www.codeworxtech.com</a> for
more information.<br>
+ Web design, web applications, forms: <a
href="http://www.worxstudio.com";>WorxStudio.com</a><br />
+ </p>
+ <p>Our company, <strong>Worx International Inc.</strong>, is the
publisher of several Open Source applications and developer tools as well as
several commercial PHP applications. The Open Source applications are ttCMS and
DCP Portal. The Open Source developer tools include QuickComponents (QuickSkin
and QuickCache) and now PHPMailer.
+ We have staff and offices in the United States, Caribbean, the Middle
+ East, and our primary development center in Canada. Our company is
represented by
+ agents and resellers globally.</p>
+ <p><strong>Worx International Inc.</strong> is at the forefront of
developing PHP applications. Our staff are all Zend Certified university
educated and experts at object oriented programming. While <strong>Worx
International Inc.</strong> can handle any project from trouble shooting
programs written by others all the way to finished mission-critical
applications, we specialize in taking projects from inception all the way
through to implementation - on budget, and on time. If you need help with your
projects, we're the team to get it done right at a reasonable price.</p>
+ <p>Over the years, there have been a number of tools that have been
constant favorites in all of our projects. We have become the project
administrators for most of these tools.</p>
+ <p>Our developer tools are all Open Source. Here's a brief
description:</p>
+ <ul>
+ <li><span style="background-color:
#FFFF00"><strong>PHPMailer</strong></span>. Originally authored by Brent
Matzelle, PHPMailer is the leading "email transfer class" for PHP. PHPMailer is
downloaded more than
+ 26000 times each and every month by developers looking for a fast, stable,
simple email solution. We used it ourselves for years as our favorite tool.
It's always been small (the entire footprint is
+ less than 100 Kb), stable, and as complete a solution as you can find.
+ Other tools are nowhere near as simple. Our thanks to Brent Matzelle for
this superb tool - our commitment is to keep it lean, keep it focused, and
compliant with standards. Visit the PHPMailer website at
+ <a
href="http://phpmailer.codeworxtech.com/";>http://phpmailer.codeworxtech.com/</a>.
<br />
+ Please note: <strong>all of our focus is now on the PHPMailer for
PHP5.</strong><br />
+ <span style="background-color: #FFFF00">PS. While you are at it,
please visit our sponsor's sites, click on their ads.
+ It helps offset some of our costs.</span><br />
+ Want to help? We're looking for progressive developers to join our
team of volunteer professionals working on PHPMailer. Our entire focus is on
PHPMailer
+ for PHP5. If you are interested, let us know.<br />
+ <br />
+ </li>
+ <li><strong><span style="background-color:
#FFFF00">QuickCache</span></strong>. Originally authored by Jean Pierre Deckers
as jpCache, QuickCache is an HTTP OpCode caching strategy that works on your
entire site with only one line of code at the top of your script. The cached
pages can be stored as files or as database objects. The benefits are
absolutely astounding: bandwidth savings of up to 80% and screen display times
increased by 8 - 10x. Visit the QuickCache website at
+ <a
href="http://quickcache.codeworxtech.com/";>http://quickcache.codeworxtech.com/</a>.<br
/>
+ <br />
+ </li>
+ <li><strong><span style="background-color:
#FFFF00">QuickSkin</span></strong>. Originally authored by Philipp v. Criegern
and named "SmartTemplate". The project was taken over by Manuel 'EndelWar'
Dalla Lana and now by "codeworxtech". QuickSkin is one of the truly outstanding
templating engines available, but has always been confused with Smarty
Templating Engine. QuickSkin is even more relevant today than when it was
launched. It's a small footprint with big impact on your projects. It
features a built in caching technology, token based substitution, and works on
the concept of one single HTML file as the template. The HTML template file can
contain variable information making it one small powerful tool for your
developer tool kit. Visit the QuickSkin website at
+ <a
href="http://quickskin.codeworxtech.com/";>http://quickskin.codeworxtech.com/</a>.<br
/>
+ <br />
+ </li>
+ </ul>
+ <p>We're committed to PHP and to the Open Source community.</p>
+ <p>Opportunities with <strong>Worx International Inc.</strong>:</p>
+ <ul>
+ <li><span style="background-color: #FFFF00">Resellers/Agents</span>:
We're always interested in talking with companies that
+ want to represent
+ <strong>Worx International Inc.</strong> in their markets. We also have
private label programs for our commercial products (in certain
circumstances).</li>
+ <li>Programmers/Developers: We are usually fully staffed, however, if
you would like to be considered for a career with
+ <strong>Worx International Inc.</strong>, we would be pleased to hear
from you.<br />
+ A few things to note:<br />
+ <ul>
+ <li>experience level does not matter: from fresh out of college to
multi-year experience - it's your
+ creative mind and a positive attitude we want</li>
+ <li>if you contact us looking for employment, include a cover letter,
indicate what type of work/career you are looking for and expected
compensation</li>
+ <li>if you are representing someone else looking for work, do not
contact us. We have an exclusive relationship with a recruiting partner already
and not interested in altering the arrangement. We will not hire your candidate
under any circumstances unless they wish to approach us individually.</li>
+ <li>any contact that ignores any of these points will be discarded</li>
+ </ul></li>
+ <li>Affiliates/Partnerships: We are interested in partnering with other
firms who are leaders in their field. We clearly understand that successful
companies are built on successful relationships in all industries world-wide.
We currently have innovative relationships throughout the world that are
mutually beneficial. Drop us a line and let's talk.</li>
+ </ul>
+ Regards,<br />
+ Andy Prevost (aka, codeworxtech)<br />
+ <a href="mailto:address@hidden";>address@hidden</a><br />
+ <br />
+ We now also offer website design. hosting, and remote forms processing.
Visit <a href="http://www.worxstudio.com/"; target="_blank">WorxStudio.com</a>
for more information.<br />
+ </td>
+ <td width="50%" valign="top">
+ <p>Marcus is the technical director of <a
href="http://www.synchromedia.co.uk/";>Synchromedia Limited</a>, a UK-based
company providing online business services. Synchromedia's main services
are:</p>
+ <h2>Smartmessages.net</h2>
+ <p><a href="https://www.smartmessages.net/";><img
src="http://www.synchromedia.co.uk/uploads/images/smlogo.gif"; width="292"
height="48" alt="Smartmessages.net logo" /><br />Smartmessages.net</a> is
Synchromedia's large-scale mailing list management system, providing email
delivery services for a wide range of businesses, from sole traders to
corporates.
+ We pride ourselves on personal service, and realise that every one of
your subscribers is a precious asset to be handled with care.
+ We provide fast, reliable, high-volume delivery (some of our customers
have lists of more than 1,000,000 subscribers) with fine-grained tracking while
ensuring you stay fully compliant with UK, EC and US data protection laws.
Smartmessages of course uses PHPMailer at its heart!</p>
+ <h2>address@hidden</h2>
+ <p><a
href="http://www.synchromedia.co.uk/what-we-do/info-at-hand-crm/";><img
src="http://www.synchromedia.co.uk/uploads/images/infoathand-large.png";
width="250" height="40" alt="address@hidden logo" /></a><br />Synchromedia is
the official UK distributor of <a
href="http://www.thelongreach.com/";>address@hidden</a>, a class-leading
open-source web-based CRM system. We provide licenses, hosting, planning,
support and training for this very fully-featured system at very competitive
prices. address@hidden also uses PHPMailer!</p>
+ <h2>How can we help you?</h2>
+ <p>In addition to our headline services, we also provide consulting,
development, hosting and sysadmin services, so if you just need a simple web
hosting package, we can do that too. Not surprisingly, we know rather a lot
about email, so you can talk to us about that too.</p>
+ <p>Please <a
href="http://www.synchromedia.co.uk/about-us/contact-us/";>contact us</a> if
you'd like to know more.</p>
+ <p>Marcus is a regular attendee at <a
href="http://www.phplondon.org/";>PHP London</a>, and occasionally speaks on
email at technical conferences.</p>
+ </td>
+ </tr>
+</table>
+</div>
+</center>
+</body>
+</html>
\ No newline at end of file
Added: people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/changelog.txt
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/changelog.txt
(rev 0)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/changelog.txt
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,408 @@
+ChangeLog
+
+NOTE: THIS VERSION OF PHPMAILER IS DESIGNED FOR PHP5/PHP6.
+ IT WILL NOT WORK WITH PHP4.
+
+Version 5.1 (October 20, 2009)
+* fixed filename issue with AddStringAttachment (thanks to Tony)
+* fixed "SingleTo" property, now works with Senmail, Qmail, and SMTP in
+ addition to PHP mail()
+* added DKIM digital signing functionality
+ New properties:
+ - DKIM_domain (sets the domain name)
+ - DKIM_private (holds DKIM private key)
+ - DKIM_passphrase (holds your DKIM passphrase)
+ - DKIM_selector (holds the DKIM "selector")
+ - DKIM_identity (holds the identifying email address)
+* added callback function support
+ - callback function parameters include:
+ result, to, cc, bcc, subject and body
+ * see the test/test_callback.php file for usage.
+* added "auto" identity functionality
+ - can automatically add:
+ - Return-path (if Sender not set)
+ - Reply-To (if ReplyTo not set)
+ - can be disabled:
+ - $mail->SetFrom('address@hidden','First Last',false);
+ - or by adding the $mail->Sender and/or $mail->ReplyTo properties
+ Note: "auto" identity added to help with emails ending up in spam
+ or junk boxes because of missing headers
+
+Version 5.0.2 (May 24, 2009)
+* Fix for missing attachments when inline graphics are present
+* Fix for missing Cc in header when using SMTP (mail was sent,
+ but not displayed in header -- Cc receiver only saw email To:
+ line and no Cc line, but did get the email (To receiver
+ saw same)
+
+Version 5.0.1 (April 05, 2009)
+* Temporary fix for missing attachments
+
+Version 5.0.0 (April 02, 2009)
+
+* With the release of this version, we are initiating a new version numbering
+ system to differentiate from the PHP4 version of PHPMailer.
+* Most notable in this release is fully object oriented code.
+class.smtp.php:
+* Refactored class.smtp.php to support new exception handling
+ code size reduced from 29.2 Kb to 25.6 Kb
+* Removed unnecessary functions from class.smtp.php:
+ public function Expand($name) {
+ public function Help($keyword="") {
+ public function Noop() {
+ public function Send($from) {
+ public function SendOrMail($from) {
+ public function Verify($name) {
+class.phpmailer.php:
+* Refactored class.phpmailer.php with new exception handling
+* Changed processing functionality of Sendmail and Qmail so they cannot be
+ inadvertently used
+* removed getFile() function, just became a simple wrapper for
+ file_get_contents()
+* added check for PHP version (will gracefully exit if not at least PHP 5.0)
+class.phpmailer.php enhancements
+* enhanced code to check if an attachment source is the same as an embedded or
+ inline graphic source to eliminate duplicate attachments
+New /test_script
+* We have written a test script you can use to test the script as part of your
+ installation. Once you press submit, the test script will send a multi-mime
+ email with either the message you type in or an HTML email with an inline
+ graphic. Two attachments are included in the email (one of the attachments
+ is also the inline graphic so you can see that only one copy of the graphic
+ is sent in the email). The test script will also display the functional
+ script that you can copy/paste to your editor to duplicate the functionality.
+New examples
+* All new examples in both basic and advanced modes. Advanced examples show
+ Exception handling.
+PHPDocumentator (phpdocs) documentation for PHPMailer version 5.0.0
+* all new documentation
+
+Please note: the website has been updated to reflect the changes in PHPMailer
+version 5.0.0. http://phpmailer.codeworxtech.com/
+
+Version 2.3 (November 06, 2008)
+
+* added Arabic language (many thanks to Bahjat Al Mostafa)
+* removed English language from language files and made it a default within
+ class.phpmailer.php - if no language is found, it will default to use
+ the english language translation
+* fixed public/private declarations
+* corrected line 1728, $basedir to $directory
+* added $sign_cert_file to avoid improper duplicate use of $sign_key_file
+* corrected $this->Hello on line 612 to $this->Helo
+* changed default of $LE to "\r\n" to comply with RFC 2822. Can be set by the
user
+ if default is not acceptable
+* removed trim() from return results in EncodeQP
+* /test and three files it contained are removed from version 2.3
+* fixed phpunit.php for compliance with PHP5
+* changed $this->AltBody = $textMsg; to $this->AltBody =
html_entity_decode($textMsg);
+* We have removed the /phpdoc from the downloads. All documentation is now on
+ the http://phpmailer.codeworxtech.com website.
+
+Version 2.2.1 () July 19 2008
+
+* fixed line 1092 in class.smtp.php (my apologies, error on my part)
+
+Version 2.2 () July 15 2008
+
+* Fixed redirect issue (display of UTF-8 in thank you redirect)
+* fixed error in getResponse function declaration (class.pop3.php)
+* PHPMailer now PHP6 compliant
+* fixed line 1092 in class.smtp.php (endless loop from missing = sign)
+
+Version 2.1 (Wed, June 04 2008)
+
+** NOTE: WE HAVE A NEW LANGUAGE VARIABLE FOR DIGITALLY SIGNED S/MIME EMAILS.
+ IF YOU CAN HELP WITH LANGUAGES OTHER THAN ENGLISH AND SPANISH, IT WOULD BE
+ APPRECIATED.
+
+* added S/MIME functionality (ability to digitally sign emails)
+ BIG THANKS TO "sergiocambra" for posting this patch back in November 2007.
+ The "Signed Emails" functionality adds the Sign method to pass the private
key
+ filename and the password to read it, and then email will be sent with
+ content-type multipart/signed and with the digital signature attached.
+* fully compatible with E_STRICT error level
+ - Please note:
+ In about half the test environments this development version was subjected
+ to, an error was thrown for the date() functions used (line 1565 and 1569).
+ This is NOT a PHPMailer error, it is the result of an incorrectly
configured
+ PHP5 installation. The fix is to modify your 'php.ini' file and include the
+ date.timezone = America/New York
+ directive, to your own server timezone
+ - If you do get this error, and are unable to access your php.ini file:
+ In your PHP script, add
+ date_default_timezone_set('America/Toronto');
+ - do not try to use
+ $myVar = date_default_timezone_get();
+ as a test, it will throw an error.
+* added ability to define path (mainly for embedded images)
+ function MsgHTML($message,$basedir='') ... where:
+ $basedir is the fully qualified path
+* fixed MsgHTML() function:
+ - Embedded Images where images are specified by <protocol>:// will not be
altered or embedded
+* fixed the return value of SMTP exit code ( pclose )
+* addressed issue of multibyte characters in subject line and truncating
+* added ability to have user specified Message ID
+ (default is still that PHPMailer create a unique Message ID)
+* corrected unidentified message type to 'application/octet-stream'
+* fixed chunk_split() multibyte issue (thanks to Colin Brown, et al).
+* added check for added attachments
+* enhanced conversion of HTML to text in MsgHTML (thanks to "brunny")
+
+Version 2.1.0beta2 (Sun, Dec 02 2007)
+* implemented updated EncodeQP (thanks to coolbru, aka Marcus Bointon)
+* finished all testing, all known bugs corrected, enhancements tested
+- note: will NOT work with PHP4.
+
+please note, this is BETA software
+** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS
+INTENDED STRICTLY FOR TESTING
+
+Version 2.1.0beta1
+please note, this is BETA software
+** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS
+INTENDED STRICTLY FOR TESTING
+
+Version 2.0.0 rc2 (Fri, Nov 16 2007), interim release
+* implements new property to control VERP in class.smtp.php
+ example (requires instantiating class.smtp.php):
+ $mail->do_verp = true;
+* POP-before-SMTP functionality included, thanks to Richard Davey
+ (see class.pop3.php & pop3_before_smtp_test.php for examples)
+* included example showing how to use PHPMailer with GMAIL
+* fixed the missing Cc in SendMail() and Mail()
+
+******************
+A note on sending bulk emails:
+
+If the email you are sending is not personalized, consider using the
+"undisclosed-recipient:;" strategy. That is, put all of your recipients
+in the Bcc field and set the To field to "undisclosed-recipients:;".
+It's a lot faster (only one send) and saves quite a bit on resources.
+Contrary to some opinions, this will not get you listed in spam engines -
+it's a legitimate way for you to send emails.
+
+A partial example for use with PHPMailer:
+
+$mail->AddAddress("undisclosed-recipients:;");
+$mail->AddBCC("address@hidden,address@hidden,address@hidden");
+
+Many email service providers restrict the number of emails that can be sent
+in any given time period. Often that is between 50 - 60 emails maximum
+per hour or per send session.
+
+If that's the case, then break up your Bcc lists into chunks that are one
+less than your limit, and put a pause in your script.
+*******************
+
+Version 2.0.0 rc1 (Thu, Nov 08 2007), interim release
+* dramatically simplified using inline graphics ... it's fully automated and
requires no user input
+* added automatic document type detection for attachments and pictures
+* added MsgHTML() function to replace Body tag for HTML emails
+* fixed the SendMail security issues (input validation vulnerability)
+* enhanced the AddAddresses functionality so that the "Name" portion is used
in the email address
+* removed the need to use the AltBody method (set from the HTML, or default
text used)
+* set the PHP Mail() function as the default (still support SendMail, SMTP
Mail)
+* removed the need to set the IsHTML property (set automatically)
+* added Estonian language file by Indrek Päri
+* added header injection patch
+* added "set" method to permit users to create their own pseudo-properties
like 'X-Headers', etc.
+ example of use:
+ $mail->set('X-Priority', '3');
+ $mail->set('X-MSMail-Priority', 'Normal');
+* fixed warning message in SMTP get_lines method
+* added TLS/SSL SMTP support
+ example of use:
+ $mail = new PHPMailer();
+ $mail->Mailer = "smtp";
+ $mail->Host = "smtp.example.com";
+ $mail->SMTPSecure = "tls"; // option
+ //$mail->SMTPSecure = "ssl"; // option
+ ...
+ $mail->Send();
+* PHPMailer has been tested with PHP4 (4.4.7) and PHP5 (5.2.7)
+* Works with PHP installed as a module or as CGI-PHP
+- NOTE: will NOT work with PHP5 in E_STRICT error mode
+
+Version 1.73 (Sun, Jun 10 2005)
+* Fixed denial of service bug: http://www.cybsec.com/vuln/PHPMailer-DOS.pdf
+* Now has a total of 20 translations
+* Fixed alt attachments bug: http://tinyurl.com/98u9k
+
+Version 1.72 (Wed, May 25 2004)
+* Added Dutch, Swedish, Czech, Norwegian, and Turkish translations.
+* Received: Removed this method because spam filter programs like
+SpamAssassin reject this header.
+* Fixed error count bug.
+* SetLanguage default is now "language/".
+* Fixed magic_quotes_runtime bug.
+
+Version 1.71 (Tue, Jul 28 2003)
+* Made several speed enhancements
+* Added German and Italian translation files
+* Fixed HELO/AUTH bugs on keep-alive connects
+* Now provides an error message if language file does not load
+* Fixed attachment EOL bug
+* Updated some unclear documentation
+* Added additional tests and improved others
+
+Version 1.70 (Mon, Jun 20 2003)
+* Added SMTP keep-alive support
+* Added IsError method for error detection
+* Added error message translation support (SetLanguage)
+* Refactored many methods to increase library performance
+* Hello now sends the newer EHLO message before HELO as per RFC 2821
+* Removed the boundary class and replaced it with GetBoundary
+* Removed queue support methods
+* New $Hostname variable
+* New Message-ID header
+* Received header reformat
+* Helo variable default changed to $Hostname
+* Removed extra spaces in Content-Type definition (#667182)
+* Return-Path should be set to Sender when set
+* Adds Q or B encoding to headers when necessary
+* quoted-encoding should now encode NULs \000
+* Fixed encoding of body/AltBody (#553370)
+* Adds "To: undisclosed-recipients:;" when all recipients are hidden (BCC)
+* Multiple bug fixes
+
+Version 1.65 (Fri, Aug 09 2002)
+* Fixed non-visible attachment bug (#585097) for Outlook
+* SMTP connections are now closed after each transaction
+* Fixed SMTP::Expand return value
+* Converted SMTP class documentation to phpDocumentor format
+
+Version 1.62 (Wed, Jun 26 2002)
+* Fixed multi-attach bug
+* Set proper word wrapping
+* Reduced memory use with attachments
+* Added more debugging
+* Changed documentation to phpDocumentor format
+
+Version 1.60 (Sat, Mar 30 2002)
+* Sendmail pipe and address patch (Christian Holtje)
+* Added embedded image and read confirmation support (A. Ognio)
+* Added unit tests
+* Added SMTP timeout support (*nix only)
+* Added possibly temporary PluginDir variable for SMTP class
+* Added LE message line ending variable
+* Refactored boundary and attachment code
+* Eliminated SMTP class warnings
+* Added SendToQueue method for future queuing support
+
+Version 1.54 (Wed, Dec 19 2001)
+* Add some queuing support code
+* Fixed a pesky multi/alt bug
+* Messages are no longer forced to have "To" addresses
+
+Version 1.50 (Thu, Nov 08 2001)
+* Fix extra lines when not using SMTP mailer
+* Set WordWrap variable to int with a zero default
+
+Version 1.47 (Tue, Oct 16 2001)
+* Fixed Received header code format
+* Fixed AltBody order error
+* Fixed alternate port warning
+
+Version 1.45 (Tue, Sep 25 2001)
+* Added enhanced SMTP debug support
+* Added support for multiple ports on SMTP
+* Added Received header for tracing
+* Fixed AddStringAttachment encoding
+* Fixed possible header name quote bug
+* Fixed wordwrap() trim bug
+* Couple other small bug fixes
+
+Version 1.41 (Wed, Aug 22 2001)
+* Fixed AltBody bug w/o attachments
+* Fixed rfc_date() for certain mail servers
+
+Version 1.40 (Sun, Aug 12 2001)
+* Added multipart/alternative support (AltBody)
+* Documentation update
+* Fixed bug in Mercury MTA
+
+Version 1.29 (Fri, Aug 03 2001)
+* Added AddStringAttachment() method
+* Added SMTP authentication support
+
+Version 1.28 (Mon, Jul 30 2001)
+* Fixed a typo in SMTP class
+* Fixed header issue with Imail (win32) SMTP server
+* Made fopen() calls for attachments use "rb" to fix win32 error
+
+Version 1.25 (Mon, Jul 02 2001)
+* Added RFC 822 date fix (Patrice)
+* Added improved error handling by adding a $ErrorInfo variable
+* Removed MailerDebug variable (obsolete with new error handler)
+
+Version 1.20 (Mon, Jun 25 2001)
+* Added quoted-printable encoding (Patrice)
+* Set Version as public and removed PrintVersion()
+* Changed phpdoc to only display public variables and methods
+
+Version 1.19 (Thu, Jun 21 2001)
+* Fixed MS Mail header bug
+* Added fix for Bcc problem with mail(). *Does not work on Win32*
+ (See PHP bug report: http://www.php.net/bugs.php?id=11616)
+* mail() no longer passes a fifth parameter when not needed
+
+Version 1.15 (Fri, Jun 15 2001)
+[Note: these changes contributed by Patrice Fournier]
+* Changed all remaining \n to \r\n
+* Bcc: header no longer writen to message except
+when sent directly to sendmail
+* Added a small message to non-MIME compliant mail reader
+* Added Sender variable to change the Sender email
+used in -f for sendmail/mail and in 'MAIL FROM' for smtp mode
+* Changed boundary setting to a place it will be set only once
+* Removed transfer encoding for whole message when using multipart
+* Message body now uses Encoding in multipart messages
+* Can set encoding and type to attachments 7bit, 8bit
+and binary attachment are sent as is, base64 are encoded
+* Can set Encoding to base64 to send 8 bits body
+through 7 bits servers
+
+Version 1.10 (Tue, Jun 12 2001)
+* Fixed win32 mail header bug (printed out headers in message body)
+
+Version 1.09 (Fri, Jun 08 2001)
+* Changed date header to work with Netscape mail programs
+* Altered phpdoc documentation
+
+Version 1.08 (Tue, Jun 05 2001)
+* Added enhanced error-checking
+* Added phpdoc documentation to source
+
+Version 1.06 (Fri, Jun 01 2001)
+* Added optional name for file attachments
+
+Version 1.05 (Tue, May 29 2001)
+* Code cleanup
+* Eliminated sendmail header warning message
+* Fixed possible SMTP error
+
+Version 1.03 (Thu, May 24 2001)
+* Fixed problem where qmail sends out duplicate messages
+
+Version 1.02 (Wed, May 23 2001)
+* Added multiple recipient and attachment Clear* methods
+* Added Sendmail public variable
+* Fixed problem with loading SMTP library multiple times
+
+Version 0.98 (Tue, May 22 2001)
+* Fixed problem with redundant mail hosts sending out multiple messages
+* Added additional error handler code
+* Added AddCustomHeader() function
+* Added support for Microsoft mail client headers (affects priority)
+* Fixed small bug with Mailer variable
+* Added PrintVersion() function
+
+Version 0.92 (Tue, May 15 2001)
+* Changed file names to class.phpmailer.php and class.smtp.php to match
+ current PHP class trend.
+* Fixed problem where body not being printed when a message is attached
+* Several small bug fixes
+
+Version 0.90 (Tue, April 17 2001)
+* Intial public release
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.phpmailer.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.phpmailer.php
2009-11-22 16:31:30 UTC (rev 20878)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.phpmailer.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -2,14 +2,16 @@
/*~ class.phpmailer.php
.---------------------------------------------------------------------------.
| Software: PHPMailer - PHP email class |
-| Version: 2.2 |
-| Contact: via sourceforge.net support pages (also www.codeworxtech.com) |
+| Version: 5.1 |
+| Contact: via sourceforge.net support pages (also www.worxware.com) |
| Info: http://phpmailer.sourceforge.net |
| Support: http://sourceforge.net/projects/phpmailer/ |
| ------------------------------------------------------------------------- |
-| Author: Andy Prevost (project admininistrator) |
-| Author: Brent R. Matzelle (original founder) |
-| Copyright (c) 2004-2007, Andy Prevost. All Rights Reserved. |
+| Admin: Andy Prevost (project admininistrator) |
+| Authors: Andy Prevost (codeworxtech) address@hidden |
+| : Marcus Bointon (coolbru) address@hidden |
+| Founder: Brent R. Matzelle (original founder) |
+| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved. |
| Copyright (c) 2001-2003, Brent R. Matzelle |
| ------------------------------------------------------------------------- |
| License: Distributed under the Lesser General Public License (LGPL) |
@@ -18,142 +20,142 @@
| ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| FITNESS FOR A PARTICULAR PURPOSE. |
| ------------------------------------------------------------------------- |
-| We offer a number of paid services (www.codeworxtech.com): |
+| We offer a number of paid services (www.worxware.com): |
| - Web Hosting on highly optimized fast and secure servers |
| - Technology Consulting |
| - Oursourcing (highly qualified programmers and graphic designers) |
'---------------------------------------------------------------------------'
+*/
/**
* PHPMailer - PHP email transport class
- * NOTE: Designed for use with PHP version 5 and up
+ * NOTE: Requires PHP version 5 or later
* @package PHPMailer
* @author Andy Prevost
- * @copyright 2004 - 2008 Andy Prevost
+ * @author Marcus Bointon
+ * @copyright 2004 - 2009 Andy Prevost
+ * @version $Id: class.phpmailer.php 447 2009-05-25 01:36:38Z codeworxtech $
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public
License
*/
+if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of
PHPMailer will only run on PHP version 5 or greater!\n");
+
class PHPMailer {
- /////////////////////////////////////////////////
+ /////////////////////////////////////////////////
// PROPERTIES, PUBLIC
- /////////////////////////////////////////////////
+ /////////////////////////////////////////////////
- /**
- * Email priority (1 = High, 3 = Normal, 5 = low).
- * @var int
- */
+ /**
+ * Email priority (1 = High, 3 = Normal, 5 = low).
+ * @var int
+ */
public $Priority = 3;
- /**
- * Sets the CharSet of the message.
- * @var string
- */
+ /**
+ * Sets the CharSet of the message.
+ * @var string
+ */
public $CharSet = 'iso-8859-1';
- /**
- * Sets the Content-type of the message.
- * @var string
- */
+ /**
+ * Sets the Content-type of the message.
+ * @var string
+ */
public $ContentType = 'text/plain';
- /**
- * Sets the Encoding of the message. Options for this are "8bit",
- * "7bit", "binary", "base64", and "quoted-printable".
- * @var string
- */
+ /**
+ * Sets the Encoding of the message. Options for this are
+ * "8bit", "7bit", "binary", "base64", and "quoted-printable".
+ * @var string
+ */
public $Encoding = '8bit';
- /**
- * Holds the most recent mailer error message.
- * @var string
- */
+ /**
+ * Holds the most recent mailer error message.
+ * @var string
+ */
public $ErrorInfo = '';
- /**
- * Sets the From email address for the message.
- * @var string
- */
+ /**
+ * Sets the From email address for the message.
+ * @var string
+ */
public $From = 'address@hidden';
- /**
- * Sets the From name of the message.
- * @var string
- */
+ /**
+ * Sets the From name of the message.
+ * @var string
+ */
public $FromName = 'Root User';
- /**
- * Sets the Sender email (Return-Path) of the message. If not empty,
- * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
- * @var string
- */
+ /**
+ * Sets the Sender email (Return-Path) of the message. If not empty,
+ * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
+ * @var string
+ */
public $Sender = '';
- /**
- * Sets the Subject of the message.
- * @var string
- */
+ /**
+ * Sets the Subject of the message.
+ * @var string
+ */
public $Subject = '';
- /**
- * Sets the Body of the message. This can be either an HTML or text body.
- * If HTML then run IsHTML(true).
- * @var string
- */
+ /**
+ * Sets the Body of the message. This can be either an HTML or text body.
+ * If HTML then run IsHTML(true).
+ * @var string
+ */
public $Body = '';
- /**
- * Sets the text-only body of the message. This automatically sets the
- * email to multipart/alternative. This body can be read by mail
- * clients that do not have HTML email capability such as mutt. Clients
- * that can read HTML will view the normal Body.
- * @var string
- */
+ /**
+ * Sets the text-only body of the message. This automatically sets the
+ * email to multipart/alternative. This body can be read by mail
+ * clients that do not have HTML email capability such as mutt. Clients
+ * that can read HTML will view the normal Body.
+ * @var string
+ */
public $AltBody = '';
- /**
- * Sets word wrapping on the body of the message to a given number of
- * characters.
- * @var int
- */
+ /**
+ * Sets word wrapping on the body of the message to a given number of
+ * characters.
+ * @var int
+ */
public $WordWrap = 0;
- /**
- * Method to send mail: ("mail", "sendmail", or "smtp").
- * @var string
- */
+ /**
+ * Method to send mail: ("mail", "sendmail", or "smtp").
+ * @var string
+ */
public $Mailer = 'mail';
- /**
- * Sets the path of the sendmail program.
- * @var string
- */
+ /**
+ * Sets the path of the sendmail program.
+ * @var string
+ */
public $Sendmail = '/usr/sbin/sendmail';
-
- /**
- * Path to PHPMailer plugins. This is now only useful if the SMTP class
- * is in a different directory than the PHP include path.
- * @var string
- */
+
+ /**
+ * Path to PHPMailer plugins. Useful if the SMTP class
+ * is in a different directory than the PHP include path.
+ * @var string
+ */
public $PluginDir = '';
- /**
- * Holds PHPMailer version.
- * @var string
- */
- public $Version = "2.2";
-
- /**
- * Sets the email address that a reading confirmation will be sent.
- * @var string
- */
+ /**
+ * Sets the email address that a reading confirmation will be sent.
+ * @var string
+ */
public $ConfirmReadingTo = '';
- /**
- * Sets the hostname to use in Message-Id and Received headers
- * and as default HELO string. If empty, the value returned
- * by SERVER_NAME is used or 'localhost.localdomain'.
- * @var string
- */
+ /**
+ * Sets the hostname to use in Message-Id and Received headers
+ * and as default HELO string. If empty, the value returned
+ * by SERVER_NAME is used or 'localhost.localdomain'.
+ * @var string
+ */
public $Hostname = '';
/**
@@ -161,629 +163,846 @@
* If empty, a unique id will be generated.
* @var string
*/
- public $MessageID = '';
+ public $MessageID = '';
- /////////////////////////////////////////////////
+ /////////////////////////////////////////////////
// PROPERTIES FOR SMTP
- /////////////////////////////////////////////////
+ /////////////////////////////////////////////////
- /**
- * Sets the SMTP hosts. All hosts must be separated by a
- * semicolon. You can also specify a different port
- * for each host by using this format: [hostname:port]
- * (e.g. "smtp1.example.com:25;smtp2.example.com").
- * Hosts will be tried in order.
- * @var string
- */
- public $Host = 'localhost';
+ /**
+ * Sets the SMTP hosts. All hosts must be separated by a
+ * semicolon. You can also specify a different port
+ * for each host by using this format: [hostname:port]
+ * (e.g. "smtp1.example.com:25;smtp2.example.com").
+ * Hosts will be tried in order.
+ * @var string
+ */
+ public $Host = 'localhost';
- /**
- * Sets the default SMTP server port.
- * @var int
- */
- public $Port = 25;
+ /**
+ * Sets the default SMTP server port.
+ * @var int
+ */
+ public $Port = 25;
- /**
- * Sets the SMTP HELO of the message (Default is $Hostname).
- * @var string
- */
- public $Helo = '';
+ /**
+ * Sets the SMTP HELO of the message (Default is $Hostname).
+ * @var string
+ */
+ public $Helo = '';
/**
* Sets connection prefix.
* Options are "", "ssl" or "tls"
* @var string
*/
- public $SMTPSecure = "";
+ public $SMTPSecure = '';
- /**
- * Sets SMTP authentication. Utilizes the Username and Password variables.
- * @var bool
- */
- public $SMTPAuth = false;
+ /**
+ * Sets SMTP authentication. Utilizes the Username and Password variables.
+ * @var bool
+ */
+ public $SMTPAuth = false;
- /**
- * Sets SMTP username.
- * @var string
- */
- public $Username = '';
+ /**
+ * Sets SMTP username.
+ * @var string
+ */
+ public $Username = '';
- /**
- * Sets SMTP password.
- * @var string
- */
- public $Password = '';
+ /**
+ * Sets SMTP password.
+ * @var string
+ */
+ public $Password = '';
- /**
- * Sets the SMTP server timeout in seconds. This function will not
- * work with the win32 version.
- * @var int
- */
- public $Timeout = 10;
+ /**
+ * Sets the SMTP server timeout in seconds.
+ * This function will not work with the win32 version.
+ * @var int
+ */
+ public $Timeout = 10;
- /**
- * Sets SMTP class debugging on or off.
- * @var bool
- */
- public $SMTPDebug = false;
+ /**
+ * Sets SMTP class debugging on or off.
+ * @var bool
+ */
+ public $SMTPDebug = false;
- /**
- * Prevents the SMTP connection from being closed after each mail
- * sending. If this is set to true then to close the connection
- * requires an explicit call to SmtpClose().
- * @var bool
- */
+ /**
+ * Prevents the SMTP connection from being closed after each mail
+ * sending. If this is set to true then to close the connection
+ * requires an explicit call to SmtpClose().
+ * @var bool
+ */
public $SMTPKeepAlive = false;
/**
* Provides the ability to have the TO field process individual
* emails, instead of sending to entire TO addresses
* @var bool
- */
- public $SingleTo = false;
-
- /////////////////////////////////////////////////
- // PROPERTIES, PRIVATE
+ */
+ public $SingleTo = false;
+
+ /**
+ * If SingleTo is true, this provides the array to hold the email addresses
+ * @var bool
+ */
+ public $SingleToArray = array();
+
+ /**
+ * Provides the ability to change the line ending
+ * @var string
+ */
+ public $LE = "\n";
+
+ /**
+ * Used with DKIM DNS Resource Record
+ * @var string
+ */
+ public $DKIM_selector = 'phpmailer';
+
+ /**
+ * Used with DKIM DNS Resource Record
+ * optional, in format of email address 'address@hidden'
+ * @var string
+ */
+ public $DKIM_identity = '';
+
+ /**
+ * Used with DKIM DNS Resource Record
+ * optional, in format of email address 'address@hidden'
+ * @var string
+ */
+ public $DKIM_domain = '';
+
+ /**
+ * Used with DKIM DNS Resource Record
+ * optional, in format of email address 'address@hidden'
+ * @var string
+ */
+ public $DKIM_private = '';
+
+ /**
+ * Callback Action function name
+ * the function that handles the result of the send email action. Parameters:
+ * bool $result result of the send action
+ * string $to email address of the recipient
+ * string $cc cc email addresses
+ * string $bcc bcc email addresses
+ * string $subject the subject
+ * string $body the email body
+ * @var string
+ */
+ public $action_function = ''; //'callbackAction';
+
+ /**
+ * Sets the PHPMailer Version number
+ * @var string
+ */
+ public $Version = '5.1';
+
/////////////////////////////////////////////////
+ // PROPERTIES, PRIVATE AND PROTECTED
+ /////////////////////////////////////////////////
- private $smtp = NULL;
- private $to = array();
- private $cc = array();
- private $bcc = array();
- private $ReplyTo = array();
- private $attachment = array();
- private $CustomHeader = array();
- private $message_type = '';
- private $boundary = array();
- private $language = array();
- private $error_count = 0;
- private $LE = "\n";
- private $sign_key_file = "";
- private $sign_key_pass = "";
+ private $smtp = NULL;
+ private $to = array();
+ private $cc = array();
+ private $bcc = array();
+ private $ReplyTo = array();
+ private $all_recipients = array();
+ private $attachment = array();
+ private $CustomHeader = array();
+ private $message_type = '';
+ private $boundary = array();
+ protected $language = array();
+ private $error_count = 0;
+ private $sign_cert_file = "";
+ private $sign_key_file = "";
+ private $sign_key_pass = "";
+ private $exceptions = false;
/////////////////////////////////////////////////
+ // CONSTANTS
+ /////////////////////////////////////////////////
+
+ const STOP_MESSAGE = 0; // message only, continue processing
+ const STOP_CONTINUE = 1; // message?, likely ok to continue processing
+ const STOP_CRITICAL = 2; // message, plus full stop, critical error reached
+
+ /////////////////////////////////////////////////
// METHODS, VARIABLES
- /////////////////////////////////////////////////
+ /////////////////////////////////////////////////
- /**
- * Sets message type to HTML.
- * @param bool $bool
- * @return void
- */
- public function IsHTML($bool) {
- if($bool == true) {
+ /**
+ * Constructor
+ * @param boolean $exceptions Should we throw external exceptions?
+ */
+ public function __construct($exceptions = false) {
+ $this->exceptions = ($exceptions == true);
+ }
+
+ /**
+ * Sets message type to HTML.
+ * @param bool $ishtml
+ * @return void
+ */
+ public function IsHTML($ishtml = true) {
+ if ($ishtml) {
$this->ContentType = 'text/html';
} else {
$this->ContentType = 'text/plain';
}
- }
+ }
- /**
- * Sets Mailer to send message using SMTP.
- * @return void
- */
+ /**
+ * Sets Mailer to send message using SMTP.
+ * @return void
+ */
public function IsSMTP() {
$this->Mailer = 'smtp';
- }
+ }
- /**
- * Sets Mailer to send message using PHP mail() function.
- * @return void
- */
+ /**
+ * Sets Mailer to send message using PHP mail() function.
+ * @return void
+ */
public function IsMail() {
$this->Mailer = 'mail';
- }
+ }
- /**
- * Sets Mailer to send message using the $Sendmail program.
- * @return void
- */
+ /**
+ * Sets Mailer to send message using the $Sendmail program.
+ * @return void
+ */
public function IsSendmail() {
+ if (!stristr(ini_get('sendmail_path'), 'sendmail')) {
+ $this->Sendmail = '/var/qmail/bin/sendmail';
+ }
$this->Mailer = 'sendmail';
- }
+ }
- /**
- * Sets Mailer to send message using the qmail MTA.
- * @return void
- */
+ /**
+ * Sets Mailer to send message using the qmail MTA.
+ * @return void
+ */
public function IsQmail() {
- $this->Sendmail = '/var/qmail/bin/sendmail';
- $this->Mailer = 'sendmail';
+ if (stristr(ini_get('sendmail_path'), 'qmail')) {
+ $this->Sendmail = '/var/qmail/bin/sendmail';
}
+ $this->Mailer = 'sendmail';
+ }
- /////////////////////////////////////////////////
+ /////////////////////////////////////////////////
// METHODS, RECIPIENTS
- /////////////////////////////////////////////////
+ /////////////////////////////////////////////////
- /**
- * Adds a "To" address.
- * @param string $address
- * @param string $name
- * @return void
- */
+ /**
+ * Adds a "To" address.
+ * @param string $address
+ * @param string $name
+ * @return boolean true on success, false if address already used
+ */
public function AddAddress($address, $name = '') {
- $cur = count($this->to);
- $this->to[$cur][0] = trim($address);
- $this->to[$cur][1] = $name;
- }
+ return $this->AddAnAddress('to', $address, $name);
+ }
- /**
- * Adds a "Cc" address. Note: this function works
- * with the SMTP mailer on win32, not with the "mail"
- * mailer.
- * @param string $address
- * @param string $name
- * @return void
- */
+ /**
+ * Adds a "Cc" address.
+ * Note: this function works with the SMTP mailer on win32, not with the
"mail" mailer.
+ * @param string $address
+ * @param string $name
+ * @return boolean true on success, false if address already used
+ */
public function AddCC($address, $name = '') {
- $cur = count($this->cc);
- $this->cc[$cur][0] = trim($address);
- $this->cc[$cur][1] = $name;
- }
+ return $this->AddAnAddress('cc', $address, $name);
+ }
- /**
- * Adds a "Bcc" address. Note: this function works
- * with the SMTP mailer on win32, not with the "mail"
- * mailer.
- * @param string $address
- * @param string $name
- * @return void
- */
+ /**
+ * Adds a "Bcc" address.
+ * Note: this function works with the SMTP mailer on win32, not with the
"mail" mailer.
+ * @param string $address
+ * @param string $name
+ * @return boolean true on success, false if address already used
+ */
public function AddBCC($address, $name = '') {
- $cur = count($this->bcc);
- $this->bcc[$cur][0] = trim($address);
- $this->bcc[$cur][1] = $name;
- }
+ return $this->AddAnAddress('bcc', $address, $name);
+ }
- /**
- * Adds a "Reply-to" address.
- * @param string $address
- * @param string $name
- * @return void
- */
+ /**
+ * Adds a "Reply-to" address.
+ * @param string $address
+ * @param string $name
+ * @return boolean
+ */
public function AddReplyTo($address, $name = '') {
- $cur = count($this->ReplyTo);
- $this->ReplyTo[$cur][0] = trim($address);
- $this->ReplyTo[$cur][1] = $name;
+ return $this->AddAnAddress('ReplyTo', $address, $name);
+ }
+
+ /**
+ * Adds an address to one of the recipient arrays
+ * Addresses that have been added already return false, but do not throw
exceptions
+ * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo'
+ * @param string $address The email address to send to
+ * @param string $name
+ * @return boolean true on success, false if address already used or invalid
in some way
+ * @access private
+ */
+ private function AddAnAddress($kind, $address, $name = '') {
+ if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
+ echo 'Invalid recipient array: ' . kind;
+ return false;
}
+ $address = trim($address);
+ $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+ if (!self::ValidateAddress($address)) {
+ $this->SetError($this->Lang('invalid_address').': '. $address);
+ if ($this->exceptions) {
+ throw new phpmailerException($this->Lang('invalid_address').':
'.$address);
+ }
+ echo $this->Lang('invalid_address').': '.$address;
+ return false;
+ }
+ if ($kind != 'ReplyTo') {
+ if (!isset($this->all_recipients[strtolower($address)])) {
+ array_push($this->$kind, array($address, $name));
+ $this->all_recipients[strtolower($address)] = true;
+ return true;
+ }
+ } else {
+ if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
+ $this->ReplyTo[strtolower($address)] = array($address, $name);
+ return true;
+ }
+ }
+ return false;
+}
- /////////////////////////////////////////////////
+/**
+ * Set the From and FromName properties
+ * @param string $address
+ * @param string $name
+ * @return boolean
+ */
+ public function SetFrom($address, $name = '',$auto=1) {
+ $address = trim($address);
+ $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+ if (!self::ValidateAddress($address)) {
+ $this->SetError($this->Lang('invalid_address').': '. $address);
+ if ($this->exceptions) {
+ throw new phpmailerException($this->Lang('invalid_address').':
'.$address);
+ }
+ echo $this->Lang('invalid_address').': '.$address;
+ return false;
+ }
+ $this->From = $address;
+ $this->FromName = $name;
+ if ($auto) {
+ if (empty($this->ReplyTo)) {
+ $this->AddAnAddress('ReplyTo', $address, $name);
+ }
+ if (empty($this->Sender)) {
+ $this->Sender = $address;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Check that a string looks roughly like an email address should
+ * Static so it can be used without instantiation
+ * Tries to use PHP built-in validator in the filter extension (from PHP
5.2), falls back to a reasonably competent regex validator
+ * Conforms approximately to RFC2822
+ * @link http://www.hexillion.com/samples/#Regex Original pattern found here
+ * @param string $address The email address to check
+ * @return boolean
+ * @static
+ * @access public
+ */
+ public static function ValidateAddress($address) {
+ if (function_exists('filter_var')) { //Introduced in PHP 5.2
+ if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
+ return false;
+ } else {
+ return true;
+ }
+ } else {
+ return
preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/',
$address);
+ }
+ }
+
+ /////////////////////////////////////////////////
// METHODS, MAIL SENDING
- /////////////////////////////////////////////////
+ /////////////////////////////////////////////////
- /**
- * Creates message and assigns Mailer. If the message is
- * not sent successfully then it returns false. Use the ErrorInfo
- * variable to view description of the error.
- * @return bool
- */
+ /**
+ * Creates message and assigns Mailer. If the message is
+ * not sent successfully then it returns false. Use the ErrorInfo
+ * variable to view description of the error.
+ * @return bool
+ */
public function Send() {
- $header = '';
- $body = '';
- $result = true;
+ try {
+ if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
+ throw new phpmailerException($this->Lang('provide_address'),
self::STOP_CRITICAL);
+ }
- if((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
- $this->SetError($this->Lang('provide_address'));
- return false;
- }
+ // Set whether the message is multipart/alternative
+ if(!empty($this->AltBody)) {
+ $this->ContentType = 'multipart/alternative';
+ }
- /* Set whether the message is multipart/alternative */
- if(!empty($this->AltBody)) {
- $this->ContentType = 'multipart/alternative';
- }
+ $this->error_count = 0; // reset errors
+ $this->SetMessageType();
+ $header = $this->CreateHeader();
+ $body = $this->CreateBody();
- $this->error_count = 0; // reset errors
- $this->SetMessageType();
- $header .= $this->CreateHeader();
- $body = $this->CreateBody();
+ if (empty($this->Body)) {
+ throw new phpmailerException($this->Lang('empty_message'),
self::STOP_CRITICAL);
+ }
- if($body == '') {
+ // digitally sign with DKIM if enabled
+ if ($this->DKIM_domain && $this->DKIM_private) {
+ $header_dkim = $this->DKIM_Add($header,$this->Subject,$body);
+ $header = str_replace("\r\n","\n",$header_dkim) . $header;
+ }
+
+ // Choose the mailer and send through it
+ switch($this->Mailer) {
+ case 'sendmail':
+ return $this->SendmailSend($header, $body);
+ case 'smtp':
+ return $this->SmtpSend($header, $body);
+ default:
+ return $this->MailSend($header, $body);
+ }
+
+ } catch (phpmailerException $e) {
+ $this->SetError($e->getMessage());
+ if ($this->exceptions) {
+ throw $e;
+ }
+ echo $e->getMessage()."\n";
return false;
}
+ }
- /* Choose the mailer */
- switch($this->Mailer) {
- case 'sendmail':
- $result = $this->SendmailSend($header, $body);
- break;
- case 'smtp':
- $result = $this->SmtpSend($header, $body);
- break;
- case 'mail':
- $result = $this->MailSend($header, $body);
- break;
- default:
- $result = $this->MailSend($header, $body);
- break;
- //$this->SetError($this->Mailer . $this->Lang('mailer_not_supported'));
- //$result = false;
- //break;
- }
-
- return $result;
- }
-
- /**
- * Sends mail using the $Sendmail program.
- * @access public
- * @return bool
- */
- public function SendmailSend($header, $body) {
+ /**
+ * Sends mail using the $Sendmail program.
+ * @param string $header The message headers
+ * @param string $body The message body
+ * @access protected
+ * @return bool
+ */
+ protected function SendmailSend($header, $body) {
if ($this->Sender != '') {
$sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail),
escapeshellarg($this->Sender));
} else {
$sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
}
-
- if(address@hidden = popen($sendmail, 'w')) {
- $this->SetError($this->Lang('execute') . $this->Sendmail);
- return false;
+ if ($this->SingleTo === true) {
+ foreach ($this->SingleToArray as $key => $val) {
+ if(address@hidden = popen($sendmail, 'w')) {
+ throw new phpmailerException($this->Lang('execute') .
$this->Sendmail, self::STOP_CRITICAL);
}
-
+ fputs($mail, "To: " . $val . "\n");
fputs($mail, $header);
fputs($mail, $body);
-
- $result = pclose($mail);
- if (version_compare(phpversion(), '4.2.3') == -1) {
- $result = $result >> 8 & 0xFF;
+ $result = pclose($mail);
+ // implement call back function if it exists
+ $isSent = ($result == 0) ? 1 : 0;
+
$this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+ if($result != 0) {
+ throw new phpmailerException($this->Lang('execute') .
$this->Sendmail, self::STOP_CRITICAL);
+ }
+ }
+ } else {
+ if(address@hidden = popen($sendmail, 'w')) {
+ throw new phpmailerException($this->Lang('execute') . $this->Sendmail,
self::STOP_CRITICAL);
+ }
+ fputs($mail, $header);
+ fputs($mail, $body);
+ $result = pclose($mail);
+ // implement call back function if it exists
+ $isSent = ($result == 0) ? 1 : 0;
+
$this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
+ if($result != 0) {
+ throw new phpmailerException($this->Lang('execute') . $this->Sendmail,
self::STOP_CRITICAL);
+ }
}
- if($result != 0) {
- $this->SetError($this->Lang('execute') . $this->Sendmail);
- return false;
- }
+ return true;
+ }
- return true;
+ /**
+ * Sends mail using the PHP mail() function.
+ * @param string $header The message headers
+ * @param string $body The message body
+ * @access protected
+ * @return bool
+ */
+ protected function MailSend($header, $body) {
+ $toArr = array();
+ foreach($this->to as $t) {
+ $toArr[] = $this->AddrFormat($t);
}
+ $to = implode(', ', $toArr);
- /**
- * Sends mail using the PHP mail() function.
- * @access public
- * @return bool
- */
- public function MailSend($header, $body) {
-
- $to = '';
- for($i = 0; $i < count($this->to); $i++) {
- if($i != 0) { $to .= ', '; }
- $to .= $this->AddrFormat($this->to[$i]);
- }
-
- $toArr = split(',', $to);
-
- $params = sprintf("-oi -f %s", $this->Sender);
+ $params = sprintf("-oi -f %s", $this->Sender);
if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
$old_from = ini_get('sendmail_from');
ini_set('sendmail_from', $this->Sender);
if ($this->SingleTo === true && count($toArr) > 1) {
foreach ($toArr as $key => $val) {
$rt = @mail($val,
$this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header,
$params);
+ // implement call back function if it exists
+ $isSent = ($rt == 1) ? 1 : 0;
+
$this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
}
} else {
$rt = @mail($to,
$this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header,
$params);
+ // implement call back function if it exists
+ $isSent = ($rt == 1) ? 1 : 0;
+
$this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
}
} else {
if ($this->SingleTo === true && count($toArr) > 1) {
foreach ($toArr as $key => $val) {
$rt = @mail($val,
$this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header,
$params);
+ // implement call back function if it exists
+ $isSent = ($rt == 1) ? 1 : 0;
+
$this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
}
} else {
$rt = @mail($to,
$this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
+ // implement call back function if it exists
+ $isSent = ($rt == 1) ? 1 : 0;
+
$this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
}
- }
-
+ }
if (isset($old_from)) {
ini_set('sendmail_from', $old_from);
}
-
if(!$rt) {
- $this->SetError($this->Lang('instantiate'));
- return false;
- }
-
- return true;
+ throw new phpmailerException($this->Lang('instantiate'),
self::STOP_CRITICAL);
}
+ return true;
+ }
- /**
- * Sends mail via SMTP using PhpSMTP (Author:
- * Chris Ryan). Returns bool. Returns false if there is a
- * bad MAIL FROM, RCPT, or DATA input.
- * @access public
- * @return bool
- */
- public function SmtpSend($header, $body) {
- include_once($this->PluginDir . 'class.smtp.php');
- $error = '';
- $bad_rcpt = array();
+ /**
+ * Sends mail via SMTP using PhpSMTP
+ * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
+ * @param string $header The message headers
+ * @param string $body The message body
+ * @uses SMTP
+ * @access protected
+ * @return bool
+ */
+ protected function SmtpSend($header, $body) {
+ require_once $this->PluginDir . 'class.smtp.php';
+ $bad_rcpt = array();
if(!$this->SmtpConnect()) {
- return false;
+ throw new phpmailerException($this->Lang('smtp_connect_failed'),
self::STOP_CRITICAL);
}
-
$smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
if(!$this->smtp->Mail($smtp_from)) {
- $error = $this->Lang('from_failed') . $smtp_from;
- $this->SetError($error);
- $this->smtp->Reset();
- return false;
- }
+ throw new phpmailerException($this->Lang('from_failed') . $smtp_from,
self::STOP_CRITICAL);
+ }
- /* Attempt to send attach all recipients */
- for($i = 0; $i < count($this->to); $i++) {
- if(!$this->smtp->Recipient($this->to[$i][0])) {
- $bad_rcpt[] = $this->to[$i][0];
- }
+ // Attempt to send attach all recipients
+ foreach($this->to as $to) {
+ if (!$this->smtp->Recipient($to[0])) {
+ $bad_rcpt[] = $to[0];
+ // implement call back function if it exists
+ $isSent = 0;
+ $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+ } else {
+ // implement call back function if it exists
+ $isSent = 1;
+ $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+ }
}
- for($i = 0; $i < count($this->cc); $i++) {
- if(!$this->smtp->Recipient($this->cc[$i][0])) {
- $bad_rcpt[] = $this->cc[$i][0];
- }
+ foreach($this->cc as $cc) {
+ if (!$this->smtp->Recipient($cc[0])) {
+ $bad_rcpt[] = $cc[0];
+ // implement call back function if it exists
+ $isSent = 0;
+ $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+ } else {
+ // implement call back function if it exists
+ $isSent = 1;
+ $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+ }
}
- for($i = 0; $i < count($this->bcc); $i++) {
- if(!$this->smtp->Recipient($this->bcc[$i][0])) {
- $bad_rcpt[] = $this->bcc[$i][0];
- }
+ foreach($this->bcc as $bcc) {
+ if (!$this->smtp->Recipient($bcc[0])) {
+ $bad_rcpt[] = $bcc[0];
+ // implement call back function if it exists
+ $isSent = 0;
+ $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+ } else {
+ // implement call back function if it exists
+ $isSent = 1;
+ $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+ }
}
- if(count($bad_rcpt) > 0) { // Create error message
- for($i = 0; $i < count($bad_rcpt); $i++) {
- if($i != 0) {
- $error .= ', ';
- }
- $error .= $bad_rcpt[$i];
- }
- $error = $this->Lang('recipients_failed') . $error;
- $this->SetError($error);
- $this->smtp->Reset();
- return false;
- }
+ if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
+ $badaddresses = implode(', ', $bad_rcpt);
+ throw new phpmailerException($this->Lang('recipients_failed') .
$badaddresses);
+ }
if(!$this->smtp->Data($header . $body)) {
- $this->SetError($this->Lang('data_not_accepted'));
- $this->smtp->Reset();
- return false;
- }
+ throw new phpmailerException($this->Lang('data_not_accepted'),
self::STOP_CRITICAL);
+ }
if($this->SMTPKeepAlive == true) {
- $this->smtp->Reset();
- } else {
- $this->SmtpClose();
+ $this->smtp->Reset();
}
+ return true;
+ }
- return true;
- }
-
- /**
- * Initiates a connection to an SMTP server. Returns false if the
- * operation failed.
+ /**
+ * Initiates a connection to an SMTP server.
+ * Returns false if the operation failed.
+ * @uses SMTP
* @access public
- * @return bool
- */
+ * @return bool
+ */
public function SmtpConnect() {
- if($this->smtp == NULL) {
+ if(is_null($this->smtp)) {
$this->smtp = new SMTP();
}
- $this->smtp->do_debug = $this->SMTPDebug;
+ $this->smtp->do_debug = $this->SMTPDebug;
$hosts = explode(';', $this->Host);
- $index = 0;
- $connection = ($this->smtp->Connected());
+ $index = 0;
+ $connection = $this->smtp->Connected();
- /* Retry while there is no connection */
- while($index < count($hosts) && $connection == false) {
- $hostinfo = array();
- if(eregi('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) {
- $host = $hostinfo[1];
- $port = $hostinfo[2];
- } else {
- $host = $hosts[$index];
- $port = $this->Port;
- }
+ // Retry while there is no connection
+ try {
+ while($index < count($hosts) && !$connection) {
+ $hostinfo = array();
+ if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
+ $host = $hostinfo[1];
+ $port = $hostinfo[2];
+ } else {
+ $host = $hosts[$index];
+ $port = $this->Port;
+ }
- $tls = ($this->SMTPSecure == 'tls');
- $ssl = ($this->SMTPSecure == 'ssl');
+ $tls = ($this->SMTPSecure == 'tls');
+ $ssl = ($this->SMTPSecure == 'ssl');
- if($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port,
$this->Timeout)) {
+ if ($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port,
$this->Timeout)) {
- $hello = ($this->Helo != '' ? $this->Hello : $this->ServerHostname());
- $this->smtp->Hello($hello);
+ $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
+ $this->smtp->Hello($hello);
- if($tls) {
- if(!$this->smtp->StartTLS()) {
- $this->SetError($this->Lang("tls"));
- $this->smtp->Reset();
- $connection = false;
- }
+ if ($tls) {
+ if (!$this->smtp->StartTLS()) {
+ throw new phpmailerException($this->Lang('tls'));
+ }
- //We must resend HELLO after tls negociation
- $this->smtp->Hello($hello);
- }
+ //We must resend HELO after tls negotiation
+ $this->smtp->Hello($hello);
+ }
- $connection = true;
- if($this->SMTPAuth) {
- if(!$this->smtp->Authenticate($this->Username, $this->Password)) {
- $this->SetError($this->Lang('authenticate'));
- $this->smtp->Reset();
- $connection = false;
+ $connection = true;
+ if ($this->SMTPAuth) {
+ if (!$this->smtp->Authenticate($this->Username, $this->Password)) {
+ throw new phpmailerException($this->Lang('authenticate'));
+ }
}
}
- }
- $index++;
+ $index++;
+ if (!$connection) {
+ throw new phpmailerException($this->Lang('connect_host'));
}
- if(!$connection) {
- $this->SetError($this->Lang('connect_host'));
+ }
+ } catch (phpmailerException $e) {
+ $this->smtp->Reset();
+ throw $e;
}
+ return true;
+ }
- return $connection;
- }
-
- /**
- * Closes the active SMTP session if one exists.
- * @return void
- */
+ /**
+ * Closes the active SMTP session if one exists.
+ * @return void
+ */
public function SmtpClose() {
- if($this->smtp != NULL) {
+ if(!is_null($this->smtp)) {
if($this->smtp->Connected()) {
- $this->smtp->Quit();
- $this->smtp->Close();
- }
- }
+ $this->smtp->Quit();
+ $this->smtp->Close();
+ }
}
+ }
- /**
- * Sets the language for all class error messages. Returns false
- * if it cannot load the language file. The default language type
- * is English.
- * @param string $lang_type Type of language (e.g. Portuguese: "br")
- * @param string $lang_path Path to the language file directory
- * @access public
- * @return bool
- */
- function SetLanguage($lang_type = 'en', $lang_path = 'language/') {
- if( !(@include $lang_path.'phpmailer.lang-'.$lang_type.'.php') ) {
- $this->SetError('Could not load language file');
- return false;
- }
- $this->language = $PHPMAILER_LANG;
- return true;
+ /**
+ * Sets the language for all class error messages.
+ * Returns false if it cannot load the language file. The default language
is English.
+ * @param string $langcode ISO 639-1 2-character language code (e.g.
Portuguese: "br")
+ * @param string $lang_path Path to the language file directory
+ * @access public
+ */
+ function SetLanguage($langcode = 'en', $lang_path = 'language/') {
+ //Define full set of translatable strings
+ $PHPMAILER_LANG = array(
+ 'provide_address' => 'You must provide at least one recipient email
address.',
+ 'mailer_not_supported' => ' mailer is not supported.',
+ 'execute' => 'Could not execute: ',
+ 'instantiate' => 'Could not instantiate mail function.',
+ 'authenticate' => 'SMTP Error: Could not authenticate.',
+ 'from_failed' => 'The following From address failed: ',
+ 'recipients_failed' => 'SMTP Error: The following recipients failed: ',
+ 'data_not_accepted' => 'SMTP Error: Data not accepted.',
+ 'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
+ 'file_access' => 'Could not access file: ',
+ 'file_open' => 'File Error: Could not open file: ',
+ 'encoding' => 'Unknown encoding: ',
+ 'signing' => 'Signing Error: ',
+ 'smtp_error' => 'SMTP server error: ',
+ 'empty_message' => 'Message body empty',
+ 'invalid_address' => 'Invalid address',
+ 'variable_set' => 'Cannot set or reset variable: '
+ );
+ //Overwrite language-specific strings. This way we'll never have missing
translations - no more "language string failed to load"!
+ $l = true;
+ if ($langcode != 'en') { //There is no English translation file
+ $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
}
+ $this->language = $PHPMAILER_LANG;
+ return ($l == true); //Returns false if language not found
+ }
- /////////////////////////////////////////////////
+ /**
+ * Return the current array of language strings
+ * @return array
+ */
+ public function GetTranslations() {
+ return $this->language;
+ }
+
+ /////////////////////////////////////////////////
// METHODS, MESSAGE CREATION
- /////////////////////////////////////////////////
+ /////////////////////////////////////////////////
- /**
- * Creates recipient headers.
+ /**
+ * Creates recipient headers.
* @access public
- * @return string
- */
+ * @return string
+ */
public function AddrAppend($type, $addr) {
$addr_str = $type . ': ';
- $addr_str .= $this->AddrFormat($addr[0]);
- if(count($addr) > 1) {
- for($i = 1; $i < count($addr); $i++) {
- $addr_str .= ', ' . $this->AddrFormat($addr[$i]);
- }
- }
- $addr_str .= $this->LE;
+ $addresses = array();
+ foreach ($addr as $a) {
+ $addresses[] = $this->AddrFormat($a);
+ }
+ $addr_str .= implode(', ', $addresses);
+ $addr_str .= $this->LE;
- return $addr_str;
- }
-
- /**
- * Formats an address correctly.
+ return $addr_str;
+ }
+
+ /**
+ * Formats an address correctly.
* @access public
- * @return string
- */
+ * @return string
+ */
public function AddrFormat($addr) {
- if(empty($addr[1])) {
- $formatted = $this->SecureHeader($addr[0]);
+ if (empty($addr[1])) {
+ return $this->SecureHeader($addr[0]);
} else {
- $formatted = $this->EncodeHeader($this->SecureHeader($addr[1]),
'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
- }
-
- return $formatted;
+ return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . "
<" . $this->SecureHeader($addr[0]) . ">";
}
+ }
- /**
- * Wraps message for use with mailers that do not
- * automatically perform wrapping and for quoted-printable.
- * Original written by philippe.
+ /**
+ * Wraps message for use with mailers that do not
+ * automatically perform wrapping and for quoted-printable.
+ * Original written by philippe.
+ * @param string $message The message to wrap
+ * @param integer $length The line length to wrap to
+ * @param boolean $qp_mode Whether to run in Quoted-Printable mode
* @access public
- * @return string
- */
+ * @return string
+ */
public function WrapText($message, $length, $qp_mode = false) {
- $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
+ $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
// If utf-8 encoding is used, we will need to make sure we don't
// split multibyte characters when we wrap
$is_utf8 = (strtolower($this->CharSet) == "utf-8");
- $message = $this->FixEOL($message);
+ $message = $this->FixEOL($message);
if (substr($message, -1) == $this->LE) {
- $message = substr($message, 0, -1);
+ $message = substr($message, 0, -1);
}
- $line = explode($this->LE, $message);
+ $line = explode($this->LE, $message);
$message = '';
for ($i=0 ;$i < count($line); $i++) {
$line_part = explode(' ', $line[$i]);
$buf = '';
for ($e = 0; $e<count($line_part); $e++) {
- $word = $line_part[$e];
+ $word = $line_part[$e];
if ($qp_mode and (strlen($word) > $length)) {
- $space_left = $length - strlen($buf) - 1;
+ $space_left = $length - strlen($buf) - 1;
if ($e != 0) {
if ($space_left > 20) {
- $len = $space_left;
+ $len = $space_left;
if ($is_utf8) {
$len = $this->UTF8CharBoundary($word, $len);
} elseif (substr($word, $len - 1, 1) == "=") {
- $len--;
+ $len--;
} elseif (substr($word, $len - 2, 1) == "=") {
- $len -= 2;
+ $len -= 2;
}
- $part = substr($word, 0, $len);
- $word = substr($word, $len);
+ $part = substr($word, 0, $len);
+ $word = substr($word, $len);
$buf .= ' ' . $part;
- $message .= $buf . sprintf("=%s", $this->LE);
+ $message .= $buf . sprintf("=%s", $this->LE);
} else {
- $message .= $buf . $soft_break;
- }
+ $message .= $buf . $soft_break;
+ }
$buf = '';
- }
+ }
while (strlen($word) > 0) {
- $len = $length;
+ $len = $length;
if ($is_utf8) {
$len = $this->UTF8CharBoundary($word, $len);
} elseif (substr($word, $len - 1, 1) == "=") {
- $len--;
+ $len--;
} elseif (substr($word, $len - 2, 1) == "=") {
- $len -= 2;
+ $len -= 2;
}
- $part = substr($word, 0, $len);
- $word = substr($word, $len);
+ $part = substr($word, 0, $len);
+ $word = substr($word, $len);
if (strlen($word) > 0) {
- $message .= $part . sprintf("=%s", $this->LE);
+ $message .= $part . sprintf("=%s", $this->LE);
} else {
- $buf = $part;
- }
- }
+ $buf = $part;
+ }
+ }
} else {
- $buf_o = $buf;
+ $buf_o = $buf;
$buf .= ($e == 0) ? $word : (' ' . $word);
if (strlen($buf) > $length and $buf_o != '') {
- $message .= $buf_o . $soft_break;
- $buf = $word;
- }
- }
+ $message .= $buf_o . $soft_break;
+ $buf = $word;
}
- $message .= $buf . $this->LE;
}
+ }
+ $message .= $buf . $this->LE;
+ }
- return $message;
- }
-
- /**
+ return $message;
+ }
+
+ /**
* Finds last character boundary prior to maxLength in a utf-8
* quoted (printable) encoded string.
* Original written by Colin Brown.
@@ -826,70 +1045,72 @@
/**
- * Set the body wrapping.
+ * Set the body wrapping.
* @access public
- * @return void
- */
+ * @return void
+ */
public function SetWordWrap() {
if($this->WordWrap < 1) {
- return;
+ return;
}
-
+
switch($this->message_type) {
case 'alt':
- /* fall through */
case 'alt_attachments':
- $this->AltBody = $this->WrapText($this->AltBody,
$this->WordWrap);
- break;
- default:
- $this->Body = $this->WrapText($this->Body, $this->WordWrap);
- break;
- }
+ $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
+ break;
+ default:
+ $this->Body = $this->WrapText($this->Body, $this->WordWrap);
+ break;
}
+ }
- /**
- * Assembles message header.
+ /**
+ * Assembles message header.
* @access public
- * @return string
- */
+ * @return string The assembled header
+ */
public function CreateHeader() {
$result = '';
-
- /* Set the boundaries */
- $uniq_id = md5(uniqid(time()));
+
+ // Set the boundaries
+ $uniq_id = md5(uniqid(time()));
$this->boundary[1] = 'b1_' . $uniq_id;
$this->boundary[2] = 'b2_' . $uniq_id;
- $result .= $this->HeaderLine('Date', $this->RFCDate());
+ $result .= $this->HeaderLine('Date', self::RFCDate());
if($this->Sender == '') {
$result .= $this->HeaderLine('Return-Path', trim($this->From));
} else {
$result .= $this->HeaderLine('Return-Path', trim($this->Sender));
}
- /* To be created automatically by mail() */
+ // To be created automatically by mail()
if($this->Mailer != 'mail') {
- if(count($this->to) > 0) {
- $result .= $this->AddrAppend('To', $this->to);
- } elseif (count($this->cc) == 0) {
- $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
+ if ($this->SingleTo === true) {
+ foreach($this->to as $t) {
+ $this->SingleToArray[] = $this->AddrFormat($t);
+ }
+ } else {
+ if(count($this->to) > 0) {
+ $result .= $this->AddrAppend('To', $this->to);
+ } elseif (count($this->cc) == 0) {
+ $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
+ }
}
- if(count($this->cc) > 0) {
- $result .= $this->AddrAppend('Cc', $this->cc);
- }
- }
+ }
- $from = array();
- $from[0][0] = trim($this->From);
- $from[0][1] = $this->FromName;
+ $from = array();
+ $from[0][0] = trim($this->From);
+ $from[0][1] = $this->FromName;
$result .= $this->AddrAppend('From', $from);
- /* sendmail and mail() extract Cc from the header before sending */
- if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) &&
(count($this->cc) > 0)) {
+ // sendmail and mail() extract Cc from the header before sending
+ if(count($this->cc) > 0) {
$result .= $this->AddrAppend('Cc', $this->cc);
}
- /* sendmail and mail() extract Bcc from the header before sending */
+ // sendmail and mail() extract Bcc from the header before sending
if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) &&
(count($this->bcc) > 0)) {
$result .= $this->AddrAppend('Bcc', $this->bcc);
}
@@ -898,7 +1119,7 @@
$result .= $this->AddrAppend('Reply-to', $this->ReplyTo);
}
- /* mail() sets the subject itself */
+ // mail() sets the subject itself
if($this->Mailer != 'mail') {
$result .= $this->HeaderLine('Subject',
$this->EncodeHeader($this->SecureHeader($this->Subject)));
}
@@ -906,16 +1127,16 @@
if($this->MessageID != '') {
$result .= $this->HeaderLine('Message-ID',$this->MessageID);
} else {
- $result .= sprintf("Message-ID: <address@hidden>%s", $uniq_id,
$this->ServerHostname(), $this->LE);
+ $result .= sprintf("Message-ID: <address@hidden>%s", $uniq_id,
$this->ServerHostname(), $this->LE);
}
$result .= $this->HeaderLine('X-Priority', $this->Priority);
- $result .= $this->HeaderLine('X-Mailer', 'PHPMailer
(phpmailer.codeworxtech.com) [version ' . $this->Version . ']');
-
+ $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.'
(phpmailer.sourceforge.net)');
+
if($this->ConfirmReadingTo != '') {
$result .= $this->HeaderLine('Disposition-Notification-To', '<' .
trim($this->ConfirmReadingTo) . '>');
- }
+ }
- // Add custom headers
+ // Add custom headers
for($index = 0; $index < count($this->CustomHeader); $index++) {
$result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]),
$this->EncodeHeader(trim($this->CustomHeader[$index][1])));
}
@@ -940,105 +1161,106 @@
$result .= sprintf("Content-Type: %s; charset=\"%s\"",
$this->ContentType, $this->CharSet);
break;
case 'attachments':
- /* fall through */
case 'alt_attachments':
if($this->InlineImageExists()){
$result .= sprintf("Content-Type:
%s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related',
$this->LE, $this->LE, $this->boundary[1], $this->LE);
} else {
$result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
- $result .= $this->TextLine("\tboundary=\"" .
$this->boundary[1] . '"');
- }
- break;
+ $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] .
'"');
+ }
+ break;
case 'alt':
$result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
- $result .= $this->TextLine("\tboundary=\"" .
$this->boundary[1] . '"');
- break;
- }
+ $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+ break;
+ }
if($this->Mailer != 'mail') {
- $result .= $this->LE.$this->LE;
+ $result .= $this->LE.$this->LE;
}
- return $result;
- }
+ return $result;
+ }
- /**
- * Assembles the message body. Returns an empty string on failure.
+ /**
+ * Assembles the message body. Returns an empty string on failure.
* @access public
- * @return string
- */
+ * @return string The assembled message body
+ */
public function CreateBody() {
- $result = '';
+ $body = '';
if ($this->sign_key_file) {
- $result .= $this->GetMailMIME();
+ $body .= $this->GetMailMIME();
}
- $this->SetWordWrap();
+ $this->SetWordWrap();
switch($this->message_type) {
case 'alt':
- $result .= $this->GetBoundary($this->boundary[1], '', 'text/plain',
'');
- $result .= $this->EncodeString($this->AltBody,
$this->Encoding);
- $result .= $this->LE.$this->LE;
- $result .= $this->GetBoundary($this->boundary[1], '', 'text/html', '');
- $result .= $this->EncodeString($this->Body, $this->Encoding);
- $result .= $this->LE.$this->LE;
- $result .= $this->EndBoundary($this->boundary[1]);
- break;
+ $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
+ $body .= $this->EncodeString($this->AltBody, $this->Encoding);
+ $body .= $this->LE.$this->LE;
+ $body .= $this->GetBoundary($this->boundary[1], '', 'text/html', '');
+ $body .= $this->EncodeString($this->Body, $this->Encoding);
+ $body .= $this->LE.$this->LE;
+ $body .= $this->EndBoundary($this->boundary[1]);
+ break;
case 'plain':
- $result .= $this->EncodeString($this->Body, $this->Encoding);
- break;
+ $body .= $this->EncodeString($this->Body, $this->Encoding);
+ break;
case 'attachments':
- $result .= $this->GetBoundary($this->boundary[1], '', '', '');
- $result .= $this->EncodeString($this->Body, $this->Encoding);
- $result .= $this->LE;
- $result .= $this->AttachAll();
- break;
+ $body .= $this->GetBoundary($this->boundary[1], '', '', '');
+ $body .= $this->EncodeString($this->Body, $this->Encoding);
+ $body .= $this->LE;
+ $body .= $this->AttachAll();
+ break;
case 'alt_attachments':
- $result .= sprintf("--%s%s", $this->boundary[1], $this->LE);
- $result .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s",
'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
- $result .= $this->GetBoundary($this->boundary[2], '', 'text/plain',
'') . $this->LE; // Create text body
- $result .= $this->EncodeString($this->AltBody,
$this->Encoding);
- $result .= $this->LE.$this->LE;
- $result .= $this->GetBoundary($this->boundary[2], '', 'text/html', '')
. $this->LE; // Create the HTML body
- $result .= $this->EncodeString($this->Body, $this->Encoding);
- $result .= $this->LE.$this->LE;
- $result .= $this->EndBoundary($this->boundary[2]);
- $result .= $this->AttachAll();
- break;
+ $body .= sprintf("--%s%s", $this->boundary[1], $this->LE);
+ $body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s",
'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
+ $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '')
. $this->LE; // Create text body
+ $body .= $this->EncodeString($this->AltBody, $this->Encoding);
+ $body .= $this->LE.$this->LE;
+ $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') .
$this->LE; // Create the HTML body
+ $body .= $this->EncodeString($this->Body, $this->Encoding);
+ $body .= $this->LE.$this->LE;
+ $body .= $this->EndBoundary($this->boundary[2]);
+ $body .= $this->AttachAll();
+ break;
+ }
+
+ if ($this->IsError()) {
+ $body = '';
+ } elseif ($this->sign_key_file) {
+ try {
+ $file = tempnam('', 'mail');
+ file_put_contents($file, $body); //TODO check this worked
+ $signed = tempnam("", "signed");
+ if (@openssl_pkcs7_sign($file, $signed,
"file://".$this->sign_cert_file, array("file://".$this->sign_key_file,
$this->sign_key_pass), NULL)) {
+ @unlink($file);
+ @unlink($signed);
+ $body = file_get_contents($signed);
+ } else {
+ @unlink($file);
+ @unlink($signed);
+ throw new
phpmailerException($this->Lang("signing").openssl_error_string());
}
-
- if($this->IsError()) {
- $result = '';
- } else if ($this->sign_key_file) {
- $file = tempnam("", "mail");
- $fp = fopen($file, "w");
- fwrite($fp, $result);
- fclose($fp);
- $signed = tempnam("", "signed");
-
- if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_key_file,
array("file://".$this->sign_key_file, $this->sign_key_pass), null)) {
- $fp = fopen($signed, "r");
- $result = fread($fp, filesize($this->sign_key_file));
- fclose($fp);
- } else {
- $this->SetError($this->Lang("signing").openssl_error_string());
- $result = '';
+ } catch (phpmailerException $e) {
+ $body = '';
+ if ($this->exceptions) {
+ throw $e;
+ }
}
-
- unlink($file);
- unlink($signed);
}
- return $result;
- }
+ return $body;
+ }
- /**
- * Returns the start of a message boundary.
- * @access public
- */
- public function GetBoundary($boundary, $charSet, $contentType, $encoding) {
+ /**
+ * Returns the start of a message boundary.
+ * @access private
+ */
+ private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
$result = '';
if($charSet == '') {
$charSet = $this->CharSet;
@@ -1051,27 +1273,27 @@
}
$result .= $this->TextLine('--' . $boundary);
$result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType,
$charSet);
- $result .= $this->LE;
+ $result .= $this->LE;
$result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
- $result .= $this->LE;
-
- return $result;
- }
-
- /**
- * Returns the end of a message boundary.
- * @access public
- */
- public function EndBoundary($boundary) {
+ $result .= $this->LE;
+
+ return $result;
+ }
+
+ /**
+ * Returns the end of a message boundary.
+ * @access private
+ */
+ private function EndBoundary($boundary) {
return $this->LE . '--' . $boundary . '--' . $this->LE;
- }
-
- /**
- * Sets the message type.
- * @access public
- * @return void
- */
- public function SetMessageType() {
+ }
+
+ /**
+ * Sets the message type.
+ * @access private
+ * @return void
+ */
+ private function SetMessageType() {
if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
$this->message_type = 'plain';
} else {
@@ -1084,243 +1306,275 @@
if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
$this->message_type = 'alt_attachments';
}
- }
}
+ }
- /* Returns a formatted header line.
+ /**
+ * Returns a formatted header line.
* @access public
- * @return string
- */
+ * @return string
+ */
public function HeaderLine($name, $value) {
return $name . ': ' . $value . $this->LE;
- }
+ }
- /**
- * Returns a formatted mail line.
+ /**
+ * Returns a formatted mail line.
* @access public
- * @return string
- */
+ * @return string
+ */
public function TextLine($value) {
- return $value . $this->LE;
- }
+ return $value . $this->LE;
+ }
- /////////////////////////////////////////////////
+ /////////////////////////////////////////////////
// CLASS METHODS, ATTACHMENTS
- /////////////////////////////////////////////////
+ /////////////////////////////////////////////////
- /**
- * Adds an attachment from a path on the filesystem.
- * Returns false if the file could not be found
- * or accessed.
- * @param string $path Path to the attachment.
- * @param string $name Overrides the attachment name.
- * @param string $encoding File encoding (see $Encoding).
- * @param string $type File extension (MIME) type.
- * @return bool
- */
+ /**
+ * Adds an attachment from a path on the filesystem.
+ * Returns false if the file could not be found
+ * or accessed.
+ * @param string $path Path to the attachment.
+ * @param string $name Overrides the attachment name.
+ * @param string $encoding File encoding (see $Encoding).
+ * @param string $type File extension (MIME) type.
+ * @return bool
+ */
public function AddAttachment($path, $name = '', $encoding = 'base64', $type
= 'application/octet-stream') {
- if(address@hidden($path)) {
- $this->SetError($this->Lang('file_access') . $path);
- return false;
- }
+ try {
+ if ( address@hidden($path) ) {
+ throw new phpmailerException($this->Lang('file_access') . $path,
self::STOP_CONTINUE);
+ }
+ $filename = basename($path);
+ if ( $name == '' ) {
+ $name = $filename;
+ }
- $filename = basename($path);
- if($name == '') {
- $name = $filename;
+ $this->attachment[] = array(
+ 0 => $path,
+ 1 => $filename,
+ 2 => $name,
+ 3 => $encoding,
+ 4 => $type,
+ 5 => false, // isStringAttachment
+ 6 => 'attachment',
+ 7 => 0
+ );
+
+ } catch (phpmailerException $e) {
+ $this->SetError($e->getMessage());
+ if ($this->exceptions) {
+ throw $e;
+ }
+ echo $e->getMessage()."\n";
+ if ( $e->getCode() == self::STOP_CRITICAL ) {
+ return false;
+ }
}
+ return true;
+ }
- $cur = count($this->attachment);
- $this->attachment[$cur][0] = $path;
- $this->attachment[$cur][1] = $filename;
- $this->attachment[$cur][2] = $name;
- $this->attachment[$cur][3] = $encoding;
- $this->attachment[$cur][4] = $type;
- $this->attachment[$cur][5] = false; // isStringAttachment
- $this->attachment[$cur][6] = 'attachment';
- $this->attachment[$cur][7] = 0;
+ /**
+ * Return the current array of attachments
+ * @return array
+ */
+ public function GetAttachments() {
+ return $this->attachment;
+ }
- return true;
- }
+ /**
+ * Attaches all fs, string, and binary attachments to the message.
+ * Returns an empty string on failure.
+ * @access private
+ * @return string
+ */
+ private function AttachAll() {
+ // Return text of body
+ $mime = array();
+ $cidUniq = array();
+ $incl = array();
- /**
- * Attaches all fs, string, and binary attachments to the message.
- * Returns an empty string on failure.
- * @access public
- * @return string
- */
- public function AttachAll() {
- /* Return text of body */
- $mime = array();
-
- /* Add all attachments */
- for($i = 0; $i < count($this->attachment); $i++) {
- /* Check for string attachment */
- $bString = $this->attachment[$i][5];
+ // Add all attachments
+ foreach ($this->attachment as $attachment) {
+ // Check for string attachment
+ $bString = $attachment[5];
if ($bString) {
- $string = $this->attachment[$i][0];
+ $string = $attachment[0];
} else {
- $path = $this->attachment[$i][0];
+ $path = $attachment[0];
}
- $filename = $this->attachment[$i][1];
- $name = $this->attachment[$i][2];
- $encoding = $this->attachment[$i][3];
- $type = $this->attachment[$i][4];
- $disposition = $this->attachment[$i][6];
- $cid = $this->attachment[$i][7];
-
- $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
- //$mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $name,
$this->LE);
+ if (in_array($attachment[0], $incl)) { continue; }
+ $filename = $attachment[1];
+ $name = $attachment[2];
+ $encoding = $attachment[3];
+ $type = $attachment[4];
+ $disposition = $attachment[6];
+ $cid = $attachment[7];
+ $incl[] = $attachment[0];
+ if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
+ $cidUniq[$cid] = true;
+
+ $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
$mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type,
$this->EncodeHeader($this->SecureHeader($name)), $this->LE);
- $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding,
$this->LE);
+ $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, $name, $this->LE.$this->LE);
$mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s",
$disposition, $this->EncodeHeader($this->SecureHeader($name)),
$this->LE.$this->LE);
- /* Encode as string attachment */
+ // Encode as string attachment
if($bString) {
- $mime[] = $this->EncodeString($string, $encoding);
+ $mime[] = $this->EncodeString($string, $encoding);
if($this->IsError()) {
return '';
- }
+ }
$mime[] = $this->LE.$this->LE;
} else {
- $mime[] = $this->EncodeFile($path, $encoding);
+ $mime[] = $this->EncodeFile($path, $encoding);
if($this->IsError()) {
return '';
}
- $mime[] = $this->LE.$this->LE;
- }
- }
+ $mime[] = $this->LE.$this->LE;
+ }
+ }
- $mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE);
+ $mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE);
return join('', $mime);
- }
-
- /**
- * Encodes attachment in requested format. Returns an
- * empty string on failure.
- * @access public
- * @return string
- */
- public function EncodeFile ($path, $encoding = 'base64') {
- if(address@hidden = fopen($path, 'rb')) {
- $this->SetError($this->Lang('file_open') . $path);
- return '';
- }
- if (function_exists('get_magic_quotes')) {
+ }
+
+ /**
+ * Encodes attachment in requested format.
+ * Returns an empty string on failure.
+ * @param string $path The full path to the file
+ * @param string $encoding The encoding to use; one of 'base64', '7bit',
'8bit', 'binary', 'quoted-printable'
+ * @see EncodeFile()
+ * @access private
+ * @return string
+ */
+ private function EncodeFile($path, $encoding = 'base64') {
+ try {
+ if (!is_readable($path)) {
+ throw new phpmailerException($this->Lang('file_open') . $path,
self::STOP_CONTINUE);
+ }
+ if (function_exists('get_magic_quotes')) {
function get_magic_quotes() {
- return false;
+ return false;
}
-}
- if (PHP_VERSION < 6) {
+ }
+ 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);
+ if (PHP_VERSION < 6) { set_magic_quotes_runtime($magic_quotes); }
+ return $file_buffer;
+ } catch (Exception $e) {
+ $this->SetError($e->getMessage());
+ return '';
}
- $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;
- }
+ }
- /**
- * Encodes string to requested format. Returns an
- * empty string on failure.
+ /**
+ * Encodes string to requested format.
+ * Returns an empty string on failure.
+ * @param string $str The text to encode
+ * @param string $encoding The encoding to use; one of 'base64', '7bit',
'8bit', 'binary', 'quoted-printable'
* @access public
- * @return string
- */
+ * @return string
+ */
public function EncodeString ($str, $encoding = 'base64') {
$encoded = '';
- switch(strtolower($encoding)) {
+ switch(strtolower($encoding)) {
case 'base64':
- $encoded = chunk_split(base64_encode($str), 76, $this->LE);
- break;
+ $encoded = chunk_split(base64_encode($str), 76, $this->LE);
+ break;
case '7bit':
case '8bit':
- $encoded = $this->FixEOL($str);
- if (substr($encoded, -(strlen($this->LE))) != $this->LE)
- $encoded .= $this->LE;
- break;
+ $encoded = $this->FixEOL($str);
+ //Make sure it ends with a line break
+ if (substr($encoded, -(strlen($this->LE))) != $this->LE)
+ $encoded .= $this->LE;
+ break;
case 'binary':
- $encoded = $str;
- break;
+ $encoded = $str;
+ break;
case 'quoted-printable':
- $encoded = $this->EncodeQP($str);
- break;
- default:
+ $encoded = $this->EncodeQP($str);
+ break;
+ default:
$this->SetError($this->Lang('encoding') . $encoding);
- break;
- }
- return $encoded;
+ break;
}
+ return $encoded;
+ }
- /**
- * Encode a header string to best of Q, B, quoted or none.
+ /**
+ * Encode a header string to best (shortest) of Q, B, quoted or none.
* @access public
- * @return string
- */
- public function EncodeHeader ($str, $position = 'text') {
- $x = 0;
-
- switch (strtolower($position)) {
- case 'phrase':
- if (!preg_match('/[\200-\377]/', $str)) {
- /* Can't use addslashes as we don't know what value has
magic_quotes_sybase. */
- $encoded = addcslashes($str, "\0..\37\177\\\"");
+ * @return string
+ */
+ public function EncodeHeader($str, $position = 'text') {
+ $x = 0;
+
+ switch (strtolower($position)) {
+ case 'phrase':
+ if (!preg_match('/[\200-\377]/', $str)) {
+ // Can't use addslashes as we don't know what value has
magic_quotes_sybase
+ $encoded = addcslashes($str, "\0..\37\177\\\"");
if (($str == $encoded) &&
!preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
- return ($encoded);
+ return ($encoded);
} else {
- return ("\"$encoded\"");
+ return ("\"$encoded\"");
}
}
- $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str,
$matches);
- break;
- case 'comment':
- $x = preg_match_all('/[()"]/', $str, $matches);
- /* Fall-through */
- case 'text':
- default:
- $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/',
$str, $matches);
- break;
- }
+ $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
+ break;
+ case 'comment':
+ $x = preg_match_all('/[()"]/', $str, $matches);
+ // Fall-through
+ case 'text':
+ default:
+ $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str,
$matches);
+ break;
+ }
if ($x == 0) {
- return ($str);
+ return ($str);
}
- $maxlen = 75 - 7 - strlen($this->CharSet);
- /* Try to select the encoding which should produce the shortest output */
- if (strlen($str)/3 < $x) {
- $encoding = 'B';
+ $maxlen = 75 - 7 - strlen($this->CharSet);
+ // Try to select the encoding which should produce the shortest output
+ if (strlen($str)/3 < $x) {
+ $encoding = 'B';
if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
- // Use a custom function which correctly encodes and wraps long
- // multibyte strings without breaking lines within a character
+ // Use a custom function which correctly encodes and wraps long
+ // multibyte strings without breaking lines within a character
$encoded = $this->Base64EncodeWrapMB($str);
} else {
$encoded = base64_encode($str);
$maxlen -= $maxlen % 4;
$encoded = trim(chunk_split($encoded, $maxlen, "\n"));
}
- } else {
- $encoding = 'Q';
- $encoded = $this->EncodeQ($str, $position);
- $encoded = $this->WrapText($encoded, $maxlen, true);
+ } else {
+ $encoding = 'Q';
+ $encoded = $this->EncodeQ($str, $position);
+ $encoded = $this->WrapText($encoded, $maxlen, true);
$encoded = str_replace('='.$this->LE, "\n", trim($encoded));
- }
+ }
- $encoded = preg_replace('/^(.*)$/m', "
=?".$this->CharSet."?$encoding?\\1?=", $encoded);
- $encoded = trim(str_replace("\n", $this->LE, $encoded));
-
- return $encoded;
- }
-
- /**
+ $encoded = preg_replace('/^(.*)$/m', "
=?".$this->CharSet."?$encoding?\\1?=", $encoded);
+ $encoded = trim(str_replace("\n", $this->LE, $encoded));
+
+ return $encoded;
+ }
+
+ /**
* Checks if a string contains multibyte characters.
* @access public
* @param string $str multi-byte text to wrap encode
@@ -1330,7 +1584,7 @@
if (function_exists('mb_strlen')) {
return (strlen($str) > mb_strlen($str, $this->CharSet));
} else { // Assume no multibytes (we can't handle without mbstring
functions anyway)
- return False;
+ return false;
}
}
@@ -1340,8 +1594,8 @@
* Adapted from a function by paravoid at
http://uk.php.net/manual/en/function.mb-encode-mimeheader.php
* @access public
* @param string $str multi-byte text to wrap encode
- * @return string
- */
+ * @return string
+ */
public function Base64EncodeWrapMB($str) {
$start = "=?".$this->CharSet."?B?";
$end = "?=";
@@ -1371,17 +1625,18 @@
// Chomp the last linefeed
$encoded = substr($encoded, 0, -strlen($this->LE));
- return $encoded;
- }
+ return $encoded;
+ }
- /**
+ /**
* Encode string to quoted-printable.
+ * Only uses standard PHP, slow, but will always work
* @access public
* @param string $string the text to encode
* @param integer $line_max Number of chars allowed on a line before wrapping
* @return string
*/
- public function EncodeQP( $input = '', $line_max = 76, $space_conv = false )
{
+ public function EncodeQPphp( $input = '', $line_max = 76, $space_conv =
false) {
$hex =
array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
$lines = preg_split('/(?:\r\n|\r|\n)/', $input);
$eol = "\r\n";
@@ -1419,271 +1674,323 @@
} // end of for
$output .= $newline.$eol;
} // end of while
- return trim($output);
+ return $output;
}
/**
- * Encode string to q encoding.
+ * Encode string to RFC2045 (6.7) quoted-printable format
+ * Uses a PHP5 stream filter to do the encoding about 64x faster than the old
version
+ * Also results in same content as you started with after decoding
+ * @see EncodeQPphp()
+ * @access public
+ * @param string $string the text to encode
+ * @param integer $line_max Number of chars allowed on a line before wrapping
+ * @param boolean $space_conv Dummy param for compatibility with existing
EncodeQP function
+ * @return string
+ * @author Marcus Bointon
+ */
+ public function EncodeQP($string, $line_max = 76, $space_conv = false) {
+ if (function_exists('quoted_printable_encode')) { //Use native function if
it's available (>= PHP5.3)
+ return quoted_printable_encode($string);
+ }
+ $filters = stream_get_filters();
+ if (!in_array('convert.*', $filters)) { //Got convert stream filter?
+ return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back
to old implementation
+ }
+ $fp = fopen('php://temp/', 'r+');
+ $string = preg_replace('/\r\n?/', $this->LE, $string); //Normalise line
breaks
+ $params = array('line-length' => $line_max, 'line-break-chars' =>
$this->LE);
+ $s = stream_filter_append($fp, 'convert.quoted-printable-encode',
STREAM_FILTER_READ, $params);
+ fputs($fp, $string);
+ rewind($fp);
+ $out = stream_get_contents($fp);
+ stream_filter_remove($s);
+ $out = preg_replace('/^\./m', '=2E', $out); //Encode . if it is first char
on a line, workaround for bug in Exchange
+ fclose($fp);
+ return $out;
+ }
+
+ /**
+ * Encode string to q encoding.
+ * @link http://tools.ietf.org/html/rfc2047
+ * @param string $str the text to encode
+ * @param string $position Where the text is going to be used, see the RFC
for what that means
* @access public
- * @return string
- */
+ * @return string
+ */
public function EncodeQ ($str, $position = 'text') {
- /* There should not be any EOL in the string */
- $encoded = preg_replace("[\r\n]", '', $str);
+ // There should not be any EOL in the string
+ $encoded = preg_replace('/[\r\n]*/', '', $str);
- switch (strtolower($position)) {
+ switch (strtolower($position)) {
case 'phrase':
- $encoded = preg_replace("/([^A-Za-z0-9!*+\/ -])/e",
"'='.sprintf('%02X', ord('\\1'))", $encoded);
- break;
+ $encoded = preg_replace("/([^A-Za-z0-9!*+\/ -])/e",
"'='.sprintf('%02X', ord('\\1'))", $encoded);
+ break;
case 'comment':
- $encoded = preg_replace("/([\(\)\"])/e", "'='.sprintf('%02X',
ord('\\1'))", $encoded);
+ $encoded = preg_replace("/([\(\)\"])/e", "'='.sprintf('%02X',
ord('\\1'))", $encoded);
case 'text':
- default:
- /* Replace every high ascii, control =, ? and _ characters */
- $encoded =
preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
- "'='.sprintf('%02X', ord('\\1'))", $encoded);
- break;
- }
-
- /* Replace every spaces to _ (more readable than =20) */
+ default:
+ // Replace every high ascii, control =, ? and _ characters
+ //TODO using /e (equivalent to eval()) is probably not a good idea
+ $encoded =
preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
+ "'='.sprintf('%02X', ord('\\1'))", $encoded);
+ break;
+ }
+
+ // Replace every spaces to _ (more readable than =20)
$encoded = str_replace(' ', '_', $encoded);
- return $encoded;
- }
+ return $encoded;
+ }
- /**
- * Adds a string or binary attachment (non-filesystem) to the list.
- * This method can be used to attach ascii or binary data,
- * such as a BLOB record from a database.
- * @param string $string String attachment data.
- * @param string $filename Name of the attachment.
- * @param string $encoding File encoding (see $Encoding).
- * @param string $type File extension (MIME) type.
- * @return void
- */
+ /**
+ * Adds a string or binary attachment (non-filesystem) to the list.
+ * This method can be used to attach ascii or binary data,
+ * such as a BLOB record from a database.
+ * @param string $string String attachment data.
+ * @param string $filename Name of the attachment.
+ * @param string $encoding File encoding (see $Encoding).
+ * @param string $type File extension (MIME) type.
+ * @return void
+ */
public function AddStringAttachment($string, $filename, $encoding =
'base64', $type = 'application/octet-stream') {
- /* Append to $attachment array */
- $cur = count($this->attachment);
- $this->attachment[$cur][0] = $string;
- $this->attachment[$cur][1] = $filename;
- $this->attachment[$cur][2] = $filename;
- $this->attachment[$cur][3] = $encoding;
- $this->attachment[$cur][4] = $type;
- $this->attachment[$cur][5] = true; // isString
- $this->attachment[$cur][6] = 'attachment';
- $this->attachment[$cur][7] = 0;
- }
-
- /**
- * Adds an embedded attachment. This can include images, sounds, and
- * just about any other document. Make sure to set the $type to an
- * image type. For JPEG images use "image/jpeg" and for GIF images
- * use "image/gif".
- * @param string $path Path to the attachment.
- * @param string $cid Content ID of the attachment. Use this to identify
- * the Id for accessing the image in an HTML form.
- * @param string $name Overrides the attachment name.
- * @param string $encoding File encoding (see $Encoding).
- * @param string $type File extension (MIME) type.
- * @return bool
- */
+ // Append to $attachment array
+ $this->attachment[] = array(
+ 0 => $string,
+ 1 => $filename,
+ 2 => basename($filename),
+ 3 => $encoding,
+ 4 => $type,
+ 5 => true, // isStringAttachment
+ 6 => 'attachment',
+ 7 => 0
+ );
+ }
+
+ /**
+ * Adds an embedded attachment. This can include images, sounds, and
+ * just about any other document. Make sure to set the $type to an
+ * image type. For JPEG images use "image/jpeg" and for GIF images
+ * use "image/gif".
+ * @param string $path Path to the attachment.
+ * @param string $cid Content ID of the attachment. Use this to identify
+ * the Id for accessing the image in an HTML form.
+ * @param string $name Overrides the attachment name.
+ * @param string $encoding File encoding (see $Encoding).
+ * @param string $type File extension (MIME) type.
+ * @return bool
+ */
public function AddEmbeddedImage($path, $cid, $name = '', $encoding =
'base64', $type = 'application/octet-stream') {
-
- if(address@hidden($path)) {
+
+ if ( address@hidden($path) ) {
$this->SetError($this->Lang('file_access') . $path);
- return false;
- }
+ return false;
+ }
- $filename = basename($path);
- if($name == '') {
- $name = $filename;
+ $filename = basename($path);
+ if ( $name == '' ) {
+ $name = $filename;
}
- /* Append to $attachment array */
- $cur = count($this->attachment);
- $this->attachment[$cur][0] = $path;
- $this->attachment[$cur][1] = $filename;
- $this->attachment[$cur][2] = $name;
- $this->attachment[$cur][3] = $encoding;
- $this->attachment[$cur][4] = $type;
- $this->attachment[$cur][5] = false;
- $this->attachment[$cur][6] = 'inline';
- $this->attachment[$cur][7] = $cid;
-
- return true;
- }
-
- /**
- * Returns true if an inline attachment is present.
+ // Append to $attachment array
+ $this->attachment[] = array(
+ 0 => $path,
+ 1 => $filename,
+ 2 => $name,
+ 3 => $encoding,
+ 4 => $type,
+ 5 => false, // isStringAttachment
+ 6 => 'inline',
+ 7 => $cid
+ );
+
+ return true;
+ }
+
+ /**
+ * Returns true if an inline attachment is present.
* @access public
- * @return bool
- */
+ * @return bool
+ */
public function InlineImageExists() {
- $result = false;
- for($i = 0; $i < count($this->attachment); $i++) {
- if($this->attachment[$i][6] == 'inline') {
- $result = true;
- break;
- }
- }
-
- return $result;
+ foreach($this->attachment as $attachment) {
+ if ($attachment[6] == 'inline') {
+ return true;
+ }
}
+ return false;
+ }
- /////////////////////////////////////////////////
+ /////////////////////////////////////////////////
// CLASS METHODS, MESSAGE RESET
- /////////////////////////////////////////////////
+ /////////////////////////////////////////////////
- /**
- * Clears all recipients assigned in the TO array. Returns void.
- * @return void
- */
+ /**
+ * Clears all recipients assigned in the TO array. Returns void.
+ * @return void
+ */
public function ClearAddresses() {
- $this->to = array();
+ foreach($this->to as $to) {
+ unset($this->all_recipients[strtolower($to[0])]);
}
+ $this->to = array();
+ }
- /**
- * Clears all recipients assigned in the CC array. Returns void.
- * @return void
- */
+ /**
+ * Clears all recipients assigned in the CC array. Returns void.
+ * @return void
+ */
public function ClearCCs() {
- $this->cc = array();
+ foreach($this->cc as $cc) {
+ unset($this->all_recipients[strtolower($cc[0])]);
}
+ $this->cc = array();
+ }
- /**
- * Clears all recipients assigned in the BCC array. Returns void.
- * @return void
- */
+ /**
+ * Clears all recipients assigned in the BCC array. Returns void.
+ * @return void
+ */
public function ClearBCCs() {
- $this->bcc = array();
+ foreach($this->bcc as $bcc) {
+ unset($this->all_recipients[strtolower($bcc[0])]);
}
+ $this->bcc = array();
+ }
- /**
- * Clears all recipients assigned in the ReplyTo array. Returns void.
- * @return void
- */
+ /**
+ * Clears all recipients assigned in the ReplyTo array. Returns void.
+ * @return void
+ */
public function ClearReplyTos() {
- $this->ReplyTo = array();
- }
+ $this->ReplyTo = array();
+ }
- /**
- * Clears all recipients assigned in the TO, CC and BCC
- * array. Returns void.
- * @return void
- */
+ /**
+ * Clears all recipients assigned in the TO, CC and BCC
+ * array. Returns void.
+ * @return void
+ */
public function ClearAllRecipients() {
- $this->to = array();
- $this->cc = array();
- $this->bcc = array();
- }
+ $this->to = array();
+ $this->cc = array();
+ $this->bcc = array();
+ $this->all_recipients = array();
+ }
- /**
- * Clears all previously set filesystem, string, and binary
- * attachments. Returns void.
- * @return void
- */
+ /**
+ * Clears all previously set filesystem, string, and binary
+ * attachments. Returns void.
+ * @return void
+ */
public function ClearAttachments() {
- $this->attachment = array();
- }
+ $this->attachment = array();
+ }
- /**
- * Clears all custom headers. Returns void.
- * @return void
- */
+ /**
+ * Clears all custom headers. Returns void.
+ * @return void
+ */
public function ClearCustomHeaders() {
- $this->CustomHeader = array();
- }
+ $this->CustomHeader = array();
+ }
- /////////////////////////////////////////////////
+ /////////////////////////////////////////////////
// CLASS METHODS, MISCELLANEOUS
- /////////////////////////////////////////////////
+ /////////////////////////////////////////////////
- /**
- * Adds the error message to the error container.
- * Returns void.
- * @access private
- * @return void
- */
- private function SetError($msg) {
- $this->error_count++;
- $this->ErrorInfo = $msg;
+ /**
+ * Adds the error message to the error container.
+ * @access protected
+ * @return void
+ */
+ protected function SetError($msg) {
+ $this->error_count++;
+ if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
+ $lasterror = $this->smtp->getError();
+ if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
+ $msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] .
"</p>\n";
+ }
}
+ $this->ErrorInfo = $msg;
+ }
- /**
- * Returns the proper RFC 822 formatted date.
- * @access private
- * @return string
- */
- private static function RFCDate() {
+ /**
+ * Returns the proper RFC 822 formatted date.
+ * @access public
+ * @return string
+ * @static
+ */
+ public static function RFCDate() {
$tz = date('Z');
$tzs = ($tz < 0) ? '-' : '+';
- $tz = abs($tz);
+ $tz = abs($tz);
$tz = (int)($tz/3600)*100 + ($tz%3600)/60;
$result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
- return $result;
- }
-
- /**
- * Returns the server hostname or 'localhost.localdomain' if unknown.
- * @access private
- * @return string
- */
+ return $result;
+ }
+
+ /**
+ * Returns the server hostname or 'localhost.localdomain' if unknown.
+ * @access private
+ * @return string
+ */
private function ServerHostname() {
if (!empty($this->Hostname)) {
- $result = $this->Hostname;
+ $result = $this->Hostname;
} elseif (isset($_SERVER['SERVER_NAME'])) {
$result = $_SERVER['SERVER_NAME'];
} else {
- $result = "localhost.localdomain";
+ $result = 'localhost.localdomain';
}
- return $result;
- }
+ return $result;
+ }
- /**
- * Returns a message in the appropriate language.
- * @access private
- * @return string
- */
+ /**
+ * Returns a message in the appropriate language.
+ * @access private
+ * @return string
+ */
private function Lang($key) {
if(count($this->language) < 1) {
$this->SetLanguage('en'); // set the default language
}
-
+
if(isset($this->language[$key])) {
- return $this->language[$key];
+ return $this->language[$key];
} else {
return 'Language string failed to load: ' . $key;
}
- }
-
- /**
- * Returns true if an error occurred.
+ }
+
+ /**
+ * Returns true if an error occurred.
* @access public
- * @return bool
- */
+ * @return bool
+ */
public function IsError() {
- return ($this->error_count > 0);
- }
+ return ($this->error_count > 0);
+ }
- /**
- * Changes every end of line from CR or LF to CRLF.
- * @access private
- * @return string
- */
+ /**
+ * Changes every end of line from CR or LF to CRLF.
+ * @access private
+ * @return string
+ */
private function FixEOL($str) {
- $str = str_replace("\r\n", "\n", $str);
- $str = str_replace("\r", "\n", $str);
- $str = str_replace("\n", $this->LE, $str);
- return $str;
- }
+ $str = str_replace("\r\n", "\n", $str);
+ $str = str_replace("\r", "\n", $str);
+ $str = str_replace("\n", $this->LE, $str);
+ return $str;
+ }
- /**
- * Adds a custom header.
+ /**
+ * Adds a custom header.
* @access public
- * @return void
- */
+ * @return void
+ */
public function AddCustomHeader($custom_header) {
$this->CustomHeader[] = explode(':', $custom_header, 2);
}
@@ -1693,45 +2000,45 @@
* @access public
* @return $message
*/
- public function MsgHTML($message,$basedir='') {
+ public function MsgHTML($message, $basedir = '') {
preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images);
if(isset($images[2])) {
foreach($images[2] as $i => $url) {
// do not change urls for absolute images (thanks to corvuscorax)
- if (!preg_match('/^[A-z][A-z]*:\/\//',$url)) {
+ if (!preg_match('#^[A-z]+://#',$url)) {
$filename = basename($url);
$directory = dirname($url);
($directory == '.')?$directory='':'';
$cid = 'cid:' . md5($filename);
- $fileParts = split("\.", $filename);
- $ext = $fileParts[1];
- $mimeType = $this->_mime_types($ext);
+ $ext = pathinfo($filename, PATHINFO_EXTENSION);
+ $mimeType = self::_mime_types($ext);
if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir
.= '/'; }
- if ( strlen($directory) > 1 && substr($basedir,-1) != '/') {
$directory .= '/'; }
- $this->AddEmbeddedImage($basedir.$directory.$filename,
md5($filename), $filename, 'base64', $mimeType);
+ if ( strlen($directory) > 1 && substr($directory,-1) != '/') {
$directory .= '/'; }
if ( $this->AddEmbeddedImage($basedir.$directory.$filename,
md5($filename), $filename, 'base64',$mimeType) ) {
$message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url,
'/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message);
}
}
+ }
}
- }
$this->IsHTML(true);
$this->Body = $message;
$textMsg =
trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
- if ( !empty($textMsg) && empty($this->AltBody) ) {
- $this->AltBody = $textMsg;
+ if (!empty($textMsg) && empty($this->AltBody)) {
+ $this->AltBody = html_entity_decode($textMsg);
}
- if ( empty($this->AltBody) ) {
- $this->AltBody = 'To view this email message, open the email in with
HTML compatibility!' . "\n\n";
+ if (empty($this->AltBody)) {
+ $this->AltBody = 'To view this email message, open it in a program that
understands HTML!' . "\n\n";
}
}
/**
- * Gets the mime type of the embedded or inline image
+ * Gets the MIME type of the embedded or inline image
+ * @param string File extension
* @access public
- * @return mime type of ext
+ * @return string MIME type of ext
+ * @static
*/
- public function _mime_types($ext = '') {
+ public static function _mime_types($ext = '') {
$mimes = array(
'hqx' => 'application/mac-binhex40',
'cpt' => 'application/mac-compactpro',
@@ -1821,73 +2128,193 @@
'xl' => 'application/excel',
'eml' => 'message/rfc822'
);
- return ( ! isset($mimes[strtolower($ext)])) ? 'application/octet-stream' :
$mimes[strtolower($ext)];
+ return (!isset($mimes[strtolower($ext)])) ? 'application/octet-stream' :
$mimes[strtolower($ext)];
}
/**
- * Set (or reset) Class Objects (variables)
+ * Set (or reset) Class Objects (variables)
+ *
+ * Usage Example:
+ * $page->set('X-Priority', '3');
+ *
+ * @access public
+ * @param string $name Parameter Name
+ * @param mixed $value Parameter Value
+ * NOTE: will not work with arrays, there are no arrays to set/reset
+ * @todo Should this not be using __set() magic function?
+ */
+ public function set($name, $value = '') {
+ try {
+ if (isset($this->$name) ) {
+ $this->$name = $value;
+ } else {
+ throw new phpmailerException($this->Lang('variable_set') . $name,
self::STOP_CRITICAL);
+ }
+ } catch (Exception $e) {
+ $this->SetError($e->getMessage());
+ if ($e->getCode() == self::STOP_CRITICAL) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Strips newlines to prevent header injection.
+ * @access public
+ * @param string $str String
+ * @return string
+ */
+ public function SecureHeader($str) {
+ $str = str_replace("\r", '', $str);
+ $str = str_replace("\n", '', $str);
+ return trim($str);
+ }
+
+ /**
+ * Set the private key file and password to sign the message.
*
- * Usage Example:
- * $page->set('X-Priority', '3');
+ * @access public
+ * @param string $key_filename Parameter File Name
+ * @param string $key_pass Password for private key
+ */
+ public function Sign($cert_filename, $key_filename, $key_pass) {
+ $this->sign_cert_file = $cert_filename;
+ $this->sign_key_file = $key_filename;
+ $this->sign_key_pass = $key_pass;
+ }
+
+ /**
+ * Set the private key file and password to sign the message.
*
* @access public
- * @param string $name Parameter Name
- * @param mixed $value Parameter Value
- * NOTE: will not work with arrays, there are no arrays to set/reset
+ * @param string $key_filename Parameter File Name
+ * @param string $key_pass Password for private key
*/
- public function set ( $name, $value = '' ) {
- if ( isset($this->$name) ) {
- $this->$name = $value;
- } else {
- $this->SetError('Cannot set or reset variable ' . $name);
- return false;
+ public function DKIM_QP($txt) {
+ $tmp="";
+ $line="";
+ for ($i=0;$i<strlen($txt);$i++) {
+ $ord=ord($txt[$i]);
+ if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <=
$ord) && ($ord <= 0x7E)) ) {
+ $line.=$txt[$i];
+ } else {
+ $line.="=".sprintf("%02X",$ord);
+ }
}
+ return $line;
}
/**
- * Read a file from a supplied filename and return it.
+ * Generate DKIM signature
*
* @access public
- * @param string $filename Parameter File Name
+ * @param string $s Header
*/
- public function getFile($filename) {
- $return = '';
- if ($fp = fopen($filename, 'rb')) {
- while (!feof($fp)) {
- $return .= fread($fp, 1024);
- }
- fclose($fp);
- return $return;
+ public function DKIM_Sign($s) {
+ $privKeyStr = file_get_contents($this->DKIM_private);
+ if ($this->DKIM_passphrase!='') {
+ $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase);
} else {
- return false;
+ $privKey = $privKeyStr;
}
+ if (openssl_sign($s, $signature, $privKey)) {
+ return base64_encode($signature);
+ }
}
/**
- * Strips newlines to prevent header injection.
+ * Generate DKIM Canonicalization Header
+ *
* @access public
- * @param string $str String
- * @return string
+ * @param string $s Header
*/
- public function SecureHeader($str) {
- $str = trim($str);
- $str = str_replace("\r", "", $str);
- $str = str_replace("\n", "", $str);
- return $str;
+ public function DKIM_HeaderC($s) {
+ $s=preg_replace("/\r\n\s+/"," ",$s);
+ $lines=explode("\r\n",$s);
+ foreach ($lines as $key=>$line) {
+ list($heading,$value)=explode(":",$line,2);
+ $heading=strtolower($heading);
+ $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces
+ $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP
around the value
+ }
+ $s=implode("\r\n",$lines);
+ return $s;
}
/**
- * Set the private key file and password to sign the message.
+ * Generate DKIM Canonicalization Body
*
* @access public
- * @param string $key_filename Parameter File Name
- * @param string $key_pass Password for private key
+ * @param string $body Message Body
*/
- public function Sign($key_filename, $key_pass) {
- $this->sign_key_file = $key_filename;
- $this->sign_key_pass = $key_pass;
+ public function DKIM_BodyC($body) {
+ if ($body == '') return "\r\n";
+ // stabilize line endings
+ $body=str_replace("\r\n","\n",$body);
+ $body=str_replace("\n","\r\n",$body);
+ // END stabilize line endings
+ while (substr($body,strlen($body)-4,4) == "\r\n\r\n") {
+ $body=substr($body,0,strlen($body)-2);
+ }
+ return $body;
}
+ /**
+ * Create the DKIM header, body, as new header
+ *
+ * @access public
+ * @param string $headers_line Header lines
+ * @param string $subject Subject
+ * @param string $body Body
+ */
+ public function DKIM_Add($headers_line,$subject,$body) {
+ $DKIMsignatureType = 'rsa-sha1'; // Signature & hash algorithms
+ $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of
header/body
+ $DKIMquery = 'dns/txt'; // Query method
+ $DKIMtime = time() ; // Signature Timestamp = seconds since
00:00:00 - Jan 1, 1970 (UTC time zone)
+ $subject_header = "Subject: $subject";
+ $headers = explode("\r\n",$headers_line);
+ foreach($headers as $header) {
+ if (strpos($header,'From:') === 0) {
+ $from_header=$header;
+ } elseif (strpos($header,'To:') === 0) {
+ $to_header=$header;
+ }
+ }
+ $from = str_replace('|','=7C',$this->DKIM_QP($from_header));
+ $to = str_replace('|','=7C',$this->DKIM_QP($to_header));
+ $subject = str_replace('|','=7C',$this->DKIM_QP($subject_header)) ; //
Copied header fields (dkim-quoted-printable
+ $body = $this->DKIM_BodyC($body);
+ $DKIMlen = strlen($body) ; // Length of body
+ $DKIMb64 = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed
binary SHA-1 hash of body
+ $ident = ($this->DKIM_identity == '')? '' : " i=" .
$this->DKIM_identity . ";";
+ $dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" .
$DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n".
+ "\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n".
+ "\th=From:To:Subject;\r\n".
+ "\td=" . $this->DKIM_domain . ";" . $ident . "\r\n".
+ "\tz=$from\r\n".
+ "\t|$to\r\n".
+ "\t|$subject;\r\n".
+ "\tbh=" . $DKIMb64 . ";\r\n".
+ "\tb=";
+ $toSign = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header .
"\r\n" . $subject_header . "\r\n" . $dkimhdrs);
+ $signed = $this->DKIM_Sign($toSign);
+ return "X-PHPMAILER-DKIM:
phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n";
+ }
+
+ protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) {
+ if (!empty($this->action_function) &&
function_exists($this->action_function)) {
+ $params = array($isSent,$to,$cc,$bcc,$subject,$body);
+ call_user_func_array($this->action_function,$params);
+ }
+ }
}
-?>
+class phpmailerException extends Exception {
+ public function errorMessage() {
+ $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
+ return $errorMsg;
+ }
+}
+?>
\ No newline at end of file
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.pop3.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.pop3.php
2009-11-22 16:31:30 UTC (rev 20878)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.pop3.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -2,14 +2,16 @@
/*~ class.pop3.php
.---------------------------------------------------------------------------.
| Software: PHPMailer - PHP email class |
-| Version: 2.2 |
+| Version: 5.1 |
| Contact: via sourceforge.net support pages (also www.codeworxtech.com) |
| Info: http://phpmailer.sourceforge.net |
| Support: http://sourceforge.net/projects/phpmailer/ |
| ------------------------------------------------------------------------- |
-| Author: Andy Prevost (project admininistrator) |
-| Author: Brent R. Matzelle (original founder) |
-| Copyright (c) 2004-2007, Andy Prevost. All Rights Reserved. |
+| Admin: Andy Prevost (project admininistrator) |
+| Authors: Andy Prevost (codeworxtech) address@hidden |
+| : Marcus Bointon (coolbru) address@hidden |
+| Founder: Brent R. Matzelle (original founder) |
+| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved. |
| Copyright (c) 2001-2003, Brent R. Matzelle |
| ------------------------------------------------------------------------- |
| License: Distributed under the Lesser General Public License (LGPL) |
@@ -23,20 +25,32 @@
| - Technology Consulting |
| - Oursourcing (highly qualified programmers and graphic designers) |
'---------------------------------------------------------------------------'
+*/
/**
+ * PHPMailer - PHP POP Before SMTP Authentication Class
+ * NOTE: Designed for use with PHP version 5 and up
+ * @package PHPMailer
+ * @author Andy Prevost
+ * @author Marcus Bointon
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html Distributed under the
Lesser General Public License (LGPL)
+ * @version $Id$
+ */
+
+/**
* POP Before SMTP Authentication Class
- * Version 2.1
+ * Version 5.0.0
*
* Author: Richard Davey (address@hidden)
* Modifications: Andy Prevost
* License: LGPL, see PHPMailer License
*
* Specifically for PHPMailer to allow POP before SMTP authentication.
- * Does not yet work with APOP - if you have an APOP account, contact me
+ * Does not yet work with APOP - if you have an APOP account, contact Richard
Davey
* and we can test changes to this script.
*
- * This class is based on the structure of the SMTP class by Chris Ryan
+ * This class is based on the structure of the SMTP class originally authored
by Chris Ryan
*
* This class is rfc 1939 compliant and implements all the commands
* required for POP3 connection, authentication and disconnection.
@@ -100,13 +114,13 @@
*/
public $password;
- /address@hidden
- * @access private
- */
+ /////////////////////////////////////////////////
+ // PROPERTIES, PRIVATE AND PROTECTED
+ /////////////////////////////////////////////////
+
private $pop_conn;
private $connected;
private $error; // Error log array
- /address@hidden/
/**
* Constructor, sets the initial values
@@ -390,4 +404,4 @@
// End of class
}
-?>
+?>
\ No newline at end of file
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.smtp.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.smtp.php
2009-11-22 16:31:30 UTC (rev 20878)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/class.smtp.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,15 +1,17 @@
-<?php
+<?php
/*~ class.smtp.php
.---------------------------------------------------------------------------.
| Software: PHPMailer - PHP email class |
-| Version: 2.0.0 rc1 |
+| Version: 5.1 |
| Contact: via sourceforge.net support pages (also www.codeworxtech.com) |
| Info: http://phpmailer.sourceforge.net |
| Support: http://sourceforge.net/projects/phpmailer/ |
| ------------------------------------------------------------------------- |
-| Author: Andy Prevost (project admininistrator) |
-| Author: Brent R. Matzelle (original founder) |
-| Copyright (c) 2004-2007, Andy Prevost. All Rights Reserved. |
+| Admin: Andy Prevost (project admininistrator) |
+| Authors: Andy Prevost (codeworxtech) address@hidden |
+| : Marcus Bointon (coolbru) address@hidden |
+| Founder: Brent R. Matzelle (original founder) |
+| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved. |
| Copyright (c) 2001-2003, Brent R. Matzelle |
| ------------------------------------------------------------------------- |
| License: Distributed under the Lesser General Public License (LGPL) |
@@ -23,33 +25,44 @@
| - Technology Consulting |
| - Oursourcing (highly qualified programmers and graphic designers) |
'---------------------------------------------------------------------------'
-
-/**
- * SMTP is rfc 821 compliant and implements all the rfc 821 SMTP
- * commands except TURN which will always return a not implemented
- * error. SMTP also provides some utility methods for sending mail
- * to an SMTP server.
- * @package PHPMailer
- * @author Chris Ryan
- */
+*/
+/**
+ * PHPMailer - PHP SMTP email transport class
+ * NOTE: Designed for use with PHP version 5 and up
+ * @package PHPMailer
+ * @author Andy Prevost
+ * @author Marcus Bointon
+ * @copyright 2004 - 2008 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html Distributed under the
Lesser General Public License (LGPL)
+ * @version $Id: class.smtp.php 444 2009-05-05 11:22:26Z coolbru $
+ */
+
+/**
+ * SMTP is rfc 821 compliant and implements all the rfc 821 SMTP
+ * commands except TURN which will always return a not implemented
+ * error. SMTP also provides some utility methods for sending mail
+ * to an SMTP server.
+ * original author: Chris Ryan
+ */
+
class SMTP {
- /**
- * SMTP server port
- * @var int
- */
+ /**
+ * SMTP server port
+ * @var int
+ */
public $SMTP_PORT = 25;
-
- /**
- * SMTP reply line ending
- * @var string
- */
+
+ /**
+ * SMTP reply line ending
+ * @var string
+ */
public $CRLF = "\r\n";
-
- /**
- * Sets whether debugging is turned on
- * @var bool
- */
+
+ /**
+ * Sets whether debugging is turned on
+ * @var bool
+ */
public $do_debug; // the level of debug to perform
/**
@@ -57,259 +70,288 @@
* @var bool
*/
public $do_verp = false;
-
- /address@hidden
- * @access private
- */
- private $smtp_conn; // the socket to the server
- private $error; // error if any on the last call
- private $helo_rply; // the reply the server sent to us for HELO
- /address@hidden/
-
- /**
- * Initialize the class so that the data is in a known state.
- * @access public
- * @return void
- */
- function __construct() {
- $this->smtp_conn = 0;
- $this->error = null;
- $this->helo_rply = null;
-
- $this->do_debug = 0;
- }
-
- /*************************************************************
- * CONNECTION FUNCTIONS *
- ***********************************************************/
-
- /**
- * Connect to the server specified on the port specified.
- * If the port is not specified use the default SMTP_PORT.
- * If tval is specified then a connection will try and be
- * established with the server for that number of seconds.
- * If tval is not specified the default is 30 seconds to
- * try on the connection.
- *
- * SMTP CODE SUCCESS: 220
- * SMTP CODE FAILURE: 421
- * @access public
- * @return bool
- */
- function Connect($host,$port=0,$tval=30) {
- /* set the error val to null so there is no confusion */
- $this->error = null;
-
- /* make sure we are __not__ connected */
- if($this->connected()) {
- /* ok we are connected! what should we do?
- * for now we will just give an error saying we
- * are already connected
- */
+
+ /////////////////////////////////////////////////
+ // PROPERTIES, PRIVATE AND PROTECTED
+ /////////////////////////////////////////////////
+
+ private $smtp_conn; // the socket to the server
+ private $error; // error if any on the last call
+ private $helo_rply; // the reply the server sent to us for HELO
+
+ /**
+ * Initialize the class so that the data is in a known state.
+ * @access public
+ * @return void
+ */
+ public function __construct() {
+ $this->smtp_conn = 0;
+ $this->error = null;
+ $this->helo_rply = null;
+
+ $this->do_debug = 0;
+ }
+
+ /////////////////////////////////////////////////
+ // CONNECTION FUNCTIONS
+ /////////////////////////////////////////////////
+
+ /**
+ * Connect to the server specified on the port specified.
+ * If the port is not specified use the default SMTP_PORT.
+ * If tval is specified then a connection will try and be
+ * established with the server for that number of seconds.
+ * If tval is not specified the default is 30 seconds to
+ * try on the connection.
+ *
+ * SMTP CODE SUCCESS: 220
+ * SMTP CODE FAILURE: 421
+ * @access public
+ * @return bool
+ */
+ public function Connect($host, $port = 0, $tval = 30) {
+ // set the error val to null so there is no confusion
+ $this->error = null;
+
+ // make sure we are __not__ connected
+ if($this->connected()) {
+ // already connected, generate error
$this->error = array("error" => "Already connected to a server");
- return false;
- }
-
- if(empty($port)) {
- $port = $this->SMTP_PORT;
- }
-
- /* connect to the smtp server */
- $this->smtp_conn = fsockopen($host, // the host of the server
+ return false;
+ }
+
+ if(empty($port)) {
+ $port = $this->SMTP_PORT;
+ }
+
+ // connect to the smtp server
+ $this->smtp_conn = @fsockopen($host, // the host of the server
$port, // the port to use
$errno, // error number if any
$errstr, // error message if any
$tval); // give up after ? secs
- /* verify we connected properly */
- if(empty($this->smtp_conn)) {
- $this->error = array("error" => "Failed to connect to server",
- "errno" => $errno,
- "errstr" => $errstr);
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $this->error["error"] .
- ": $errstr ($errno)" . $this->CRLF;
- }
- return false;
- }
-
- /* sometimes the SMTP server takes a little longer to respond
- * so we will give it a longer timeout for the first read
- * - Windows still does not have support for this timeout function
- */
- if(substr(PHP_OS, 0, 3) != "WIN")
- socket_set_timeout($this->smtp_conn, $tval, 0);
-
- /* get any announcement stuff */
- $announce = $this->get_lines();
-
- /* set the timeout of any socket functions at 1/10 of a second */
- //if(function_exists("socket_set_timeout"))
- // socket_set_timeout($this->smtp_conn, 0, 100000);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $this->CRLF . $announce;
- }
-
- return true;
- }
-
- /**
- * Performs SMTP authentication. Must be run after running the
- * Hello() method. Returns true if successfully authenticated.
- * @access public
- * @return bool
- */
- function Authenticate($username, $password) {
- // Start authentication
- fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($code != 334) {
- $this->error =
- array("error" => "AUTH not accepted from server",
- "smtp_code" => $code,
- "smtp_msg" => substr($rply,4));
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $this->error["error"] .
- ": " . $rply . $this->CRLF;
- }
- return false;
- }
-
- // Send encoded username
- fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($code != 334) {
- $this->error =
- array("error" => "Username not accepted from server",
- "smtp_code" => $code,
- "smtp_msg" => substr($rply,4));
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $this->error["error"] .
- ": " . $rply . $this->CRLF;
- }
- return false;
- }
-
- // Send encoded password
- fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($code != 235) {
- $this->error =
- array("error" => "Password not accepted from server",
- "smtp_code" => $code,
- "smtp_msg" => substr($rply,4));
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $this->error["error"] .
- ": " . $rply . $this->CRLF;
- }
- return false;
- }
-
- return true;
- }
-
- /**
- * Returns true if connected to a server otherwise false
- * @access private
- * @return bool
- */
- function Connected() {
- if(!empty($this->smtp_conn)) {
- $sock_status = socket_get_status($this->smtp_conn);
- if($sock_status["eof"]) {
- // hmm this is an odd situation... the socket is
- // valid but we are not connected anymore
- if($this->do_debug >= 1) {
- echo "SMTP -> NOTICE:" . $this->CRLF .
- "EOF caught while checking if connected";
- }
- $this->Close();
- return false;
- }
+ // verify we connected properly
+ if(empty($this->smtp_conn)) {
+ $this->error = array("error" => "Failed to connect to server",
+ "errno" => $errno,
+ "errstr" => $errstr);
+ if($this->do_debug >= 1) {
+ echo "SMTP -> ERROR: " . $this->error["error"] . ": $errstr ($errno)"
. $this->CRLF . '<br />';
+ }
+ return false;
+ }
+
+ // SMTP server can take longer to respond, give longer timeout for first
read
+ // Windows does not have support for this timeout function
+ if(substr(PHP_OS, 0, 3) != "WIN")
+ socket_set_timeout($this->smtp_conn, $tval, 0);
+
+ // get any announcement
+ $announce = $this->get_lines();
+
+ if($this->do_debug >= 2) {
+ echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '<br />';
+ }
+
+ return true;
+ }
+
+ /**
+ * Initiate a TLS communication with the server.
+ *
+ * SMTP CODE 220 Ready to start TLS
+ * SMTP CODE 501 Syntax error (no parameters allowed)
+ * SMTP CODE 454 TLS not available due to temporary reason
+ * @access public
+ * @return bool success
+ */
+ public function StartTLS() {
+ $this->error = null; # to avoid confusion
+
+ if(!$this->connected()) {
+ $this->error = array("error" => "Called StartTLS() without being
connected");
+ return false;
+ }
+
+ fputs($this->smtp_conn,"STARTTLS" . $this->CRLF);
+
+ $rply = $this->get_lines();
+ $code = substr($rply,0,3);
+
+ if($this->do_debug >= 2) {
+ echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+ }
+
+ if($code != 220) {
+ $this->error =
+ array("error" => "STARTTLS not accepted from server",
+ "smtp_code" => $code,
+ "smtp_msg" => substr($rply,4));
+ if($this->do_debug >= 1) {
+ echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply .
$this->CRLF . '<br />';
+ }
+ return false;
+ }
+
+ // Begin encrypted connection
+ if(!stream_socket_enable_crypto($this->smtp_conn, true,
STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Performs SMTP authentication. Must be run after running the
+ * Hello() method. Returns true if successfully authenticated.
+ * @access public
+ * @return bool
+ */
+ public function Authenticate($username, $password) {
+ // Start authentication
+ fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
+
+ $rply = $this->get_lines();
+ $code = substr($rply,0,3);
+
+ if($code != 334) {
+ $this->error =
+ array("error" => "AUTH not accepted from server",
+ "smtp_code" => $code,
+ "smtp_msg" => substr($rply,4));
+ if($this->do_debug >= 1) {
+ echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply .
$this->CRLF . '<br />';
+ }
+ return false;
+ }
+
+ // Send encoded username
+ fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);
+
+ $rply = $this->get_lines();
+ $code = substr($rply,0,3);
+
+ if($code != 334) {
+ $this->error =
+ array("error" => "Username not accepted from server",
+ "smtp_code" => $code,
+ "smtp_msg" => substr($rply,4));
+ if($this->do_debug >= 1) {
+ echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply .
$this->CRLF . '<br />';
+ }
+ return false;
+ }
+
+ // Send encoded password
+ fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);
+
+ $rply = $this->get_lines();
+ $code = substr($rply,0,3);
+
+ if($code != 235) {
+ $this->error =
+ array("error" => "Password not accepted from server",
+ "smtp_code" => $code,
+ "smtp_msg" => substr($rply,4));
+ if($this->do_debug >= 1) {
+ echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply .
$this->CRLF . '<br />';
+ }
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Returns true if connected to a server otherwise false
+ * @access public
+ * @return bool
+ */
+ public function Connected() {
+ if(!empty($this->smtp_conn)) {
+ $sock_status = socket_get_status($this->smtp_conn);
+ if($sock_status["eof"]) {
+ // the socket is valid but we are not connected
+ if($this->do_debug >= 1) {
+ echo "SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking
if connected";
+ }
+ $this->Close();
+ return false;
+ }
return true; // everything looks good
- }
- return false;
- }
-
- /**
- * Closes the socket and cleans up the state of the class.
- * It is not considered good to use this function without
- * first trying to use QUIT.
- * @access public
- * @return void
- */
- function Close() {
+ }
+ return false;
+ }
+
+ /**
+ * Closes the socket and cleans up the state of the class.
+ * It is not considered good to use this function without
+ * first trying to use QUIT.
+ * @access public
+ * @return void
+ */
+ public function Close() {
$this->error = null; // so there is no confusion
- $this->helo_rply = null;
- if(!empty($this->smtp_conn)) {
+ $this->helo_rply = null;
+ if(!empty($this->smtp_conn)) {
// close the connection and cleanup
- fclose($this->smtp_conn);
- $this->smtp_conn = 0;
- }
- }
-
- /***************************************************************
- * SMTP COMMANDS *
- *************************************************************/
-
- /**
- * Issues a data command and sends the msg_data to the server
- * finializing the mail transaction. $msg_data is the message
- * that is to be send with the headers. Each header needs to be
- * on a single line followed by a <CRLF> with the message headers
- * and the message body being seperated by and additional <CRLF>.
- *
- * Implements rfc 821: DATA <CRLF>
- *
- * SMTP CODE INTERMEDIATE: 354
- * [data]
- * <CRLF>.<CRLF>
- * SMTP CODE SUCCESS: 250
- * SMTP CODE FAILURE: 552,554,451,452
- * SMTP CODE FAILURE: 451,554
- * SMTP CODE ERROR : 500,501,503,421
- * @access public
- * @return bool
- */
- function Data($msg_data) {
+ fclose($this->smtp_conn);
+ $this->smtp_conn = 0;
+ }
+ }
+
+ /////////////////////////////////////////////////
+ // SMTP COMMANDS
+ /////////////////////////////////////////////////
+
+ /**
+ * Issues a data command and sends the msg_data to the server
+ * finializing the mail transaction. $msg_data is the message
+ * that is to be send with the headers. Each header needs to be
+ * on a single line followed by a <CRLF> with the message headers
+ * and the message body being seperated by and additional <CRLF>.
+ *
+ * Implements rfc 821: DATA <CRLF>
+ *
+ * SMTP CODE INTERMEDIATE: 354
+ * [data]
+ * <CRLF>.<CRLF>
+ * SMTP CODE SUCCESS: 250
+ * SMTP CODE FAILURE: 552,554,451,452
+ * SMTP CODE FAILURE: 451,554
+ * SMTP CODE ERROR : 500,501,503,421
+ * @access public
+ * @return bool
+ */
+ public function Data($msg_data) {
$this->error = null; // so no confusion is caused
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called Data() without being connected");
- return false;
- }
-
- fputs($this->smtp_conn,"DATA" . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
- }
-
- if($code != 354) {
- $this->error =
- array("error" => "DATA command not accepted from server",
- "smtp_code" => $code,
- "smtp_msg" => substr($rply,4));
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $this->error["error"] .
- ": " . $rply . $this->CRLF;
- }
- return false;
- }
-
+
+ if(!$this->connected()) {
+ $this->error = array(
+ "error" => "Called Data() without being connected");
+ return false;
+ }
+
+ fputs($this->smtp_conn,"DATA" . $this->CRLF);
+
+ $rply = $this->get_lines();
+ $code = substr($rply,0,3);
+
+ if($this->do_debug >= 2) {
+ echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+ }
+
+ if($code != 354) {
+ $this->error =
+ array("error" => "DATA command not accepted from server",
+ "smtp_code" => $code,
+ "smtp_msg" => substr($rply,4));
+ if($this->do_debug >= 1) {
+ echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply .
$this->CRLF . '<br />';
+ }
+ return false;
+ }
+
/* the server is ready to accept data!
* according to rfc 821 we should not send more than 1000
* including the CRLF
@@ -318,14 +360,14 @@
* each of those into smaller lines to fit within the limit.
* in addition we will be looking for lines that start with
* a period '.' and append and additional period '.' to that
- * line. NOTE: this does not count towards are limit.
+ * line. NOTE: this does not count towards limit.
*/
-
+
// normalize the line breaks so we know the explode works
- $msg_data = str_replace("\r\n","\n",$msg_data);
- $msg_data = str_replace("\r","\n",$msg_data);
- $lines = explode("\n",$msg_data);
-
+ $msg_data = str_replace("\r\n","\n",$msg_data);
+ $msg_data = str_replace("\r","\n",$msg_data);
+ $lines = explode("\n",$msg_data);
+
/* we need to find a good way to determine is headers are
* in the msg_data or if it is a straight msg body
* currently I am assuming rfc 822 definitions of msg headers
@@ -334,732 +376,439 @@
* and we can process all lines before a blank "" line as
* headers.
*/
- $field = substr($lines[0],0,strpos($lines[0],":"));
- $in_headers = false;
- if(!empty($field) && !strstr($field," ")) {
- $in_headers = true;
- }
-
+
+ $field = substr($lines[0],0,strpos($lines[0],":"));
+ $in_headers = false;
+ if(!empty($field) && !strstr($field," ")) {
+ $in_headers = true;
+ }
+
$max_line_length = 998; // used below; set here for ease in change
-
- while(list(,$line) = @each($lines)) {
- $lines_out = null;
- if($line == "" && $in_headers) {
- $in_headers = false;
- }
+
+ while(list(,$line) = @each($lines)) {
+ $lines_out = null;
+ if($line == "" && $in_headers) {
+ $in_headers = false;
+ }
// ok we need to break this line up into several smaller lines
- while(strlen($line) > $max_line_length) {
- $pos = strrpos(substr($line,0,$max_line_length)," ");
-
+ while(strlen($line) > $max_line_length) {
+ $pos = strrpos(substr($line,0,$max_line_length)," ");
+
// Patch to fix DOS attack
- if(!$pos) {
- $pos = $max_line_length - 1;
- }
-
- $lines_out[] = substr($line,0,$pos);
- $line = substr($line,$pos + 1);
- /* if we are processing headers we need to
- * add a LWSP-char to the front of the new line
+ if(!$pos) {
+ $pos = $max_line_length - 1;
+ $lines_out[] = substr($line,0,$pos);
+ $line = substr($line,$pos);
+ } else {
+ $lines_out[] = substr($line,0,$pos);
+ $line = substr($line,$pos + 1);
+ }
+
+ /* if processing headers add a LWSP-char to the front of new line
* rfc 822 on long msg headers
*/
- if($in_headers) {
- $line = "\t" . $line;
- }
- }
- $lines_out[] = $line;
-
- // now send the lines to the server
- while(list(,$line_out) = @each($lines_out)) {
- if(strlen($line_out) > 0)
- {
- if(substr($line_out, 0, 1) == ".") {
- $line_out = "." . $line_out;
- }
- }
- fputs($this->smtp_conn,$line_out . $this->CRLF);
- }
- }
-
- // ok all the message data has been sent so lets get this
- // over with aleady
- fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
- }
-
- if($code != 250) {
- $this->error =
- array("error" => "DATA not accepted from server",
- "smtp_code" => $code,
- "smtp_msg" => substr($rply,4));
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $this->error["error"] .
- ": " . $rply . $this->CRLF;
- }
- return false;
- }
- return true;
- }
-
- /**
- * Expand takes the name and asks the server to list all the
- * people who are members of the _list_. Expand will return
- * back and array of the result or false if an error occurs.
- * Each value in the array returned has the format of:
- * [ <full-name> <sp> ] <path>
- * The definition of <path> is defined in rfc 821
- *
- * Implements rfc 821: EXPN <SP> <string> <CRLF>
- *
- * SMTP CODE SUCCESS: 250
- * SMTP CODE FAILURE: 550
- * SMTP CODE ERROR : 500,501,502,504,421
- * @access public
- * @return string array
- */
- function Expand($name) {
+ if($in_headers) {
+ $line = "\t" . $line;
+ }
+ }
+ $lines_out[] = $line;
+
+ // send the lines to the server
+ while(list(,$line_out) = @each($lines_out)) {
+ if(strlen($line_out) > 0)
+ {
+ if(substr($line_out, 0, 1) == ".") {
+ $line_out = "." . $line_out;
+ }
+ }
+ fputs($this->smtp_conn,$line_out . $this->CRLF);
+ }
+ }
+
+ // message data has been sent
+ fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
+
+ $rply = $this->get_lines();
+ $code = substr($rply,0,3);
+
+ if($this->do_debug >= 2) {
+ echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+ }
+
+ if($code != 250) {
+ $this->error =
+ array("error" => "DATA not accepted from server",
+ "smtp_code" => $code,
+ "smtp_msg" => substr($rply,4));
+ if($this->do_debug >= 1) {
+ echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply .
$this->CRLF . '<br />';
+ }
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Sends the HELO command to the smtp server.
+ * This makes sure that we and the server are in
+ * the same known state.
+ *
+ * Implements from rfc 821: HELO <SP> <domain> <CRLF>
+ *
+ * SMTP CODE SUCCESS: 250
+ * SMTP CODE ERROR : 500, 501, 504, 421
+ * @access public
+ * @return bool
+ */
+ public function Hello($host = '') {
$this->error = null; // so no confusion is caused
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called Expand() without being connected");
- return false;
- }
-
- fputs($this->smtp_conn,"EXPN " . $name . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
- }
-
- if($code != 250) {
- $this->error =
- array("error" => "EXPN not accepted from server",
- "smtp_code" => $code,
- "smtp_msg" => substr($rply,4));
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $this->error["error"] .
- ": " . $rply . $this->CRLF;
- }
- return false;
- }
-
- // parse the reply and place in our array to return to user
- $entries = explode($this->CRLF,$rply);
- while(list(,$l) = @each($entries)) {
- $list[] = substr($l,4);
- }
-
- return $list;
- }
-
- /**
- * Sends the HELO command to the smtp server.
- * This makes sure that we and the server are in
- * the same known state.
- *
- * Implements from rfc 821: HELO <SP> <domain> <CRLF>
- *
- * SMTP CODE SUCCESS: 250
- * SMTP CODE ERROR : 500, 501, 504, 421
- * @access public
- * @return bool
- */
- function Hello($host="") {
+
+ if(!$this->connected()) {
+ $this->error = array(
+ "error" => "Called Hello() without being connected");
+ return false;
+ }
+
+ // if hostname for HELO was not specified send default
+ if(empty($host)) {
+ // determine appropriate default to send to server
+ $host = "localhost";
+ }
+
+ // Send extended hello first (RFC 2821)
+ if(!$this->SendHello("EHLO", $host)) {
+ if(!$this->SendHello("HELO", $host)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Sends a HELO/EHLO command.
+ * @access private
+ * @return bool
+ */
+ private function SendHello($hello, $host) {
+ fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
+
+ $rply = $this->get_lines();
+ $code = substr($rply,0,3);
+
+ if($this->do_debug >= 2) {
+ echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />';
+ }
+
+ if($code != 250) {
+ $this->error =
+ array("error" => $hello . " not accepted from server",
+ "smtp_code" => $code,
+ "smtp_msg" => substr($rply,4));
+ if($this->do_debug >= 1) {
+ echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply .
$this->CRLF . '<br />';
+ }
+ return false;
+ }
+
+ $this->helo_rply = $rply;
+
+ return true;
+ }
+
+ /**
+ * Starts a mail transaction from the email address specified in
+ * $from. Returns true if successful or false otherwise. If True
+ * the mail transaction is started and then one or more Recipient
+ * commands may be called followed by a Data command.
+ *
+ * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
+ *
+ * SMTP CODE SUCCESS: 250
+ * SMTP CODE SUCCESS: 552,451,452
+ * SMTP CODE SUCCESS: 500,501,421
+ * @access public
+ * @return bool
+ */
+ public function Mail($from) {
$this->error = null; // so no confusion is caused
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called Hello() without being connected");
- return false;
- }
-
- // if a hostname for the HELO was not specified determine
- //a suitable one to send
- if(empty($host)) {
- // we need to determine some sort of appopiate default
- // to send to the server
- $host = "localhost";
- }
-
- // Send extended hello first (RFC 2821)
- if(!$this->SendHello("EHLO", $host))
- {
- if(!$this->SendHello("HELO", $host))
- return false;
- }
-
- return true;
- }
-
- /**
- * Sends a HELO/EHLO command.
- * @access private
- * @return bool
- */
- function SendHello($hello, $host) {
- fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER: " . $this->CRLF . $rply;
- }
-
- if($code != 250) {
- $this->error =
- array("error" => $hello . " not accepted from server",
- "smtp_code" => $code,
- "smtp_msg" => substr($rply,4));
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $this->error["error"] .
- ": " . $rply . $this->CRLF;
- }
- return false;
- }
-
- $this->helo_rply = $rply;
-
- return true;
- }
-
- /**
- * Gets help information on the keyword specified. If the keyword
- * is not specified then returns generic help, ussually contianing
- * A list of keywords that help is available on. This function
- * returns the results back to the user. It is up to the user to
- * handle the returned data. If an error occurs then false is
- * returned with $this->error set appropiately.
- *
- * Implements rfc 821: HELP [ <SP> <string> ] <CRLF>
- *
- * SMTP CODE SUCCESS: 211,214
- * SMTP CODE ERROR : 500,501,502,504,421
- * @access public
- * @return string
- */
- function Help($keyword="") {
- $this->error = null; // to avoid confusion
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called Help() without being connected");
- return false;
- }
-
- $extra = "";
- if(!empty($keyword)) {
- $extra = " " . $keyword;
- }
-
- fputs($this->smtp_conn,"HELP" . $extra . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
- }
-
- if($code != 211 && $code != 214) {
- $this->error =
- array("error" => "HELP not accepted from server",
- "smtp_code" => $code,
- "smtp_msg" => substr($rply,4));
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $this->error["error"] .
- ": " . $rply . $this->CRLF;
- }
- return false;
- }
-
- return $rply;
- }
-
- /**
- * Starts a mail transaction from the email address specified in
- * $from. Returns true if successful or false otherwise. If True
- * the mail transaction is started and then one or more Recipient
- * commands may be called followed by a Data command.
- *
- * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
- *
- * SMTP CODE SUCCESS: 250
- * SMTP CODE SUCCESS: 552,451,452
- * SMTP CODE SUCCESS: 500,501,421
- * @access public
- * @return bool
- */
- function Mail($from) {
- $this->error = null; // so no confusion is caused
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called Mail() without being connected");
- return false;
- }
-
+
+ if(!$this->connected()) {
+ $this->error = array(
+ "error" => "Called Mail() without being connected");
+ return false;
+ }
+
$useVerp = ($this->do_verp ? "XVERP" : "");
fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp .
$this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
- }
-
- if($code != 250) {
- $this->error =
- array("error" => "MAIL not accepted from server",
- "smtp_code" => $code,
- "smtp_msg" => substr($rply,4));
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $this->error["error"] .
- ": " . $rply . $this->CRLF;
- }
- return false;
- }
- return true;
- }
-
- /**
- * Sends the command NOOP to the SMTP server.
- *
- * Implements from rfc 821: NOOP <CRLF>
- *
- * SMTP CODE SUCCESS: 250
- * SMTP CODE ERROR : 500, 421
- * @access public
- * @return bool
- */
- function Noop() {
- $this->error = null; // so no confusion is caused
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called Noop() without being connected");
- return false;
- }
-
- fputs($this->smtp_conn,"NOOP" . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
- }
-
- if($code != 250) {
- $this->error =
- array("error" => "NOOP not accepted from server",
- "smtp_code" => $code,
- "smtp_msg" => substr($rply,4));
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $this->error["error"] .
- ": " . $rply . $this->CRLF;
- }
- return false;
- }
- return true;
- }
-
- /**
- * Sends the quit command to the server and then closes the socket
- * if there is no error or the $close_on_error argument is true.
- *
- * Implements from rfc 821: QUIT <CRLF>
- *
- * SMTP CODE SUCCESS: 221
- * SMTP CODE ERROR : 500
- * @access public
- * @return bool
- */
- function Quit($close_on_error=true) {
+
+ $rply = $this->get_lines();
+ $code = substr($rply,0,3);
+
+ if($this->do_debug >= 2) {
+ echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+ }
+
+ if($code != 250) {
+ $this->error =
+ array("error" => "MAIL not accepted from server",
+ "smtp_code" => $code,
+ "smtp_msg" => substr($rply,4));
+ if($this->do_debug >= 1) {
+ echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply .
$this->CRLF . '<br />';
+ }
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Sends the quit command to the server and then closes the socket
+ * if there is no error or the $close_on_error argument is true.
+ *
+ * Implements from rfc 821: QUIT <CRLF>
+ *
+ * SMTP CODE SUCCESS: 221
+ * SMTP CODE ERROR : 500
+ * @access public
+ * @return bool
+ */
+ public function Quit($close_on_error = true) {
$this->error = null; // so there is no confusion
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called Quit() without being connected");
- return false;
- }
-
+
+ if(!$this->connected()) {
+ $this->error = array(
+ "error" => "Called Quit() without being connected");
+ return false;
+ }
+
// send the quit command to the server
- fputs($this->smtp_conn,"quit" . $this->CRLF);
-
+ fputs($this->smtp_conn,"quit" . $this->CRLF);
+
// get any good-bye messages
- $byemsg = $this->get_lines();
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $this->CRLF . $byemsg;
- }
-
- $rval = true;
- $e = null;
-
- $code = substr($byemsg,0,3);
- if($code != 221) {
+ $byemsg = $this->get_lines();
+
+ if($this->do_debug >= 2) {
+ echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />';
+ }
+
+ $rval = true;
+ $e = null;
+
+ $code = substr($byemsg,0,3);
+ if($code != 221) {
// use e as a tmp var cause Close will overwrite $this->error
- $e = array("error" => "SMTP server rejected quit command",
- "smtp_code" => $code,
- "smtp_rply" => substr($byemsg,4));
- $rval = false;
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $e["error"] . ": " .
- $byemsg . $this->CRLF;
- }
- }
-
- if(empty($e) || $close_on_error) {
- $this->Close();
- }
-
- return $rval;
- }
-
- /**
- * Sends the command RCPT to the SMTP server with the TO: argument of $to.
- * Returns true if the recipient was accepted false if it was rejected.
- *
- * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
- *
- * SMTP CODE SUCCESS: 250,251
- * SMTP CODE FAILURE: 550,551,552,553,450,451,452
- * SMTP CODE ERROR : 500,501,503,421
- * @access public
- * @return bool
- */
- function Recipient($to) {
+ $e = array("error" => "SMTP server rejected quit command",
+ "smtp_code" => $code,
+ "smtp_rply" => substr($byemsg,4));
+ $rval = false;
+ if($this->do_debug >= 1) {
+ echo "SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF .
'<br />';
+ }
+ }
+
+ if(empty($e) || $close_on_error) {
+ $this->Close();
+ }
+
+ return $rval;
+ }
+
+ /**
+ * Sends the command RCPT to the SMTP server with the TO: argument of $to.
+ * Returns true if the recipient was accepted false if it was rejected.
+ *
+ * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
+ *
+ * SMTP CODE SUCCESS: 250,251
+ * SMTP CODE FAILURE: 550,551,552,553,450,451,452
+ * SMTP CODE ERROR : 500,501,503,421
+ * @access public
+ * @return bool
+ */
+ public function Recipient($to) {
$this->error = null; // so no confusion is caused
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called Recipient() without being connected");
- return false;
- }
-
- fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
- }
-
- if($code != 250 && $code != 251) {
- $this->error =
- array("error" => "RCPT not accepted from server",
- "smtp_code" => $code,
- "smtp_msg" => substr($rply,4));
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $this->error["error"] .
- ": " . $rply . $this->CRLF;
- }
- return false;
- }
- return true;
- }
-
- /**
- * Sends the RSET command to abort and transaction that is
- * currently in progress. Returns true if successful false
- * otherwise.
- *
- * Implements rfc 821: RSET <CRLF>
- *
- * SMTP CODE SUCCESS: 250
- * SMTP CODE ERROR : 500,501,504,421
- * @access public
- * @return bool
- */
- function Reset() {
+
+ if(!$this->connected()) {
+ $this->error = array(
+ "error" => "Called Recipient() without being connected");
+ return false;
+ }
+
+ fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
+
+ $rply = $this->get_lines();
+ $code = substr($rply,0,3);
+
+ if($this->do_debug >= 2) {
+ echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+ }
+
+ if($code != 250 && $code != 251) {
+ $this->error =
+ array("error" => "RCPT not accepted from server",
+ "smtp_code" => $code,
+ "smtp_msg" => substr($rply,4));
+ if($this->do_debug >= 1) {
+ echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply .
$this->CRLF . '<br />';
+ }
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Sends the RSET command to abort and transaction that is
+ * currently in progress. Returns true if successful false
+ * otherwise.
+ *
+ * Implements rfc 821: RSET <CRLF>
+ *
+ * SMTP CODE SUCCESS: 250
+ * SMTP CODE ERROR : 500,501,504,421
+ * @access public
+ * @return bool
+ */
+ public function Reset() {
$this->error = null; // so no confusion is caused
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called Reset() without being connected");
- return false;
- }
-
- fputs($this->smtp_conn,"RSET" . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
- }
-
- if($code != 250) {
- $this->error =
- array("error" => "RSET failed",
- "smtp_code" => $code,
- "smtp_msg" => substr($rply,4));
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $this->error["error"] .
- ": " . $rply . $this->CRLF;
- }
- return false;
- }
-
- return true;
- }
-
- /**
- * Starts a mail transaction from the email address specified in
- * $from. Returns true if successful or false otherwise. If True
- * the mail transaction is started and then one or more Recipient
- * commands may be called followed by a Data command. This command
- * will send the message to the users terminal if they are logged
- * in.
- *
- * Implements rfc 821: SEND <SP> FROM:<reverse-path> <CRLF>
- *
- * SMTP CODE SUCCESS: 250
- * SMTP CODE SUCCESS: 552,451,452
- * SMTP CODE SUCCESS: 500,501,502,421
- * @access public
- * @return bool
- */
- function Send($from) {
+
+ if(!$this->connected()) {
+ $this->error = array(
+ "error" => "Called Reset() without being connected");
+ return false;
+ }
+
+ fputs($this->smtp_conn,"RSET" . $this->CRLF);
+
+ $rply = $this->get_lines();
+ $code = substr($rply,0,3);
+
+ if($this->do_debug >= 2) {
+ echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+ }
+
+ if($code != 250) {
+ $this->error =
+ array("error" => "RSET failed",
+ "smtp_code" => $code,
+ "smtp_msg" => substr($rply,4));
+ if($this->do_debug >= 1) {
+ echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply .
$this->CRLF . '<br />';
+ }
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Starts a mail transaction from the email address specified in
+ * $from. Returns true if successful or false otherwise. If True
+ * the mail transaction is started and then one or more Recipient
+ * commands may be called followed by a Data command. This command
+ * will send the message to the users terminal if they are logged
+ * in and send them an email.
+ *
+ * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
+ *
+ * SMTP CODE SUCCESS: 250
+ * SMTP CODE SUCCESS: 552,451,452
+ * SMTP CODE SUCCESS: 500,501,502,421
+ * @access public
+ * @return bool
+ */
+ public function SendAndMail($from) {
$this->error = null; // so no confusion is caused
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called Send() without being connected");
- return false;
- }
-
- fputs($this->smtp_conn,"SEND FROM:" . $from . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
- }
-
- if($code != 250) {
- $this->error =
- array("error" => "SEND not accepted from server",
- "smtp_code" => $code,
- "smtp_msg" => substr($rply,4));
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $this->error["error"] .
- ": " . $rply . $this->CRLF;
- }
- return false;
- }
- return true;
- }
-
- /**
- * Starts a mail transaction from the email address specified in
- * $from. Returns true if successful or false otherwise. If True
- * the mail transaction is started and then one or more Recipient
- * commands may be called followed by a Data command. This command
- * will send the message to the users terminal if they are logged
- * in and send them an email.
- *
- * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
- *
- * SMTP CODE SUCCESS: 250
- * SMTP CODE SUCCESS: 552,451,452
- * SMTP CODE SUCCESS: 500,501,502,421
- * @access public
- * @return bool
- */
- function SendAndMail($from) {
- $this->error = null; // so no confusion is caused
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called SendAndMail() without being connected");
- return false;
- }
-
- fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
- }
-
- if($code != 250) {
- $this->error =
- array("error" => "SAML not accepted from server",
- "smtp_code" => $code,
- "smtp_msg" => substr($rply,4));
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $this->error["error"] .
- ": " . $rply . $this->CRLF;
- }
- return false;
- }
- return true;
- }
-
- /**
- * Starts a mail transaction from the email address specified in
- * $from. Returns true if successful or false otherwise. If True
- * the mail transaction is started and then one or more Recipient
- * commands may be called followed by a Data command. This command
- * will send the message to the users terminal if they are logged
- * in or mail it to them if they are not.
- *
- * Implements rfc 821: SOML <SP> FROM:<reverse-path> <CRLF>
- *
- * SMTP CODE SUCCESS: 250
- * SMTP CODE SUCCESS: 552,451,452
- * SMTP CODE SUCCESS: 500,501,502,421
- * @access public
- * @return bool
- */
- function SendOrMail($from) {
- $this->error = null; // so no confusion is caused
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called SendOrMail() without being connected");
- return false;
- }
-
- fputs($this->smtp_conn,"SOML FROM:" . $from . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
- }
-
- if($code != 250) {
- $this->error =
- array("error" => "SOML not accepted from server",
- "smtp_code" => $code,
- "smtp_msg" => substr($rply,4));
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $this->error["error"] .
- ": " . $rply . $this->CRLF;
- }
- return false;
- }
- return true;
- }
-
- /**
- * This is an optional command for SMTP that this class does not
- * support. This method is here to make the RFC821 Definition
- * complete for this class and __may__ be implimented in the future
- *
- * Implements from rfc 821: TURN <CRLF>
- *
- * SMTP CODE SUCCESS: 250
- * SMTP CODE FAILURE: 502
- * SMTP CODE ERROR : 500, 503
- * @access public
- * @return bool
- */
- function Turn() {
- $this->error = array("error" => "This method, TURN, of the SMTP ".
- "is not implemented");
- if($this->do_debug >= 1) {
- echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF;
- }
- return false;
- }
-
- /**
- * Verifies that the name is recognized by the server.
- * Returns false if the name could not be verified otherwise
- * the response from the server is returned.
- *
- * Implements rfc 821: VRFY <SP> <string> <CRLF>
- *
- * SMTP CODE SUCCESS: 250,251
- * SMTP CODE FAILURE: 550,551,553
- * SMTP CODE ERROR : 500,501,502,421
- * @access public
- * @return int
- */
- function Verify($name) {
- $this->error = null; // so no confusion is caused
-
- if(!$this->connected()) {
- $this->error = array(
- "error" => "Called Verify() without being connected");
- return false;
- }
-
- fputs($this->smtp_conn,"VRFY " . $name . $this->CRLF);
-
- $rply = $this->get_lines();
- $code = substr($rply,0,3);
-
- if($this->do_debug >= 2) {
- echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
- }
-
- if($code != 250 && $code != 251) {
- $this->error =
- array("error" => "VRFY failed on name '$name'",
- "smtp_code" => $code,
- "smtp_msg" => substr($rply,4));
- if($this->do_debug >= 1) {
- echo "SMTP -> ERROR: " . $this->error["error"] .
- ": " . $rply . $this->CRLF;
- }
- return false;
- }
- return $rply;
- }
-
- /*******************************************************************
- * INTERNAL FUNCTIONS *
- ******************************************************************/
-
- /**
- * Read in as many lines as possible
- * either before eof or socket timeout occurs on the operation.
- * With SMTP we can tell if we have more lines to read if the
- * 4th character is '-' symbol. If it is a space then we don't
- * need to read anything else.
- * @access private
- * @return string
- */
- function get_lines() {
- $data = "";
+
+ if(!$this->connected()) {
+ $this->error = array(
+ "error" => "Called SendAndMail() without being connected");
+ return false;
+ }
+
+ fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
+
+ $rply = $this->get_lines();
+ $code = substr($rply,0,3);
+
+ if($this->do_debug >= 2) {
+ echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+ }
+
+ if($code != 250) {
+ $this->error =
+ array("error" => "SAML not accepted from server",
+ "smtp_code" => $code,
+ "smtp_msg" => substr($rply,4));
+ if($this->do_debug >= 1) {
+ echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply .
$this->CRLF . '<br />';
+ }
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * This is an optional command for SMTP that this class does not
+ * support. This method is here to make the RFC821 Definition
+ * complete for this class and __may__ be implimented in the future
+ *
+ * Implements from rfc 821: TURN <CRLF>
+ *
+ * SMTP CODE SUCCESS: 250
+ * SMTP CODE FAILURE: 502
+ * SMTP CODE ERROR : 500, 503
+ * @access public
+ * @return bool
+ */
+ public function Turn() {
+ $this->error = array("error" => "This method, TURN, of the SMTP ".
+ "is not implemented");
+ if($this->do_debug >= 1) {
+ echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />';
+ }
+ return false;
+ }
+
+ /**
+ * Get the current error
+ * @access public
+ * @return array
+ */
+ public function getError() {
+ return $this->error;
+ }
+
+ /////////////////////////////////////////////////
+ // INTERNAL FUNCTIONS
+ /////////////////////////////////////////////////
+
+ /**
+ * Read in as many lines as possible
+ * either before eof or socket timeout occurs on the operation.
+ * With SMTP we can tell if we have more lines to read if the
+ * 4th character is '-' symbol. If it is a space then we don't
+ * need to read anything else.
+ * @access private
+ * @return string
+ */
+ private function get_lines() {
+ $data = "";
while($str = @fgets($this->smtp_conn,515)) {
- if($this->do_debug >= 4) {
- echo "SMTP -> get_lines(): \$data was \"$data\"" .
- $this->CRLF;
- echo "SMTP -> get_lines(): \$str is \"$str\"" .
- $this->CRLF;
- }
- $data .= $str;
- if($this->do_debug >= 4) {
- echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF;
- }
- // if the 4th character is a space then we are done reading
- // so just break the loop
- if(substr($str,3,1) == " ") { break; }
- }
- return $data;
- }
-
-}
-
-
- ?>
+ if($this->do_debug >= 4) {
+ echo "SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF . '<br
/>';
+ echo "SMTP -> get_lines(): \$str is \"$str\"" . $this->CRLF . '<br />';
+ }
+ $data .= $str;
+ if($this->do_debug >= 4) {
+ echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF . '<br
/>';
+ }
+ // if 4th character is a space, we are done reading, break the loop
+ if(substr($str,3,1) == " ") { break; }
+ }
+ return $data;
+ }
+
+}
+
+?>
\ No newline at end of file
Deleted: people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/codeworxtech.html
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/codeworxtech.html
2009-11-22 16:31:30 UTC (rev 20878)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/codeworxtech.html
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,120 +0,0 @@
-<html>
-<head>
-<style>
-body, p {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 12px;
-}
-div.width {
- width: 500px;
- text-align: left;
-}
-</style>
-<script>
-<!--
-var popsite="http://phpmailer.codeworxtech.com";
-var
withfeatures="width=960,height=760,scrollbars=1,resizable=1,toolbar=1,location=1,menubar=1,status=1,directories=0"
-var once_per_session=0
-function get_cookie(Name) {
- var search = Name + "="
- var returnvalue = "";
- if (document.cookie.length > 0) {
- offset = document.cookie.indexOf(search)
- if (offset != -1) { // if cookie exists
- offset += search.length
- // set index of beginning of value
- end = document.cookie.indexOf(";", offset);
- // set index of end of cookie value
- if (end == -1)
- end = document.cookie.length;
- returnvalue=unescape(document.cookie.substring(offset, end))
- }
- }
- return returnvalue;
-}
-function loadornot(){
- if (get_cookie('popsite')=='') {
- loadpopsite()
- document.cookie="popsite=yes"
- }
-}
-function loadpopsite(){
- win2=window.open(popsite,"",withfeatures)
- win2.blur()
- window.focus()
-}
-if (once_per_session==0) {
- loadpopsite()
-} else {
- loadornot()
-}
--->
-</script>
-</head>
-<body>
-<center>
-<div class="width">
-<hr>
-The http://phpmailer.codeworxtech.com/ website now carries a few
-advertisements through the Google Adsense network to help offset
-some of our costs.<br />
-Thanks ....<br />
-<hr>
-<p><b>My name is Andy Prevost, AKA "codeworxtech".</b><br />
-<a href="http://www.codeworxtech.com";>www.codeworxtech.com</a> for more
information.<br />
-</p>
-<p><strong>WHY USE OUR TOOLS & WHAT'S IN IT FOR YOU?</strong></p>
-<p>A valid question. We're developers too. We've been writing software,
primarily for the internet, for more than 15 years. Along the way, there are
two major things that had tremendous impact of our company: PHP and Open
Source. PHP is without doubt the most popular platform for the internet. There
has been more progress in this area of technology because of Open Source
software than in any other IT segment. We have used many open source tools,
some as learning tools, some as components in projects we were working on. To
us, it's not about popularity ... we're committed to robust, stable, and
efficient tools you can use to get your projects in your user's hands quickly.
So the shorter answer: what's in it for you? rapid development and rapid
deployment without fuss and with straight forward open source licensing.</p>
-<p>Now, the introductions:</p>
-<p>Our company, <strong>Codeworx Technologies</strong>, is the publisher of
several Open Source applications and developer tools as well as several
commercial PHP applications. The Open Source applications are ttCMS and DCP
Portal. The Open Source developer tools include QuickComponents (QuickSkin,
QuickCache, and QuickTabs) and now PHPMailer.
-We have staff and offices in the United States, Canada, Caribbean, the Middle
-East, and our primary development center in India. Our company is represented
by
-agents and resellers globally.</p>
-<p><strong>Codeworx Technologies</strong> is at the forefront of developing
PHP applications. Our staff are all Zend Certified university educated and
experts at object oriented programming. While <strong>Codeworx
Technologies</strong> can handle any project from trouble shooting programs
written by others all the way to finished mission-critical applications, we
specialize in taking projects from inception all the way through to
implementation - on budget, and on time. If you need help with your projects,
we're the team to get it done right at a reasonable price.</p>
-<p>Over the years, there have been a number of tools that have been constant
favorites in all of our projects. We have become the project administrators for
most of these tools.</p>
-<p>Our developer tools are all Open Source. Here's a brief description:</p>
-<ul>
- <li><span style="background-color:
#FFFF00"><strong>PHPMailer</strong></span>. Originally authored by Brent
Matzelle, PHPMailer is the leading "email transfer class" for PHP. PHPMailer is
downloaded more than 18000 times each and every month by developers looking for
a stable, simple email solution. We used it ourselves for years as our favorite
tool. It's always been small (the entire footprint is around 100 Kb),
stable, and as complete a solution as you can find. Other tools are nowhere
near as simple. And more importantly, most of our applications (including
PHPMailer) is implemented in a smaller footprint than one competing email
class. Our thanks to Brent Matzelle for this superb tool - our commitment is to
keep it lean, keep it focused, and compliant with standards. Visit the
PHPMailer website at
- <a
href="http://phpmailer.codeworxtech.com/";>http://phpmailer.codeworxtech.com/</a>.
<br />
- Please note: <strong>all of our focus is now on the PHPMailer for
PHP5.</strong><br />
- <span style="background-color: #FFFF00">PS. While you are at it, please
visit our sponsor's sites, click on their ads.
- It helps offset some of our costs.</span><br />
- Want to help? We're looking for progressive developers to join our team of
volunteer professionals working on PHPMailer. Our entire focus is on PHPMailer
for PHP5, and our next major task is to enhance our
- exception/error handling with PHP 5's object oriented try/throw/catch
mechanisms. If you are interested, let us know.<br />
- <br />
- </li>
- <li><strong><span style="background-color:
#FFFF00">QuickCache</span></strong>. Originally authored by Jean Pierre Deckers
as jpCache, QuickCache is an HTTP OpCode caching strategy that works on your
entire site with only one line of code at the top of your script. The cached
pages can be stored as files or as database objects. The benefits are
absolutely astounding: bandwidth savings of up to 80% and screen display times
increased by 8 - 10x. Visit the QuickCache website at
- <a
href="http://quickcache.codeworxtech.com/";>http://quickcache.codeworxtech.com/</a>.<br
/>
- <br />
- </li>
- <li><strong><span style="background-color:
#FFFF00">QuickSkin</span></strong>. Originally authored by Philipp v. Criegern
and named "SmartTemplate". The project was taken over by Manuel 'EndelWar'
Dalla Lana and now by "codeworxtech". QuickSkin is one of the truly outstanding
templating engines available, but has always been confused with Smarty
Templating Engine. QuickSkin is even more relevant today than when it was
launched. It's a small footprint with big impact on your projects. It
features a built in caching technology, token based substitution, and works on
the concept of one single HTML file as the template. The HTML template file can
contain variable information making it one small powerful tool for your
developer tool kit. Visit the QuickSkin website at
- <a
href="http://quickskin.codeworxtech.com/";>http://quickskin.codeworxtech.com/</a>.<br
/>
- <br />
- </li>
-</ul>
-<p>We're committed to PHP and to the Open Source community.</p>
-<p>Opportunities with <strong>Codeworx Technologies</strong>:</p>
-<ul>
-<li><span style="background-color: #FFFF00">Resellers/Agents</span>: We're
always interested in talking with companies that
-want to represent
-<strong>Codeworx Technologies</strong> in their markets. We also have private
label programs for our commercial products (in certain circumstances).</li>
-<li>Programmers/Developers: We are usually fully staffed, however, if you
would like to be considered for a career with
-<strong>Codeworx Technologies</strong>, we would be pleased to hear from
you.<br />
-A few things to note:<br />
-<ul>
- <li>experience level does not matter: from fresh out of college to
multi-year experience - it's your
- creative mind and a positive attitude we want</li>
- <li>if you contact us looking for employment, include a cover letter,
indicate what type of work/career you are looking for and expected
compensation</li>
- <li>if you are representing someone else looking for work, do not contact
us. We have an exclusive relationship with a recruiting partner already and not
interested in altering the arrangement. We will not hire your candidate under
any circumstances unless they wish to approach us individually.</li>
- <li>any contact that ignores any of these points will be discarded</li>
-</ul></li>
-<li>Affiliates/Partnerships: We are interested in partnering with other firms
who are leaders in their field. We clearly understand that successful companies
are built on successful relationships in all industries world-wide. We
currently have innovative relationships throughout the world that are mutually
beneficial. Drop us a line and let's talk.</li>
-</ul>
-Regards,<br />
-Andy Prevost (aka, codeworxtech)<br />
-<a href="mailto:address@hidden";>address@hidden</a><br />
-<br />
-</div>
-</center>
-</body>
-</html>
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/Callback_function_notes.txt
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/Callback_function_notes.txt
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/Callback_function_notes.txt
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,17 @@
+NEW CALLBACK FUNCTION:
+======================
+
+We have had requests for a method to process the results of sending emails
+through PHPMailer. In this new release, we have implemented a callback
+function that passes the results of each email sent (to, cc, and/or bcc).
+We have provided an example that echos the results back to the screen. The
+callback function can be used for any purpose. With minor modifications, the
+callback function can be used to create CSV logs, post results to databases,
+etc.
+
+Please review the test.php script for the example.
+
+It's pretty straight forward.
+
+Enjoy!
+Andy
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/DomainKeys_notes.txt
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/DomainKeys_notes.txt
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/DomainKeys_notes.txt
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,55 @@
+CREATE DKIM KEYS and DNS Resource Record:
+=========================================
+
+To create DomainKeys Identified Mail keys, visit:
+http://dkim.worxware.com/
+... read the information, fill in the form, and download the ZIP file
+containing the public key, private key, DNS Resource Record and instructions
+to add to your DNS Zone Record, and the PHPMailer code to enable DKIM
+digital signing.
+
+/*** PROTECT YOUR PRIVATE & PUBLIC KEYS ***/
+
+You need to protect your DKIM private and public keys from being viewed or
+accessed. Add protection to your .htaccess file as in this example:
+
+# secure htkeyprivate file
+<Files .htkeyprivate>
+ order allow,deny
+ deny from all
+</Files>
+
+# secure htkeypublic file
+<Files .htkeypublic>
+ order allow,deny
+ deny from all
+</Files>
+
+(the actual .htaccess additions are in the ZIP file sent back to you from
+http://dkim.worxware.com/
+
+A few notes on using DomainKey Identified Mail (DKIM):
+
+You do not need to use PHPMailer to DKIM sign emails IF:
+- you enable DomainKey support and add the DNS resource record
+- you use your outbound mail server
+
+If you are a third-party emailer that works on behalf of domain owners to
+send their emails from your own server:
+- you absolutely have to DKIM sign outbound emails
+- the domain owner has to add the DNS resource record to match the
+ private key, public key, selector, identity, and domain that you create
+- use caution with the "selector" ... at least one "selector" will already
+ exist in the DNS Zone Record of the domain at the domain owner's server
+ you need to ensure that the "selector" you use is unique
+Note: since the IP address will not match the domain owner's DNS Zone record
+you can be certain that email providers that validate based on DomainKey will
+check the domain owner's DNS Zone record for your DNS resource record. Before
+sending out emails on behalf of domain owners, ensure they have entered the
+DNS resource record you provided them.
+
+Enjoy!
+Andy
+
+PS. if you need additional information about DKIM, please see:
+http://www.dkim.org/info/dkim-faq.html
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/Note_for_SMTP_debugging.txt
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/Note_for_SMTP_debugging.txt
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/Note_for_SMTP_debugging.txt
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,23 @@
+If you are having problems connecting or sending emails through your SMTP
server, please note:
+
+1. The new rewrite of class.smtp.php provides more information about the
processing/errors taking place
+2. Use the debug functionality of class.smtp.php. To do that, in your own
script add the debug level you wish to use. An example of that is:
+
+$mail->SMTPDebug = 1;
+$mail->IsSMTP(); // telling the class to use SMTP
+$mail->SMTPAuth = true; // enable SMTP authentication
+$mail->Port = 26; // set the SMTP port
+$mail->Host = "mail.yourhost.com"; // SMTP server
+$mail->Username = "address@hidden"; // SMTP account username
+$mail->Password = "your password"; // SMTP account password
+
+Notes on this:
+$mail->SMTPDebug = 0; ... will disable debugging (you can also leave this out
completely, 0 is the default
+$mail->SMTPDebug = 1; ... will echo errors and messages
+$mail->SMTPDebug = 2; ... will echo messages only
+... and finally, the options are 0, 1, and 2 ... any number greater than 2
will be interpreted as 2
+
+And finally, don't forget to disable debugging before going into production.
+
+Enjoy!
+Andy
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/extending.html
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/extending.html
2009-11-22 16:31:30 UTC (rev 20878)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/extending.html
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,148 +1,148 @@
-<html>
-<head>
-<title>Examples using phpmailer</title>
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<h2>Examples using phpmailer</h2>
-
-<h3>1. Advanced Example</h3>
-<p>
-
-This demonstrates sending out multiple email messages with binary attachments
-from a MySQL database with multipart/alternative support.<p>
-<table cellpadding="4" border="1" width="80%">
-<tr>
-<td bgcolor="#CCCCCC">
-<pre>
-require("class.phpmailer.php");
-
-$mail = new phpmailer();
-
-$mail->From = "address@hidden";
-$mail->FromName = "List manager";
-$mail->Host = "smtp1.example.com;smtp2.example.com";
-$mail->Mailer = "smtp";
-
address@hidden("localhost","root","password");
address@hidden("my_company");
-$query\xA0 =\xA0"SELECT full_name, email,\xA0photo\xA0FROM
employee\xA0WHERE\xA0id=$id";
address@hidden($query);
-
-while ($row = mysql_fetch_array ($result))
-{
- // HTML body
- $body = "Hello <font size=\"4\">" . $row["full_name"] .
"</font>, <p>";
- $body .= "<i>Your</i> personal photograph to this
message.<p>";
- $body .= "Sincerely, <br>";
- $body .= "phpmailer List manager";
-
- // Plain text body (for mail clients that cannot read HTML)
- $text_body = "Hello " . $row["full_name"] . ", \n\n";
- $text_body .= "Your personal photograph to this message.\n\n";
- $text_body .= "Sincerely, \n";
- $text_body .= "phpmailer List manager";
-
- $mail->Body = $body;
- $mail->AltBody = $text_body;
- $mail->AddAddress($row["email"], $row["full_name"]);
- $mail->AddStringAttachment($row["photo"], "YourPhoto.jpg");
-
- if(!$mail->Send())
- echo "There has been a mail error sending to " . $row["email"] .
"<br>";
-
- // Clear all addresses and attachments for next loop
- $mail->ClearAddresses();
- $mail->ClearAttachments();
-}
-</pre>
-</td>
-</tr>
-</table>
-<p>
-
-<h3>2. Extending phpmailer</h3>
-<p>
-
-Extending classes with inheritance is one of the most
-powerful features of object-oriented
-programming. It allows you to make changes to the
-original class for your
-own personal use without hacking the original
-classes. Plus, it is very
-easy to do. I've provided an example:
-
-<p>
-Here's a class that extends the phpmailer class and sets the defaults
-for the particular site:<br>
-PHP include file: <b>mail.inc.php</b>
-<p>
-
-<table cellpadding="4" border="1" width="80%">
-<tr>
-<td bgcolor="#CCCCCC">
-<pre>
-require("class.phpmailer.php");
-
-class my_phpmailer extends phpmailer {
- // Set default variables for all new objects
- var $From = "address@hidden";
- var $FromName = "Mailer";
- var $Host = "smtp1.example.com;smtp2.example.com";
- var $Mailer = "smtp"; // Alternative to IsSMTP()
- var $WordWrap = 75;
-
- // Replace the default error_handler
- function error_handler($msg) {
- print("My Site Error");
- print("Description:");
- printf("%s", $msg);
- exit;
- }
-
- // Create an additional function
- function do_something($something) {
- // Place your new code here
- }
-}
-</td>
-</tr>
-</table>
-<br>
-
-Now here's a normal PHP page in the site, which will have all the defaults set
-above:<br>
-Normal PHP file: <b>mail_test.php</b>
-<p>
-
-<table cellpadding="4" border="1" width="80%">
-<tr>
-<td bgcolor="#CCCCCC">
-<pre>
-require("mail.inc.php");
-
-// Instantiate your new class
-$mail = new my_phpmailer;
-
-// Now you only need to add the necessary stuff
-$mail->AddAddress("address@hidden", "Josh Adams");
-$mail->Subject = "Here is the subject";
-$mail->Body = "This is the message body";
-$mail->AddAttachment("c:/temp/11-10-00.zip", "new_name.zip"); // optional name
-
-if(!$mail->Send())
-{
- echo "There was an error sending the message";
- exit;
-}
-
-echo "Message was sent successfully";
-</pre>
-</td>
-</tr>
-</table>
-</p>
-
-</body>
-</html>
+<html>
+<head>
+<title>Examples using phpmailer</title>
+</head>
+
+<body bgcolor="#FFFFFF">
+
+<h2>Examples using phpmailer</h2>
+
+<h3>1. Advanced Example</h3>
+<p>
+
+This demonstrates sending out multiple email messages with binary attachments
+from a MySQL database with multipart/alternative support.<p>
+<table cellpadding="4" border="1" width="80%">
+<tr>
+<td bgcolor="#CCCCCC">
+<pre>
+require("class.phpmailer.php");
+
+$mail = new phpmailer();
+
+$mail->From = "address@hidden";
+$mail->FromName = "List manager";
+$mail->Host = "smtp1.example.com;smtp2.example.com";
+$mail->Mailer = "smtp";
+
address@hidden("localhost","root","password");
address@hidden("my_company");
+$query\xA0 =\xA0"SELECT full_name, email,\xA0photo\xA0FROM
employee\xA0WHERE\xA0id=$id";
address@hidden($query);
+
+while ($row = mysql_fetch_array ($result))
+{
+ // HTML body
+ $body = "Hello <font size=\"4\">" . $row["full_name"] .
"</font>, <p>";
+ $body .= "<i>Your</i> personal photograph to this
message.<p>";
+ $body .= "Sincerely, <br>";
+ $body .= "phpmailer List manager";
+
+ // Plain text body (for mail clients that cannot read HTML)
+ $text_body = "Hello " . $row["full_name"] . ", \n\n";
+ $text_body .= "Your personal photograph to this message.\n\n";
+ $text_body .= "Sincerely, \n";
+ $text_body .= "phpmailer List manager";
+
+ $mail->Body = $body;
+ $mail->AltBody = $text_body;
+ $mail->AddAddress($row["email"], $row["full_name"]);
+ $mail->AddStringAttachment($row["photo"], "YourPhoto.jpg");
+
+ if(!$mail->Send())
+ echo "There has been a mail error sending to " . $row["email"] .
"<br>";
+
+ // Clear all addresses and attachments for next loop
+ $mail->ClearAddresses();
+ $mail->ClearAttachments();
+}
+</pre>
+</td>
+</tr>
+</table>
+<p>
+
+<h3>2. Extending phpmailer</h3>
+<p>
+
+Extending classes with inheritance is one of the most
+powerful features of object-oriented
+programming. It allows you to make changes to the
+original class for your
+own personal use without hacking the original
+classes. Plus, it is very
+easy to do. I've provided an example:
+
+<p>
+Here's a class that extends the phpmailer class and sets the defaults
+for the particular site:<br>
+PHP include file: <b>mail.inc.php</b>
+<p>
+
+<table cellpadding="4" border="1" width="80%">
+<tr>
+<td bgcolor="#CCCCCC">
+<pre>
+require("class.phpmailer.php");
+
+class my_phpmailer extends phpmailer {
+ // Set default variables for all new objects
+ var $From = "address@hidden";
+ var $FromName = "Mailer";
+ var $Host = "smtp1.example.com;smtp2.example.com";
+ var $Mailer = "smtp"; // Alternative to IsSMTP()
+ var $WordWrap = 75;
+
+ // Replace the default error_handler
+ function error_handler($msg) {
+ print("My Site Error");
+ print("Description:");
+ printf("%s", $msg);
+ exit;
+ }
+
+ // Create an additional function
+ function do_something($something) {
+ // Place your new code here
+ }
+}
+</td>
+</tr>
+</table>
+<br>
+
+Now here's a normal PHP page in the site, which will have all the defaults set
+above:<br>
+Normal PHP file: <b>mail_test.php</b>
+<p>
+
+<table cellpadding="4" border="1" width="80%">
+<tr>
+<td bgcolor="#CCCCCC">
+<pre>
+require("mail.inc.php");
+
+// Instantiate your new class
+$mail = new my_phpmailer;
+
+// Now you only need to add the necessary stuff
+$mail->AddAddress("address@hidden", "Josh Adams");
+$mail->Subject = "Here is the subject";
+$mail->Body = "This is the message body";
+$mail->AddAttachment("c:/temp/11-10-00.zip", "new_name.zip"); // optional name
+
+if(!$mail->Send())
+{
+ echo "There was an error sending the message";
+ exit;
+}
+
+echo "Message was sent successfully";
+</pre>
+</td>
+</tr>
+</table>
+</p>
+
+</body>
+</html>
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/faq.html
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/faq.html
2009-11-22 16:31:30 UTC (rev 20878)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/docs/faq.html
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,5 +1,5 @@
<html>
-<head>
+<head>
<title>PHPMailer FAQ</title>
<style>
body, p {
@@ -11,8 +11,8 @@
text-align: left;
}
</style>
-</head>
-<body bgcolor="#FFFFFF">
+</head>
+<body bgcolor="#FFFFFF">
<center>
<div class="width">
<h2>PHPMailer FAQ</h2>
@@ -57,11 +57,11 @@
A single backslash has a special meaning to PHP so these are not
valid. Instead use double backslashes ("\\") or a single forward
slash ("/").<br /><br /></li>
-
+
</ul>
-
+
</div>
</center>
-
-</body>
-</html>
\ No newline at end of file
+
+</body>
+</html>
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/contents.html
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/contents.html
2009-11-22 16:31:30 UTC (rev 20878)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/contents.html
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,12 +1,20 @@
-<body background="images/bkgrnd.gif" style="margin: 0px;">
+<body style="margin: 10px;">
<div style="width: 640px; font-family: Arial, Helvetica, sans-serif;
font-size: 11px;">
<div align="center"><img src="images/phpmailer.gif" style="height: 90px;
width: 340px"></div><br>
<br>
- This is a test of PHPMailer v2.0.0 rc1.<br>
+ This is a test of PHPMailer.<br>
<br>
This particular example uses <strong>HTML</strong>, with a <div> tag and
inline<br>
styles.<br>
<br>
-Also note the use of the PHPMailer at the top with no specific code to handle
-including it in the body of the email.</div>
+Also note the use of the PHPMailer logo above with no specific code to handle
+including it.<br />
+Included are two attachments:<br />
+phpmailer.gif is an attachment and used inline as a graphic (above)<br />
+phpmailer_mini.gif is an attachment<br />
+<br />
+PHPMailer:<br />
+Author: Andy Prevost (address@hidden)<br />
+Author: Marcus Bointon (address@hidden)<br />
+</div>
</body>
Deleted:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/images/bkgrnd.gif
===================================================================
(Binary files differ)
Deleted:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/images/phpmailer.png
===================================================================
(Binary files differ)
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/index.html
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/index.html
2009-11-22 16:31:30 UTC (rev 20878)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/index.html
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,73 +1,49 @@
-<p>The example file "test_mail.php" contents include:</p>
-<div style="width: 600px; background-color: #CCCCCC;">
-<code>
-<?php<br>
-<br>
-include_once('../class.phpmailer.php');<br>
-<br>
-$mail = new PHPMailer();<br>
-<br>
-$body = $mail->getFile('contents.html');<br>
-<br>
-$body = eregi_replace("[\]",'',$body);<br>
-$subject = eregi_replace("[\]",'',$subject);<br>
-<br>
-$mail->From = "address@hidden";<br>
-$mail->FromName = "First Last";<br>
-<br>
-$mail->Subject = "PHPMailer Test Subject";<br>
-<br>
-$mail->AltBody = "To view the message, please use an HTML compatible email
viewer!"; // optional, comment out and test<br>
-<br>
-$mail->MsgHTML($body);<br>
-<br>
-$mail->AddAddress("address@hidden", "John Doe");<br>
-<br>
-if(!$mail->Send()) {<br>
- echo 'Failed to send mail';<br>
-} else {<br>
- echo 'Mail sent';<br>
-}<br>
-<br>
-?>
-</code>
-</div>
-<br>
-Although you could use full compabitility with PHPMailer 1.7.3, this example
-shows how to use the new features. If you view 'contents.html', you will note
-that there is a background image used in the <body tag as well as an image
used
-with a regular <img tag. Here's what the HTML file looks like:<br>
-<br>
-<div style="width: 600px; background-color: #CCCCCC;">
-<code>
-<body background="images/bkgrnd.gif" style="margin: 0px;"><br>
-<div style="width: 640px; font-family: Arial, Helvetica, sans-serif;
font-size: 11px;"><br>
-<div align="center"><img src="images/phpmailer.gif" style="height:
90px; width: 340px"></div><br><br>
-<br><br>
- This is a test of PHPMailer v2.0.0 rc1.<br><br>
-<br><br>
-This particular example uses <strong>HTML</strong>, with a
<div> tag and inline<br><br>
-styles.<br><br>
-<br><br>
-Also note the use of the PHPMailer at the top with no specific code to
handle<br>
-including it in the body of the email.</div><br>
-</body><br>
-</code>
-</div>
-<br>
-A few things to notice in the PHP script that generates the email:
+This release of PHPMailer (v5.0.0) sets a new milestone in the development
+cycle of PHPMailer. First, class.phpmailer.php has a small footprint (65.7 Kb),
+while class.smtp.php is even smaller than before (at only 25.0 Kb).<br />
+<br />
+We have maintained all functionality and added Exception handling unique to
+PHP 5/6.<br />
+<br />
+There is only one function that has been removed: that is getFile(). The reason
+for this is that getFile() became a wrapper for the PHP function
'file_get_contents()'
+and nothing more. Rather than burden the class with a function already
available
+in PHP, we decided to remove it.<br />
+<br />
+Our new Exception handling provides your own scripts far more power than
ever.<br />
+<br />
+We have also enhanced the "packaging" of PHPMailer with an entirely new set of
+examples. Included are both basic and advanced examples showing how you can
take
+advantage of PHP Exception handling to improve your own scripts.<br />
+<br />
+A few things to note about PHPMailer:
<ul>
<li>the use of $mail->AltBody is completely optional. If not used,
PHPMailer
- will use the HTML text with htmlentities().</li>
- <li>the background= and <img src= images were processed without any
directives
- or methods from the PHP script</li>
- <li>there is no specific code to define the image type ... that is handled
+ will use the HTML text with htmlentities().<br />
+ We also highly recommend using HTML2Text authored by Jon Abernathy. The
class description
+ and download can be viewed at: http://www.chuggnutt.com/html2text.php.
+ </li>
+ <li>there is no specific code to define image or attachment types ... that
is handled
automatically by PHPMailer when it parses the images</li>
- <li>we are using a new class method '$mail->MsgHTML($body)' ... that is what
will handle the parsing of the images and creating the AltBody text</li>
</ul>
-<p>Of course, you can still use PHPMailer the same way you have in the past.
-That provides full compatibility with all existing scripts, while new scripts
-can take advantage of the new features.</p>
-<p>Modify test_mail.php now with your own email address and try it out.</p>
-To see what the email SHOULD look like in your HTML compatible email viewer:
<a href="contents.html">click here</a><br>
-
+A note to users that want to use SMTP with PHPMailer. The most common problems
are:
+<ul>
+ <li>wrong port ... most ISP (Internet Service Providers) will not allow
relaying through
+ their servers. If that's the case with your ISP, try using port 26.
+ </li>
+ <li>wrong authentication information (username and/or password) ... don't
forget that
+ many servers require the account name to be in the format of the full
email address.
+ </li>
+ <li>... if these tips do not get your SMTP settings working, we have a debug
mode
+ for helping you determine the problem. Insert this after
$mail->IsSMTP();<br />
+ $mail->SMTPDebug = 2; // enables SMTP debug information (for testing)<br
/>
+ note that a setting of 2 will display all errors and messages generated by
the SMTP
+ server<br />
+ </li>
+</ul>
+Our examples all use an HTML file in the /examples folder. To see what the
email SHOULD
+look like in your HTML compatible email viewer: <a href="contents.html">click
here</a><br>
+<br />
+From the PHPMailer team:<br />
+Author: Andy Prevost (codeworxtech) address@hidden (and Project
Administrator)<br />
+Author: Marcus Bointon (coolbru) address@hidden<br />
Deleted:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/pop3_before_smtp_test.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/pop3_before_smtp_test.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/pop3_before_smtp_test.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,39 +0,0 @@
-<html>
-<head>
-<title>POP before SMTP Test</title>
-</head>
-
-<body>
-
-<pre>
-<?php
- require 'class.phpmailer.php';
- require 'class.pop3.php';
-
- $pop = new POP3();
- $pop->Authorise('pop3.example.com', 110, 30, 'mailer', 'password', 1);
-
- $mail = new PHPMailer();
-
- $mail->IsSMTP();
- $mail->SMTPDebug = 2;
- $mail->IsHTML(false);
-
- $mail->Host = 'relay.example.com';
-
- $mail->From = 'address@hidden';
- $mail->FromName = 'Example Mailer';
-
- $mail->Subject = 'My subject';
- $mail->Body = 'Hello world';
- $mail->AddAddress('address@hidden', 'First Last');
-
- if (!$mail->Send())
- {
- echo $mail->ErrorInfo;
- }
-?>
-</pre>
-
-</body>
-</html>
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_db_smtp_basic.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_db_smtp_basic.php
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_db_smtp_basic.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,58 @@
+<html>
+<head>
+<title>PHPMailer - MySQL Database - SMTP basic test with authentication</title>
+</head>
+<body>
+
+<?php
+
+//error_reporting(E_ALL);
+error_reporting(E_STRICT);
+
+date_default_timezone_set('America/Toronto');
+
+require_once('../class.phpmailer.php');
+//include("class.smtp.php"); // optional, gets called from within
class.phpmailer.php if not already loaded
+
+$mail = new PHPMailer();
+
+$body = file_get_contents('contents.html');
+$body = eregi_replace("[\]",'',$body);
+
+$mail->IsSMTP(); // telling the class to use SMTP
+$mail->Host = "smtp1.site.com;smtp2.site.com";
+$mail->SMTPAuth = true; // enable SMTP authentication
+$mail->SMTPKeepAlive = true; // SMTP connection will not
close after each email sent
+$mail->Host = "mail.yourdomain.com"; // sets the SMTP server
+$mail->Port = 26; // set the SMTP port for the
GMAIL server
+$mail->Username = "address@hidden"; // SMTP account username
+$mail->Password = "yourpassword"; // SMTP account password
+$mail->SetFrom('address@hidden', 'List manager');
+$mail->AddReplyTo('address@hidden', 'List manager');
+
+$mail->Subject = "PHPMailer Test Subject via smtp, basic with
authentication";
+
address@hidden("localhost","root","password");
address@hidden("my_company");
+$query = "SELECT full_name, email, photo FROM employee WHERE id=$id";
+$result = @MYSQL_QUERY($query);
+
+while ($row = mysql_fetch_array ($result)) {
+ $mail->AltBody = "To view the message, please use an HTML compatible
email viewer!"; // optional, comment out and test
+ $mail->MsgHTML($body);
+ $mail->AddAddress($row["email"], $row["full_name"]);
+ $mail->AddStringAttachment($row["photo"], "YourPhoto.jpg");
+
+ if(!$mail->Send()) {
+ echo "Mailer Error (" . str_replace("@", "@", $row["email"]) . ') ' .
$mail->ErrorInfo . '<br />';
+ } else {
+ echo "Message sent to :" . $row["full_name"] . ' (' . str_replace("@",
"@", $row["email"]) . ')<br />';
+ }
+ // Clear all addresses and attachments for next loop
+ $mail->ClearAddresses();
+ $mail->ClearAttachments();
+}
+?>
+
+</body>
+</html>
Deleted:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_gmail.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_gmail.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_gmail.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,50 +0,0 @@
-<?php
-
-//error_reporting(E_ALL);
-error_reporting(E_STRICT);
-
-date_default_timezone_set('America/Toronto');
-
-include("class.phpmailer.php");
-//include("class.smtp.php"); // optional, gets called from within
class.phpmailer.php if not already loaded
-
-$mail = new PHPMailer();
-
-$body = $mail->getFile('contents.html');
-$body = eregi_replace("[\]",'',$body);
-
-$mail->IsSMTP();
-$mail->SMTPAuth = true; // enable SMTP authentication
-$mail->SMTPSecure = "ssl"; // sets the prefix to the servier
-$mail->Host = "smtp.gmail.com"; // sets GMAIL as the SMTP server
-$mail->Port = 465; // set the SMTP port for the GMAIL
server
-
-$mail->Username = "address@hidden"; // GMAIL username
-$mail->Password = "yourpassword"; // GMAIL password
-
-$mail->AddReplyTo("address@hidden","First Last");
-
-$mail->From = "address@hidden";
-$mail->FromName = "First Last";
-
-$mail->Subject = "PHPMailer Test Subject via gmail";
-
-//$mail->Body = "Hi,<br>This is the HTML BODY<br>";
//HTML Body
-$mail->AltBody = "To view the message, please use an HTML compatible email
viewer!"; // optional, comment out and test
-$mail->WordWrap = 50; // set word wrap
-
-$mail->MsgHTML($body);
-
-$mail->AddAddress("address@hidden", "John Doe");
-
-$mail->AddAttachment("images/phpmailer.gif"); // attachment
-
-$mail->IsHTML(true); // send as HTML
-
-if(!$mail->Send()) {
- echo "Mailer Error: " . $mail->ErrorInfo;
-} else {
- echo "Message sent!";
-}
-
-?>
Deleted:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_mail.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_mail.php
2009-11-22 16:31:30 UTC (rev 20878)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_mail.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,29 +0,0 @@
-<?php
-
-include_once('../class.phpmailer.php');
-
-$mail = new PHPMailer(); // defaults to using php "mail()"
-
-$body = $mail->getFile('contents.html');
-$body = eregi_replace("[\]",'',$body);
-
-$mail->From = "address@hidden";
-$mail->FromName = "First Last";
-
-$mail->Subject = "PHPMailer Test Subject via mail()";
-
-$mail->AltBody = "To view the message, please use an HTML compatible email
viewer!"; // optional, comment out and test
-
-$mail->MsgHTML($body);
-
-$mail->AddAddress("address@hidden", "John Doe");
-
-$mail->AddAttachment("images/phpmailer.gif"); // attachment
-
-if(!$mail->Send()) {
- echo "Mailer Error: " . $mail->ErrorInfo;
-} else {
- echo "Message sent!";
-}
-
-?>
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_mail_advanced.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_mail_advanced.php
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_mail_advanced.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,31 @@
+<html>
+<head>
+<title>PHPMailer - Mail() advanced test</title>
+</head>
+<body>
+
+<?php
+require_once '../class.phpmailer.php';
+
+$mail = new PHPMailer(true); //defaults to using php "mail()"; the true param
means it will throw exceptions on errors, which we need to catch
+
+try {
+ $mail->AddReplyTo('address@hidden', 'First Last');
+ $mail->AddAddress('address@hidden', 'John Doe');
+ $mail->SetFrom('address@hidden', 'First Last');
+ $mail->AddReplyTo('address@hidden', 'First Last');
+ $mail->Subject = 'PHPMailer Test Subject via mail(), advanced';
+ $mail->AltBody = 'To view the message, please use an HTML compatible email
viewer!'; // optional - MsgHTML will create an alternate automatically
+ $mail->MsgHTML(file_get_contents('contents.html'));
+ $mail->AddAttachment('images/phpmailer.gif'); // attachment
+ $mail->AddAttachment('images/phpmailer_mini.gif'); // attachment
+ $mail->Send();
+ echo "Message Sent OK</p>\n";
+} catch (phpmailerException $e) {
+ echo $e->errorMessage(); //Pretty error messages from PHPMailer
+} catch (Exception $e) {
+ echo $e->getMessage(); //Boring error messages from anything else!
+}
+?>
+</body>
+</html>
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_mail_basic.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_mail_basic.php
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_mail_basic.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,43 @@
+<html>
+<head>
+<title>PHPMailer - Mail() basic test</title>
+</head>
+<body>
+
+<?php
+
+require_once('../class.phpmailer.php');
+
+$mail = new PHPMailer(); // defaults to using php "mail()"
+
+$body = file_get_contents('contents.html');
+$body = eregi_replace("[\]",'',$body);
+
+$mail->AddReplyTo("address@hidden","First Last");
+
+$mail->SetFrom('address@hidden', 'First Last');
+
+$mail->AddReplyTo("address@hidden","First Last");
+
+$address = "address@hidden";
+$mail->AddAddress($address, "John Doe");
+
+$mail->Subject = "PHPMailer Test Subject via mail(), basic";
+
+$mail->AltBody = "To view the message, please use an HTML compatible email
viewer!"; // optional, comment out and test
+
+$mail->MsgHTML($body);
+
+$mail->AddAttachment("images/phpmailer.gif"); // attachment
+$mail->AddAttachment("images/phpmailer_mini.gif"); // attachment
+
+if(!$mail->Send()) {
+ echo "Mailer Error: " . $mail->ErrorInfo;
+} else {
+ echo "Message sent!";
+}
+
+?>
+
+</body>
+</html>
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_pop_before_smtp_advanced.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_pop_before_smtp_advanced.php
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_pop_before_smtp_advanced.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,40 @@
+<html>
+<head>
+<title>POP before SMTP Test</title>
+</head>
+<body>
+
+<?php
+require_once('../class.phpmailer.php');
+require_once('../class.pop3.php'); // required for POP before SMTP
+
+$pop = new POP3();
+$pop->Authorise('pop3.yourdomain.com', 110, 30, 'username', 'password', 1);
+
+$mail = new PHPMailer(true); // the true param means it will throw exceptions
on errors, which we need to catch
+
+$mail->IsSMTP();
+
+try {
+ $mail->SMTPDebug = 2;
+ $mail->Host = 'pop3.yourdomain.com';
+ $mail->AddReplyTo('address@hidden', 'First Last');
+ $mail->AddAddress('address@hidden', 'John Doe');
+ $mail->SetFrom('address@hidden', 'First Last');
+ $mail->AddReplyTo('address@hidden', 'First Last');
+ $mail->Subject = 'PHPMailer Test Subject via mail(), advanced';
+ $mail->AltBody = 'To view the message, please use an HTML compatible email
viewer!'; // optional - MsgHTML will create an alternate automatically
+ $mail->MsgHTML(file_get_contents('contents.html'));
+ $mail->AddAttachment('images/phpmailer.gif'); // attachment
+ $mail->AddAttachment('images/phpmailer_mini.gif'); // attachment
+ $mail->Send();
+ echo "Message Sent OK</p>\n";
+} catch (phpmailerException $e) {
+ echo $e->errorMessage(); //Pretty error messages from PHPMailer
+} catch (Exception $e) {
+ echo $e->getMessage(); //Boring error messages from anything else!
+}
+?>
+
+</body>
+</html>
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_pop_before_smtp_basic.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_pop_before_smtp_basic.php
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_pop_before_smtp_basic.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,49 @@
+<html>
+<head>
+<title>POP before SMTP Test</title>
+</head>
+<body>
+
+<?php
+require_once('../class.phpmailer.php');
+require_once('../class.pop3.php'); // required for POP before SMTP
+
+$pop = new POP3();
+$pop->Authorise('pop3.yourdomain.com', 110, 30, 'username', 'password', 1);
+
+$mail = new PHPMailer();
+
+$body = file_get_contents('contents.html');
+$body = eregi_replace("[\]",'',$body);
+
+$mail->IsSMTP();
+$mail->SMTPDebug = 2;
+$mail->Host = 'pop3.yourdomain.com';
+
+$mail->SetFrom('address@hidden', 'First Last');
+
+$mail->AddReplyTo("address@hidden","First Last");
+
+$mail->Subject = "PHPMailer Test Subject via POP before SMTP, basic";
+
+$mail->AltBody = "To view the message, please use an HTML compatible email
viewer!"; // optional, comment out and test
+
+$mail->MsgHTML($body);
+
+$address = "address@hidden";
+$mail->AddAddress($address, "John Doe");
+
+$mail->AddAttachment("images/phpmailer.gif"); // attachment
+$mail->AddAttachment("images/phpmailer_mini.gif"); // attachment
+
+
+if(!$mail->Send()) {
+ echo "Mailer Error: " . $mail->ErrorInfo;
+} else {
+ echo "Message sent!";
+}
+
+?>
+
+</body>
+</html>
Deleted:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_sendmail.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_sendmail.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_sendmail.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,37 +0,0 @@
-<?php
-
-//error_reporting(E_ALL);
-error_reporting(E_STRICT);
-
-
-date_default_timezone_set('America/Toronto');
-//date_default_timezone_set(date_default_timezone_get());
-
-include_once('class.phpmailer.php');
-
-$mail = new PHPMailer();
-$body = $mail->getFile('contents.html');
-$body = eregi_replace("[\]",'',$body);
-
-$mail->IsSendmail(); // telling the class to use SendMail transport
-
-$mail->From = "address@hidden";
-$mail->FromName = "First Last";
-
-$mail->Subject = "PHPMailer Test Subject via smtp";
-
-$mail->AltBody = "To view the message, please use an HTML compatible email
viewer!"; // optional, comment out and test
-
-$mail->MsgHTML($body);
-
-$mail->AddAddress("address@hidden", "John Doe");
-
-$mail->AddAttachment("images/phpmailer.gif"); // attachment
-
-if(!$mail->Send()) {
- echo "Mailer Error: " . $mail->ErrorInfo;
-} else {
- echo "Message sent!";
-}
-
-?>
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_sendmail_advanced.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_sendmail_advanced.php
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_sendmail_advanced.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,34 @@
+<html>
+<head>
+<title>PHPMailer - Sendmail advanced test</title>
+</head>
+<body>
+
+<?php
+
+require_once('../class.phpmailer.php');
+
+$mail = new PHPMailer(true); // the true param means it will throw exceptions
on errors, which we need to catch
+$mail->IsSendmail(); // telling the class to use SendMail transport
+
+try {
+ $mail->AddReplyTo('address@hidden', 'First Last');
+ $mail->AddAddress('address@hidden', 'John Doe');
+ $mail->SetFrom('address@hidden', 'First Last');
+ $mail->AddReplyTo('address@hidden', 'First Last');
+ $mail->Subject = 'PHPMailer Test Subject via mail(), advanced';
+ $mail->AltBody = 'To view the message, please use an HTML compatible email
viewer!'; // optional - MsgHTML will create an alternate automatically
+ $mail->MsgHTML(file_get_contents('contents.html'));
+ $mail->AddAttachment('images/phpmailer.gif'); // attachment
+ $mail->AddAttachment('images/phpmailer_mini.gif'); // attachment
+ $mail->Send();
+ echo "Message Sent OK</p>\n";
+} catch (phpmailerException $e) {
+ echo $e->errorMessage(); //Pretty error messages from PHPMailer
+} catch (Exception $e) {
+ echo $e->getMessage(); //Boring error messages from anything else!
+}
+?>
+
+</body>
+</html>
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_sendmail_basic.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_sendmail_basic.php
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_sendmail_basic.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,45 @@
+<html>
+<head>
+<title>PHPMailer - Sendmail basic test</title>
+</head>
+<body>
+
+<?php
+
+require_once('../class.phpmailer.php');
+
+$mail = new PHPMailer(); // defaults to using php "mail()"
+
+$mail->IsSendmail(); // telling the class to use SendMail transport
+
+$body = file_get_contents('contents.html');
+$body = eregi_replace("[\]",'',$body);
+
+$mail->AddReplyTo("address@hidden","First Last");
+
+$mail->SetFrom('address@hidden', 'First Last');
+
+$mail->AddReplyTo("address@hidden","First Last");
+
+$address = "address@hidden";
+$mail->AddAddress($address, "John Doe");
+
+$mail->Subject = "PHPMailer Test Subject via Sendmail, basic";
+
+$mail->AltBody = "To view the message, please use an HTML compatible email
viewer!"; // optional, comment out and test
+
+$mail->MsgHTML($body);
+
+$mail->AddAttachment("images/phpmailer.gif"); // attachment
+$mail->AddAttachment("images/phpmailer_mini.gif"); // attachment
+
+if(!$mail->Send()) {
+ echo "Mailer Error: " . $mail->ErrorInfo;
+} else {
+ echo "Message sent!";
+}
+
+?>
+
+</body>
+</html>
Deleted:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp.php
2009-11-22 16:31:30 UTC (rev 20878)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,39 +0,0 @@
-<?php
-
-//error_reporting(E_ALL);
-error_reporting(E_STRICT);
-
-date_default_timezone_set('America/Toronto');
-//date_default_timezone_set(date_default_timezone_get());
-
-include_once('class.phpmailer.php');
-//include("class.smtp.php"); // optional, gets called from within
class.phpmailer.php if not already loaded
-
-$mail = new PHPMailer();
-
-$body = $mail->getFile('contents.html');
-$body = eregi_replace("[\]",'',$body);
-
-$mail->IsSMTP(); // telling the class to use SMTP
-$mail->Host = "mail.worxteam.com"; // SMTP server
-
-$mail->From = "address@hidden";
-$mail->FromName = "First Last";
-
-$mail->Subject = "PHPMailer Test Subject via smtp";
-
-$mail->AltBody = "To view the message, please use an HTML compatible email
viewer!"; // optional, comment out and test
-
-$mail->MsgHTML($body);
-
-$mail->AddAddress("address@hidden", "John Doe");
-
-$mail->AddAttachment("images/phpmailer.gif"); // attachment
-
-if(!$mail->Send()) {
- echo "Mailer Error: " . $mail->ErrorInfo;
-} else {
- echo "Message sent!";
-}
-
-?>
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_advanced.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_advanced.php
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_advanced.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,43 @@
+<html>
+<head>
+<title>PHPMailer - SMTP advanced test with authentication</title>
+</head>
+<body>
+
+<?php
+
+require_once('../class.phpmailer.php');
+//include("class.smtp.php"); // optional, gets called from within
class.phpmailer.php if not already loaded
+
+$mail = new PHPMailer(true); // the true param means it will throw exceptions
on errors, which we need to catch
+
+$mail->IsSMTP(); // telling the class to use SMTP
+
+try {
+ $mail->Host = "mail.yourdomain.com"; // SMTP server
+ $mail->SMTPDebug = 2; // enables SMTP debug information
(for testing)
+ $mail->SMTPAuth = true; // enable SMTP authentication
+ $mail->Host = "mail.yourdomain.com"; // sets the SMTP server
+ $mail->Port = 26; // set the SMTP port for the
GMAIL server
+ $mail->Username = "address@hidden"; // SMTP account username
+ $mail->Password = "yourpassword"; // SMTP account password
+ $mail->AddReplyTo('address@hidden', 'First Last');
+ $mail->AddAddress('address@hidden', 'John Doe');
+ $mail->SetFrom('address@hidden', 'First Last');
+ $mail->AddReplyTo('address@hidden', 'First Last');
+ $mail->Subject = 'PHPMailer Test Subject via mail(), advanced';
+ $mail->AltBody = 'To view the message, please use an HTML compatible email
viewer!'; // optional - MsgHTML will create an alternate automatically
+ $mail->MsgHTML(file_get_contents('contents.html'));
+ $mail->AddAttachment('images/phpmailer.gif'); // attachment
+ $mail->AddAttachment('images/phpmailer_mini.gif'); // attachment
+ $mail->Send();
+ echo "Message Sent OK</p>\n";
+} catch (phpmailerException $e) {
+ echo $e->errorMessage(); //Pretty error messages from PHPMailer
+} catch (Exception $e) {
+ echo $e->getMessage(); //Boring error messages from anything else!
+}
+?>
+
+</body>
+</html>
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_advanced_no_auth.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_advanced_no_auth.php
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_advanced_no_auth.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,37 @@
+<html>
+<head>
+<title>PHPMailer - SMTP advanced test with no authentication</title>
+</head>
+<body>
+
+<?php
+require_once('../class.phpmailer.php');
+//include("class.smtp.php"); // optional, gets called from within
class.phpmailer.php if not already loaded
+
+$mail = new PHPMailer(true); // the true param means it will throw exceptions
on errors, which we need to catch
+
+$mail->IsSMTP(); // telling the class to use SMTP
+
+try {
+ $mail->Host = "mail.yourdomain.com"; // SMTP server
+ $mail->SMTPDebug = 2; // enables SMTP debug information
(for testing)
+ $mail->AddReplyTo('address@hidden', 'First Last');
+ $mail->AddAddress('address@hidden', 'John Doe');
+ $mail->SetFrom('address@hidden', 'First Last');
+ $mail->AddReplyTo('address@hidden', 'First Last');
+ $mail->Subject = 'PHPMailer Test Subject via mail(), advanced';
+ $mail->AltBody = 'To view the message, please use an HTML compatible email
viewer!'; // optional - MsgHTML will create an alternate automatically
+ $mail->MsgHTML(file_get_contents('contents.html'));
+ $mail->AddAttachment('images/phpmailer.gif'); // attachment
+ $mail->AddAttachment('images/phpmailer_mini.gif'); // attachment
+ $mail->Send();
+ echo "Message Sent OK</p>\n";
+} catch (phpmailerException $e) {
+ echo $e->errorMessage(); //Pretty error messages from PHPMailer
+} catch (Exception $e) {
+ echo $e->getMessage(); //Boring error messages from anything else!
+}
+?>
+
+</body>
+</html>
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_basic.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_basic.php
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_basic.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,58 @@
+<html>
+<head>
+<title>PHPMailer - SMTP basic test with authentication</title>
+</head>
+<body>
+
+<?php
+
+//error_reporting(E_ALL);
+error_reporting(E_STRICT);
+
+date_default_timezone_set('America/Toronto');
+
+require_once('../class.phpmailer.php');
+//include("class.smtp.php"); // optional, gets called from within
class.phpmailer.php if not already loaded
+
+$mail = new PHPMailer();
+
+$body = file_get_contents('contents.html');
+$body = eregi_replace("[\]",'',$body);
+
+$mail->IsSMTP(); // telling the class to use SMTP
+$mail->Host = "mail.yourdomain.com"; // SMTP server
+$mail->SMTPDebug = 2; // enables SMTP debug information
(for testing)
+ // 1 = errors and messages
+ // 2 = messages only
+$mail->SMTPAuth = true; // enable SMTP authentication
+$mail->Host = "mail.yourdomain.com"; // sets the SMTP server
+$mail->Port = 26; // set the SMTP port for the GMAIL
server
+$mail->Username = "address@hidden"; // SMTP account username
+$mail->Password = "yourpassword"; // SMTP account password
+
+$mail->SetFrom('address@hidden', 'First Last');
+
+$mail->AddReplyTo("address@hidden","First Last");
+
+$mail->Subject = "PHPMailer Test Subject via smtp, basic with
authentication";
+
+$mail->AltBody = "To view the message, please use an HTML compatible email
viewer!"; // optional, comment out and test
+
+$mail->MsgHTML($body);
+
+$address = "address@hidden";
+$mail->AddAddress($address, "John Doe");
+
+$mail->AddAttachment("images/phpmailer.gif"); // attachment
+$mail->AddAttachment("images/phpmailer_mini.gif"); // attachment
+
+if(!$mail->Send()) {
+ echo "Mailer Error: " . $mail->ErrorInfo;
+} else {
+ echo "Message sent!";
+}
+
+?>
+
+</body>
+</html>
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_basic_no_auth.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_basic_no_auth.php
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_basic_no_auth.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,53 @@
+<html>
+<head>
+<title>PHPMailer - SMTP basic test with no authentication</title>
+</head>
+<body>
+
+<?php
+
+//error_reporting(E_ALL);
+error_reporting(E_STRICT);
+
+date_default_timezone_set('America/Toronto');
+
+require_once('../class.phpmailer.php');
+//include("class.smtp.php"); // optional, gets called from within
class.phpmailer.php if not already loaded
+
+$mail = new PHPMailer();
+
+$body = file_get_contents('contents.html');
+$body = eregi_replace("[\]",'',$body);
+
+$mail->IsSMTP(); // telling the class to use SMTP
+$mail->Host = "mail.yourdomain.com"; // SMTP server
+$mail->SMTPDebug = 2; // enables SMTP debug information
(for testing)
+ // 1 = errors and messages
+ // 2 = messages only
+
+$mail->SetFrom('address@hidden', 'First Last');
+
+$mail->AddReplyTo("address@hidden","First Last");
+
+$mail->Subject = "PHPMailer Test Subject via smtp, basic with no
authentication";
+
+$mail->AltBody = "To view the message, please use an HTML compatible email
viewer!"; // optional, comment out and test
+
+$mail->MsgHTML($body);
+
+$address = "address@hidden";
+$mail->AddAddress($address, "John Doe");
+
+$mail->AddAttachment("images/phpmailer.gif"); // attachment
+$mail->AddAttachment("images/phpmailer_mini.gif"); // attachment
+
+if(!$mail->Send()) {
+ echo "Mailer Error: " . $mail->ErrorInfo;
+} else {
+ echo "Message sent!";
+}
+
+?>
+
+</body>
+</html>
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_gmail_advanced.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_gmail_advanced.php
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_gmail_advanced.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,43 @@
+<html>
+<head>
+<title>PHPMailer - SMTP (Gmail) advanced test</title>
+</head>
+<body>
+
+<?php
+require_once('../class.phpmailer.php');
+//include("class.smtp.php"); // optional, gets called from within
class.phpmailer.php if not already loaded
+
+$mail = new PHPMailer(true); // the true param means it will throw exceptions
on errors, which we need to catch
+
+$mail->IsSMTP(); // telling the class to use SMTP
+
+try {
+ $mail->Host = "mail.yourdomain.com"; // SMTP server
+ $mail->SMTPDebug = 2; // enables SMTP debug information
(for testing)
+ $mail->SMTPAuth = true; // enable SMTP authentication
+ $mail->SMTPSecure = "ssl"; // sets the prefix to the servier
+ $mail->Host = "smtp.gmail.com"; // sets GMAIL as the SMTP server
+ $mail->Port = 465; // set the SMTP port for the
GMAIL server
+ $mail->Username = "address@hidden"; // GMAIL username
+ $mail->Password = "yourpassword"; // GMAIL password
+ $mail->AddReplyTo('address@hidden', 'First Last');
+ $mail->AddAddress('address@hidden', 'John Doe');
+ $mail->SetFrom('address@hidden', 'First Last');
+ $mail->AddReplyTo('address@hidden', 'First Last');
+ $mail->Subject = 'PHPMailer Test Subject via mail(), advanced';
+ $mail->AltBody = 'To view the message, please use an HTML compatible email
viewer!'; // optional - MsgHTML will create an alternate automatically
+ $mail->MsgHTML(file_get_contents('contents.html'));
+ $mail->AddAttachment('images/phpmailer.gif'); // attachment
+ $mail->AddAttachment('images/phpmailer_mini.gif'); // attachment
+ $mail->Send();
+ echo "Message Sent OK</p>\n";
+} catch (phpmailerException $e) {
+ echo $e->errorMessage(); //Pretty error messages from PHPMailer
+} catch (Exception $e) {
+ echo $e->getMessage(); //Boring error messages from anything else!
+}
+?>
+
+</body>
+</html>
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_gmail_basic.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_gmail_basic.php
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/examples/test_smtp_gmail_basic.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,59 @@
+<html>
+<head>
+<title>PHPMailer - SMTP (Gmail) basic test</title>
+</head>
+<body>
+
+<?php
+
+//error_reporting(E_ALL);
+error_reporting(E_STRICT);
+
+date_default_timezone_set('America/Toronto');
+
+require_once('../class.phpmailer.php');
+//include("class.smtp.php"); // optional, gets called from within
class.phpmailer.php if not already loaded
+
+$mail = new PHPMailer();
+
+$body = file_get_contents('contents.html');
+$body = eregi_replace("[\]",'',$body);
+
+$mail->IsSMTP(); // telling the class to use SMTP
+$mail->Host = "mail.yourdomain.com"; // SMTP server
+$mail->SMTPDebug = 2; // enables SMTP debug information
(for testing)
+ // 1 = errors and messages
+ // 2 = messages only
+$mail->SMTPAuth = true; // enable SMTP authentication
+$mail->SMTPSecure = "ssl"; // sets the prefix to the servier
+$mail->Host = "smtp.gmail.com"; // sets GMAIL as the SMTP server
+$mail->Port = 465; // set the SMTP port for the GMAIL
server
+$mail->Username = "address@hidden"; // GMAIL username
+$mail->Password = "yourpassword"; // GMAIL password
+
+$mail->SetFrom('address@hidden', 'First Last');
+
+$mail->AddReplyTo("address@hidden","First Last");
+
+$mail->Subject = "PHPMailer Test Subject via smtp (Gmail), basic";
+
+$mail->AltBody = "To view the message, please use an HTML compatible email
viewer!"; // optional, comment out and test
+
+$mail->MsgHTML($body);
+
+$address = "address@hidden";
+$mail->AddAddress($address, "John Doe");
+
+$mail->AddAttachment("images/phpmailer.gif"); // attachment
+$mail->AddAttachment("images/phpmailer_mini.gif"); // attachment
+
+if(!$mail->Send()) {
+ echo "Mailer Error: " . $mail->ErrorInfo;
+} else {
+ echo "Message sent!";
+}
+
+?>
+
+</body>
+</html>
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ar.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ar.php
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ar.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,27 @@
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Arabic Version, UTF-8
+* by : bahjat al mostafa <address@hidden>
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'SMTP Error: لم نستطع تأكيد الهوية.';
+$PHPMAILER_LANG['connect_host'] = 'SMTP Error: لم نستطع الاتصال بمخدم
SMTP.';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: لم يتم قبول المعلومات
.';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'ترميز غير معروف: ';
+$PHPMAILER_LANG['execute'] = 'لم أستطع تنفيذ : ';
+$PHPMAILER_LANG['file_access'] = 'لم نستطع الوصول للملف: ';
+$PHPMAILER_LANG['file_open'] = 'File Error: لم نستطع فتح الملف: ';
+$PHPMAILER_LANG['from_failed'] = 'البريد التالي لم نستطع ارسال البريد
له : ';
+$PHPMAILER_LANG['instantiate'] = 'لم نستطع توفير خدمة البريد.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer غير مدعوم.';
+//$PHPMAILER_LANG['provide_address'] = 'You must provide at least one
recipient email address.';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: الأخطاء التالية ' .
+ 'فشل في الارسال لكل من : ';
+$PHPMAILER_LANG['signing'] = 'خطأ في التوقيع: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
+?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-br.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-br.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-br.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,24 +1,26 @@
-<?php
-/**
- * PHPMailer language file.
- * Portuguese Version
- * By Paulo Henrique Garcia - address@hidden
- */
-
-$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: ';
-
-?>
-
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Portuguese Version
+* By Paulo Henrique Garcia - address@hidden
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'Erro de SMTP: Não foi possível
autenticar.';
+$PHPMAILER_LANG['connect_host'] = 'Erro de SMTP: Não foi possível
conectar com o servidor SMTP.';
+$PHPMAILER_LANG['data_not_accepted'] = 'Erro de SMTP: Dados não aceitos.';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'Codificação desconhecida: ';
+$PHPMAILER_LANG['execute'] = 'Não foi possível executar: ';
+$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['from_failed'] = 'Os endereços de rementente a seguir
falharam: ';
+$PHPMAILER_LANG['instantiate'] = 'Não foi possível instanciar a
função mail.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer não suportado.';
+$PHPMAILER_LANG['provide_address'] = 'Você deve fornecer pelo menos um
endereço de destinatário de email.';
+$PHPMAILER_LANG['recipients_failed'] = 'Erro de SMTP: Os endereços de
destinatário a seguir falharam: ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
+?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ca.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ca.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ca.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,24 +1,26 @@
-<?php
-/**
- * PHPMailer language file.
- * Catalan Version
- * By Ivan: web AT microstudi DOT com
- */
-
-$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: ';
-
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Catalan Version
+* By Ivan: web AT microstudi DOT com
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'Error SMTP: No s\'hapogut
autenticar.';
+$PHPMAILER_LANG['connect_host'] = 'Error SMTP: No es pot connectar al
servidor SMTP.';
+$PHPMAILER_LANG['data_not_accepted'] = 'Error SMTP: Dades no acceptades.';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'Codificació desconeguda: ';
+$PHPMAILER_LANG['execute'] = 'No es pot executar: ';
+$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['from_failed'] = 'La(s) següent(s) adreces de
remitent han fallat: ';
+$PHPMAILER_LANG['instantiate'] = 'No s\'ha pogut crear una instància
de la funció Mail.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer no està suportat';
+$PHPMAILER_LANG['provide_address'] = 'S\'ha de proveir almenys una adreça
d\'email com a destinatari.';
+$PHPMAILER_LANG['recipients_failed'] = 'Error SMTP: Els següents
destinataris han fallat: ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
?>
\ No newline at end of file
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ch.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ch.php
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ch.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,26 @@
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Chinese Version
+* By LiuXin: www.80x86.cn/blog/
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'SMTP 错误：身份验证失败。';
+$PHPMAILER_LANG['connect_host'] = 'SMTP 错误: 不能连接SMTP主机。';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP 错误: 数据不可接受。';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = '未知编码：';
+$PHPMAILER_LANG['execute'] = '不能执行: ';
+$PHPMAILER_LANG['file_access'] = '不能访问文件：';
+$PHPMAILER_LANG['file_open'] = '文件错误：不能打开文件：';
+$PHPMAILER_LANG['from_failed'] = '下面的发送地址邮件发送失败了： ';
+$PHPMAILER_LANG['instantiate'] = '不能实现mail方法。';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' 您所选择的发送邮件的方法并不支持。';
+$PHPMAILER_LANG['provide_address'] = '您必须提供至少一个 收信人的email地址。';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP 错误： 下面的 收件人失败了： ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
+?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-cz.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-cz.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-cz.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,26 +1,25 @@
-<?php
-/**
- * PHPMailer language file.
- * Czech Version
- */
-
-$PHPMAILER_LANG = array();
-
-$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["data_not_accepted"] = 'SMTP Error: Data nebyla pøijata';
-$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: ';
-
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Czech Version
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'SMTP Error: Chyba autentikace.';
+$PHPMAILER_LANG['connect_host'] = 'SMTP Error: Nelze navázat spojení
se SMTP serverem.';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: Data nebyla pøijata';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'Neznámé kódování: ';
+$PHPMAILER_LANG['execute'] = 'Nelze provést: ';
+$PHPMAILER_LANG['file_access'] = 'Soubor nenalezen: ';
+$PHPMAILER_LANG['file_open'] = 'File Error: Nelze otevøít soubor
pro ètení: ';
+$PHPMAILER_LANG['from_failed'] = 'Následující adresa From je
nesprávná: ';
+$PHPMAILER_LANG['instantiate'] = 'Nelze vytvoøit instanci emailové
funkce.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailový klient není podporován.';
+$PHPMAILER_LANG['provide_address'] = 'Musíte zadat alespoò jednu
emailovou adresu pøíjemce.';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: Adresy pøíjemcù nejsou
správné ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-de.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-de.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-de.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,27 +1,25 @@
-<?php
-/**
- * PHPMailer language file.
- * German Version
- * Thanks to Yann-Patrick Schlame for the latest update!
- */
-
-$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: ';
-
-?>
-
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* German Version
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'SMTP Fehler: Authentifizierung
fehlgeschlagen.';
+$PHPMAILER_LANG['connect_host'] = 'SMTP Fehler: Konnte keine
Verbindung zum SMTP-Host herstellen.';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Fehler: Daten werden nicht
akzeptiert.';
+$PHPMAILER_LANG['empty_message'] = 'E-Mail Inhalt ist leer.';
+$PHPMAILER_LANG['encoding'] = 'Unbekanntes Encoding-Format: ';
+$PHPMAILER_LANG['execute'] = 'Konnte folgenden Befehl nicht
ausführen: ';
+$PHPMAILER_LANG['file_access'] = 'Zugriff auf folgende Datei
fehlgeschlagen: ';
+$PHPMAILER_LANG['file_open'] = 'Datei Fehler: konnte folgende Datei
nicht öffnen: ';
+$PHPMAILER_LANG['from_failed'] = 'Die folgende Absenderadresse ist
nicht korrekt: ';
+$PHPMAILER_LANG['instantiate'] = 'Mail Funktion konnte nicht
initialisiert werden.';
+$PHPMAILER_LANG['invalid_email'] = 'E-Mail wird nicht gesendet, die
Adresse ist ungültig.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer wird nicht unterstützt.';
+$PHPMAILER_LANG['provide_address'] = 'Bitte geben Sie mindestens eine
Empfänger E-Mailadresse an.';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP Fehler: Die folgenden
Empfänger sind nicht korrekt: ';
+$PHPMAILER_LANG['signing'] = 'Fehler beim Signieren: ';
+$PHPMAILER_LANG['smtp_connect_failed'] = 'Verbindung zu SMTP Server
fehlgeschlagen.';
+$PHPMAILER_LANG['smtp_error'] = 'Fehler vom SMTP Server: ';
+$PHPMAILER_LANG['variable_set'] = 'Kann Variable nicht setzen oder
zurücksetzen: ';
+?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-dk.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-dk.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-dk.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,26 +1,26 @@
-<?php
-/**
- * PHPMailer language file.
- * Danish Version
- * Author: Mikael Stokkebro <address@hidden>
- */
-
-$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: ';
-
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Danish Version
+* Author: Mikael Stokkebro <address@hidden>
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'SMTP fejl: Kunne ikke logge på.';
+$PHPMAILER_LANG['connect_host'] = 'SMTP fejl: Kunne ikke tilslutte
SMTP serveren.';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP fejl: Data kunne ikke
accepteres.';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'Ukendt encode-format: ';
+$PHPMAILER_LANG['execute'] = 'Kunne ikke køre: ';
+$PHPMAILER_LANG['file_access'] = 'Ingen adgang til fil: ';
+$PHPMAILER_LANG['file_open'] = 'Fil fejl: Kunne ikke åbne filen: ';
+$PHPMAILER_LANG['from_failed'] = 'Følgende afsenderadresse er
forkert: ';
+$PHPMAILER_LANG['instantiate'] = 'Kunne ikke initialisere email
funktionen.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer understøttes ikke.';
+$PHPMAILER_LANG['provide_address'] = 'Du skal indtaste mindst en
modtagers emailadresse.';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP fejl: Følgende modtagere er
forkerte: ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
?>
\ No newline at end of file
Deleted:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-en.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-en.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-en.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,25 +0,0 @@
-<?php
-/**
- * PHPMailer language file.
- * English Version
- */
-
-$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: ';
-
-?>
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-es.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-es.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-es.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,25 +1,26 @@
-<?php
-/**
- * PHPMailer language file.
- * Versi\xF3n en espa\xF1ol
- */
-
-$PHPMAILER_LANG = array();
-
-$PHPMAILER_LANG["provide_address"] = 'Debe proveer al menos una ' .
- 'direcci\xF3n de email como
destinatario.';
-$PHPMAILER_LANG["mailer_not_supported"] = ' mailer no est\xE1 soportado.';
-$PHPMAILER_LANG["execute"] = 'No puedo ejecutar: ';
-$PHPMAILER_LANG["instantiate"] = 'No pude crear una instancia de la funci\xF3n
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\xF3n desconocida: ';
-$PHPMAILER_LANG["signing"] = 'Error al firmar: ';
-
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Spanish version
+* Versión en español
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'Error SMTP: No se pudo
autentificar.';
+$PHPMAILER_LANG['connect_host'] = 'Error SMTP: No puedo conectar al
servidor SMTP.';
+$PHPMAILER_LANG['data_not_accepted'] = 'Error SMTP: Datos no aceptados.';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'Codificación desconocida: ';
+$PHPMAILER_LANG['execute'] = 'No puedo ejecutar: ';
+$PHPMAILER_LANG['file_access'] = 'No puedo acceder al archivo: ';
+$PHPMAILER_LANG['file_open'] = 'Error de Archivo: No puede abrir el
archivo: ';
+$PHPMAILER_LANG['from_failed'] = 'La(s) siguiente(s) direcciones de
remitente fallaron: ';
+$PHPMAILER_LANG['instantiate'] = 'No pude crear una instancia de la
función Mail.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer no está soportado.';
+$PHPMAILER_LANG['provide_address'] = 'Debe proveer al menos una dirección
de email como destinatario.';
+$PHPMAILER_LANG['recipients_failed'] = 'Error SMTP: Los siguientes
destinatarios fallaron: ';
+$PHPMAILER_LANG['signing'] = 'Error al firmar: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-et.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-et.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-et.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,24 +1,26 @@
<?php
/**
- * PHPMailer language file.
- * Estonian Version
- * By Indrek Päri
- */
+* PHPMailer language file: refer to English translation for definitive list
+* Estonian Version
+* 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['authenticate'] = 'SMTP Viga: Autoriseerimise viga.';
+$PHPMAILER_LANG['connect_host'] = 'SMTP Viga: Ei õnnestunud luua
ühendust SMTP serveriga.';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Viga: Vigased andmed.';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'Tundmatu Unknown kodeering: ';
+$PHPMAILER_LANG['execute'] = 'Tegevus ebaõnnestus: ';
+$PHPMAILER_LANG['file_access'] = 'Pole piisavalt õiguseid järgneva
faili avamiseks: ';
+$PHPMAILER_LANG['file_open'] = 'Faili Viga: Faili avamine
ebaõnnestus: ';
+$PHPMAILER_LANG['from_failed'] = 'Järgnev saatja e-posti aadress on
vigane: ';
+$PHPMAILER_LANG['instantiate'] = 'mail funktiooni käivitamine
ebaõnnestus.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$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['recipients_failed'] = 'SMTP Viga: Järgnevate saajate
e-posti aadressid on vigased: ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
+?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-fi.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-fi.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-fi.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,25 +1,27 @@
-<?php
-/**
- * PHPMailer language file.
- * Finnish Version
- * By Jyry Kuukanen
- */
-
-$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: ';
-
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Finnish Version
+* By Jyry Kuukanen
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'SMTP-virhe: käyttäjätunnistus
epäonnistui.';
+$PHPMAILER_LANG['connect_host'] = 'SMTP-virhe: yhteys palvelimeen ei
onnistu.';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP-virhe: data on virheellinen.';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'Tuntematon koodaustyyppi: ';
+$PHPMAILER_LANG['execute'] = 'Suoritus epäonnistui: ';
+$PHPMAILER_LANG['file_access'] = 'Seuraavaan tiedostoon ei ole
oikeuksia: ';
+$PHPMAILER_LANG['file_open'] = 'Tiedostovirhe: Ei voida avata
tiedostoa: ';
+$PHPMAILER_LANG['from_failed'] = 'Seuraava lähettäjän osoite on
virheellinen: ';
+$PHPMAILER_LANG['instantiate'] = 'mail-funktion luonti epäonnistui.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['mailer_not_supported'] = 'postivälitintyyppiä ei tueta.';
+$PHPMAILER_LANG['provide_address'] = 'Aseta vähintään yksi vastaanottajan
sähköpostiosoite.';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP-virhe: seuraava vastaanottaja
osoite on virheellinen.';
+$PHPMAILER_LANG['encoding'] = 'Tuntematon koodaustyyppi: ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-fo.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-fo.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-fo.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,27 +1,27 @@
-<?php
-/**
- * PHPMailer language file.
- * Faroese Version [language of the Faroe Islands, a Danish dominion]
- * This file created: 11-06-2004
- * Supplied by Dávur Sørensen [www.profo-webdesign.dk]
- */
-
-$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: ';
-
-?>
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Faroese Version [language of the Faroe Islands, a Danish dominion]
+* This file created: 11-06-2004
+* Supplied by Dávur Sørensen [www.profo-webdesign.dk]
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'SMTP feilur: Kundi ikki góðkenna.';
+$PHPMAILER_LANG['connect_host'] = 'SMTP feilur: Kundi ikki knýta
samband við SMTP vert.';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP feilur: Data ikki góðkent.';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'Ókend encoding: ';
+$PHPMAILER_LANG['execute'] = 'Kundi ikki útføra: ';
+$PHPMAILER_LANG['file_access'] = 'Kundi ikki tilganga fílu: ';
+$PHPMAILER_LANG['file_open'] = 'Fílu feilur: Kundi ikki opna fílu:
';
+$PHPMAILER_LANG['from_failed'] = 'fylgjandi Frá/From adressa
miseydnaðist: ';
+$PHPMAILER_LANG['instantiate'] = 'Kuni ikki instantiera mail
funktión.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' er ikki supporterað.';
+$PHPMAILER_LANG['provide_address'] = 'Tú skal uppgeva minst
móttakara-emailadressu(r).';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP Feilur: Fylgjandi móttakarar
miseydnaðust: ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
+?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-fr.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-fr.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-fr.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,26 +1,25 @@
-<?php
-/**
- * PHPMailer language file.
- * French Version
- */
-
-$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: ';
-
-?>
-
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* French Version
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'Erreur SMTP : Echec de
l\'authentification.';
+$PHPMAILER_LANG['connect_host'] = 'Erreur SMTP : Impossible de se
connecter au serveur SMTP.';
+$PHPMAILER_LANG['data_not_accepted'] = 'Erreur SMTP : Données incorrects.';
+$PHPMAILER_LANG['empty_message'] = 'Corps de message vide';
+$PHPMAILER_LANG['encoding'] = 'Encodage inconnu : ';
+$PHPMAILER_LANG['execute'] = 'Impossible de lancer l\'exécution :
';
+$PHPMAILER_LANG['file_access'] = 'Impossible d\'accéder au fichier :
';
+$PHPMAILER_LANG['file_open'] = 'Erreur Fichier : ouverture
impossible : ';
+$PHPMAILER_LANG['from_failed'] = 'L\'adresse d\'expéditeur suivante a
échouée : ';
+$PHPMAILER_LANG['instantiate'] = 'Impossible d\'instancier la
fonction mail.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' client de messagerie non
supporté.';
+$PHPMAILER_LANG['provide_address'] = 'Vous devez fournir au moins une
adresse de destinataire.';
+$PHPMAILER_LANG['recipients_failed'] = 'Erreur SMTP : Les destinataires
suivants sont en erreur : ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
+?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-hu.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-hu.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-hu.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,25 +1,25 @@
-<?php
-/**
- * PHPMailer language file.
- * Hungarian Version
- */
-
-$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: ';
-
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Hungarian Version
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'SMTP Hiba: Sikertelen
autentikáció.';
+$PHPMAILER_LANG['connect_host'] = 'SMTP Hiba: Nem tudtam csatlakozni
az SMTP host-hoz.';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Hiba: Nem elfogadható adat.';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'Ismeretlen kódolás: ';
+$PHPMAILER_LANG['execute'] = 'Nem tudtam végrehajtani: ';
+$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['from_failed'] = 'Az alábbi Feladó cím hibás: ';
+$PHPMAILER_LANG['instantiate'] = 'Nem sikerült példányosítani a mail
funkciót.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$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['recipients_failed'] = 'SMTP Hiba: Az alábbi címzettek
hibásak: ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-it.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-it.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-it.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,30 +1,27 @@
-<?php
-/**
-* PHPMailer language file.
-* Italian version
-* @package PHPMailer
-* @author Ilias Bartolini <address@hidden>
-*/
-
-$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: ';
-
-?>
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Italian version
+* @package PHPMailer
+* @author Ilias Bartolini <address@hidden>
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'SMTP Error: Impossibile
autenticarsi.';
+$PHPMAILER_LANG['connect_host'] = 'SMTP Error: Impossibile connettersi
all\'host SMTP.';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Error: Data non accettati dal
server.';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'Encoding set dei caratteri
sconosciuto: ';
+$PHPMAILER_LANG['execute'] = 'Impossibile eseguire l\'operazione:
';
+$PHPMAILER_LANG['file_access'] = 'Impossibile accedere al file: ';
+$PHPMAILER_LANG['file_open'] = 'File Error: Impossibile aprire il
file: ';
+$PHPMAILER_LANG['from_failed'] = 'I seguenti indirizzi mittenti hanno
generato errore: ';
+$PHPMAILER_LANG['instantiate'] = 'Impossibile istanziare la funzione
mail';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['provide_address'] = 'Deve essere fornito almeno un
indirizzo ricevente';
+$PHPMAILER_LANG['mailer_not_supported'] = 'Mailer non supportato';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: I seguenti indirizzi
destinatari hanno generato errore: ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
+?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ja.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ja.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ja.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,27 +1,26 @@
- < ? p h p
- / * *
- * P H P M a i l e r l a n g u a g e f i l e .
- * J a p a n e s e V e r s i o n
- * B y M i t s u h i r o Y o s h i d a -
h t t p : / / m i t s t e k . c o m /
- * T h i s f i l e i s w r i t t e n i n E U C - J P .
- * /
-
- $ P H P M A I L E R _ L A N G = a r r a y ( ) ;
-
- $ P H P M A I L E R _ L A N G [ " p r o v i d e _ a d d r e s s " ]
=
' \xBE \xAF \xA4 \xCA \xA4 \xAF \xA4 \xC8 \xA4 \xE2 1 \xA4 \xC4 \xA5 \xE1 \xA1 \xBC \xA5 \xEB \xA5 \xA2 \xA5 \xC9 \xA5 \xEC \xA5 \xB9 \xA4 \xF2 '
.
-
' \xBB \xD8 \xC4 \xEA \xA4 \xB9 \xA4 \xEB \xC9 \xAC \xCD \xD7 \xA4 \xAC \xA4 \xA2 \xA4 \xEA \xA4 \xDE \xA4 \xB9 \xA1 \xA3 ' ;
- $ P H P M A I L E R _ L A N G [ " m a i l e r _ n o t _ s u p p o r t e d " ]
= '
\xA5 \xE1 \xA1 \xBC \xA5 \xE9 \xA1 \xBC \xA4 \xAC \xA5 \xB5 \xA5 \xDD \xA1 \xBC \xA5 \xC8 \xA4 \xB5 \xA4 \xEC \xA4 \xC6 \xA4 \xA4 \xA4 \xDE \xA4 \xBB \xA4 \xF3 \xA1 \xA3 ' ;
- $ P H P M A I L E R _ L A N G [ " e x e c u t e " ]
=
' \xBC \xC2 \xB9 \xD4 \xA4 \xC7 \xA4 \xAD \xA4 \xDE \xA4 \xBB \xA4 \xF3 \xA4 \xC7 \xA4 \xB7 \xA4 \xBF :
' ;
- $ P H P M A I L E R _ L A N G [ " i n s t a n t i a t e " ]
=
' \xA5 \xE1 \xA1 \xBC \xA5 \xEB \xB4 \xD8 \xBF \xF4 \xA4 \xAC \xC0 \xB5 \xBE \xEF \xA4 \xCB \xC6 \xB0 \xBA \xEE \xA4 \xB7 \xA4 \xDE \xA4 \xBB \xA4 \xF3 \xA4 \xC7 \xA4 \xB7 \xA4 \xBF \xA1 \xA3 ' ;
- $ P H P M A I L E R _ L A N G [ " a u t h e n t i c a t e " ]
= ' S M T P \xA5 \xA8 \xA5 \xE9 \xA1 \xBC :
\xC7 \xA7 \xBE \xDA \xA4 \xC7 \xA4 \xAD \xA4 \xDE \xA4 \xBB \xA4 \xF3 \xA4 \xC7 \xA4 \xB7 \xA4 \xBF \xA1 \xA3 ' ;
- $ P H P M A I L E R _ L A N G [ " f r o m _ f a i l e d " ]
=
' \xBC \xA1 \xA4 \xCE F r o m \xA5 \xA2 \xA5 \xC9 \xA5 \xEC \xA5 \xB9 \xA4 \xCB \xB4 \xD6 \xB0 \xE3 \xA4 \xA4 \xA4 \xAC \xA4 \xA2 \xA4 \xEA \xA4 \xDE \xA4 \xB9 :
' ;
- $ P H P M A I L E R _ L A N G [ " r e c i p i e n t s _ f a i l e d " ]
= ' S M T P \xA5 \xA8 \xA5 \xE9 \xA1 \xBC :
\xBC \xA1 \xA4 \xCE \xBC \xF5 \xBF \xAE \xBC \xD4 \xA5 \xA2 \xA5 \xC9 \xA5 \xEC \xA5 \xB9 \xA4 \xCB
' .
-
' \xB4 \xD6 \xB0 \xE3 \xA4 \xA4 \xA4 \xAC \xA4 \xA2 \xA4 \xEA \xA4 \xDE \xA4 \xB9 :
' ;
- $ P H P M A I L E R _ L A N G [ " d a t a _ n o t _ a c c e p t e d " ]
= ' S M T P \xA5 \xA8 \xA5 \xE9 \xA1 \xBC :
\xA5 \xC7 \xA1 \xBC \xA5 \xBF \xA4 \xAC \xBC \xF5 \xA4 \xB1 \xC9 \xD5 \xA4 \xB1 \xA4 \xE9 \xA4 \xEC \xA4 \xDE \xA4 \xBB \xA4 \xF3 \xA4 \xC7 \xA4 \xB7 \xA4 \xBF \xA1 \xA3 ' ;
- $ P H P M A I L E R _ L A N G [ " c o n n e c t _ h o s t " ]
= ' S M T P \xA5 \xA8 \xA5 \xE9 \xA1 \xBC :
S M T P \xA5 \xDB \xA5 \xB9 \xA5 \xC8 \xA4 \xCB \xC0 \xDC \xC2 \xB3 \xA4 \xC7 \xA4 \xAD \xA4 \xDE \xA4 \xBB \xA4 \xF3 \xA4 \xC7 \xA4 \xB7 \xA4 \xBF \xA1 \xA3 ' ;
- $ P H P M A I L E R _ L A N G [ " f i l e _ a c c e s s " ]
=
' \xA5 \xD5 \xA5 \xA1 \xA5 \xA4 \xA5 \xEB \xA4 \xCB \xA5 \xA2 \xA5 \xAF \xA5 \xBB \xA5 \xB9 \xA4 \xC7 \xA4 \xAD \xA4 \xDE \xA4 \xBB \xA4 \xF3 :
' ;
- $ P H P M A I L E R _ L A N G [ " f i l e _ o p e n " ]
=
' \xA5 \xD5 \xA5 \xA1 \xA5 \xA4 \xA5 \xEB \xA5 \xA8 \xA5 \xE9 \xA1 \xBC :
\xA5 \xD5 \xA5 \xA1 \xA5 \xA4 \xA5 \xEB \xA4 \xF2 \xB3 \xAB \xA4 \xB1 \xA4 \xDE \xA4 \xBB \xA4 \xF3 :
' ;
- $ P H P M A I L E R _ L A N G [ " e n c o d i n g " ]
=
' \xC9 \xD4 \xCC \xC0 \xA4 \xCA \xA5 \xA8 \xA5 \xF3 \xA5 \xB3 \xA1 \xBC \xA5 \xC7 \xA5 \xA3 \xA5 \xF3 \xA5 \xB0 :
' ;
- $ P H P M A I L E R _ L A N G [ " s i g n i n g " ]
= ' S i g n i n g E r r o r : ' ;
-
- ? >
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Japanese Version
+* By Mitsuhiro Yoshida - http://mitstek.com/
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'SMTPエラー: 認証できませんでした。';
+$PHPMAILER_LANG['connect_host'] = 'SMTPエラー: SMTPホストに接続できませんでした。';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTPエラー: データが受け付けられませんでした。';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = '不明なエンコーディング: ';
+$PHPMAILER_LANG['execute'] = '実行できませんでした: ';
+$PHPMAILER_LANG['file_access'] = 'ファイルにアクセスできません: ';
+$PHPMAILER_LANG['file_open'] = 'ファイルエラー: ファイルを開けません: ';
+$PHPMAILER_LANG['from_failed'] = '次のFromアドレスに間違いがあります: ';
+$PHPMAILER_LANG['instantiate'] = 'メール関数が正常に動作しませんでした。';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['provide_address'] = '少なくとも1つメールアドレスを 指定する必要があります。';
+$PHPMAILER_LANG['mailer_not_supported'] = ' メーラーがサポートされていません。';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTPエラー: 次の受信者アドレスに 間違いがあります: ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
+?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-nl.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-nl.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-nl.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,25 +1,25 @@
-<?php
-/**
- * PHPMailer language file.
- * Dutch Version
- */
-
-$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: ';
-
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Dutch Version
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'SMTP Fout: authenticatie mislukt.';
+$PHPMAILER_LANG['connect_host'] = 'SMTP Fout: Kon niet verbinden met
SMTP host.';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Fout: Data niet geaccepteerd.';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'Onbekende codering: ';
+$PHPMAILER_LANG['execute'] = 'Kon niet uitvoeren: ';
+$PHPMAILER_LANG['file_access'] = 'Kreeg geen toegang tot bestand: ';
+$PHPMAILER_LANG['file_open'] = 'Bestandsfout: Kon bestand niet
openen: ';
+$PHPMAILER_LANG['from_failed'] = 'De volgende afzender adressen zijn
mislukt: ';
+$PHPMAILER_LANG['instantiate'] = 'Kon mail functie niet
initialiseren.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['provide_address'] = 'Er moet tenmiste één ontvanger
emailadres opgegeven worden.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer wordt niet ondersteund.';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP Fout: De volgende ontvangers
zijn mislukt: ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-no.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-no.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-no.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,25 +1,25 @@
-<?php
-/**
- * PHPMailer language file.
- * Norwegian Version
- */
-
-$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: ';
-
-?>
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Norwegian Version
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'SMTP Feil: Kunne ikke
authentisere.';
+$PHPMAILER_LANG['connect_host'] = 'SMTP Feil: Kunne ikke koble til
SMTP host.';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Feil: Data ble ikke
akseptert.';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'Ukjent encoding: ';
+$PHPMAILER_LANG['execute'] = 'Kunne ikke utføre: ';
+$PHPMAILER_LANG['file_access'] = 'Kunne ikke få tilgang til filen: ';
+$PHPMAILER_LANG['file_open'] = 'Fil feil: Kunne ikke åpne filen: ';
+$PHPMAILER_LANG['from_failed'] = 'Følgende Fra feilet: ';
+$PHPMAILER_LANG['instantiate'] = 'Kunne ikke instantiate mail
funksjonen.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['provide_address'] = 'Du må ha med minst en mottager
adresse.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer er ikke supportert.';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP Feil: Følgende mottagere
feilet: ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
+?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-pl.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-pl.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-pl.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,25 +1,25 @@
-<?php
-/**
- * PHPMailer language file.
- * Polish Version, encoding: windows-1250
- * translated from english lang file ver. 1.72
- */
-
-$PHPMAILER_LANG = array();
-
-$PHPMAILER_LANG["provide_address"] = 'Nale¿y podaæ prawid³owy adres email
Odbiorcy.';
-$PHPMAILER_LANG["mailer_not_supported"] = 'Wybrana metoda wysy³ki wiadomoœci
nie jest obs³ugiwana.';
-$PHPMAILER_LANG["execute"] = 'Nie mo¿na uruchomiæ: ';
-$PHPMAILER_LANG["instantiate"] = 'Nie mo¿na wywo³aæ funkcji mail().
SprawdŸ konfiguracjê serwera.';
-$PHPMAILER_LANG["authenticate"] = 'B³¹d SMTP: Nie mo¿na przeprowadziæ
autentykacji.';
-$PHPMAILER_LANG["from_failed"] = 'Nastêpuj¹cy adres Nadawcy jest jest
nieprawid³owy: ';
-$PHPMAILER_LANG["recipients_failed"] = 'B³¹d SMTP: Nastêpuj¹cy ' .
- 'odbiorcy s¹ nieprawid³owi: ';
-$PHPMAILER_LANG["data_not_accepted"] = 'B³¹d SMTP: Dane nie zosta³y
przyjête.';
-$PHPMAILER_LANG["connect_host"] = 'B³¹d SMTP: Nie mo¿na po³¹czyæ siê z
wybranym hostem.';
-$PHPMAILER_LANG["file_access"] = 'Brak dostêpu do pliku: ';
-$PHPMAILER_LANG["file_open"] = 'Nie mo¿na otworzyæ pliku: ';
-$PHPMAILER_LANG["encoding"] = 'Nieznany sposób kodowania znaków: ';
-$PHPMAILER_LANG["signing"] = 'Signing Error: ';
-
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Polish Version
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'Błąd SMTP: Nie można przeprowadzić
autentykacji.';
+$PHPMAILER_LANG['connect_host'] = 'Błąd SMTP: Nie można połączyć się z
wybranym hostem.';
+$PHPMAILER_LANG['data_not_accepted'] = 'Błąd SMTP: Dane nie zostały przyjęte.';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'Nieznany sposób kodowania znaków: ';
+$PHPMAILER_LANG['execute'] = 'Nie można uruchomić: ';
+$PHPMAILER_LANG['file_access'] = 'Brak dostępu do pliku: ';
+$PHPMAILER_LANG['file_open'] = 'Nie można otworzyć pliku: ';
+$PHPMAILER_LANG['from_failed'] = 'Następujący adres Nadawcy jest jest
nieprawidłowy: ';
+$PHPMAILER_LANG['instantiate'] = 'Nie można wywołać funkcji mail(). Sprawdź
konfigurację serwera.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['provide_address'] = 'Należy podać prawidłowy adres email
Odbiorcy.';
+$PHPMAILER_LANG['mailer_not_supported'] = 'Wybrana metoda wysyłki wiadomości
nie jest obsługiwana.';
+$PHPMAILER_LANG['recipients_failed'] = 'Błąd SMTP: Następujący odbiorcy są
nieprawidłowi: ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ro.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ro.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ro.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,25 +1,27 @@
-<?php
-/**
- * PHPMailer language file.
- * Romanian Version
- * @package PHPMailer
- * @author Catalin Constantin <address@hidden>
- */
-
-$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: ';
-
-?>
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Romanian Version
+* @package PHPMailer
+* @author Catalin Constantin <address@hidden>
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'Eroare SMTP: Nu a functionat
autentificarea.';
+$PHPMAILER_LANG['connect_host'] = 'Eroare SMTP: Nu m-am putut conecta
la adresa SMTP.';
+$PHPMAILER_LANG['data_not_accepted'] = 'Eroare SMTP: Continutul mailului nu
a fost acceptat.';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'Encodare necunoscuta: ';
+$PHPMAILER_LANG['execute'] = 'Nu pot executa: ';
+$PHPMAILER_LANG['file_access'] = 'Nu pot accesa fisierul: ';
+$PHPMAILER_LANG['file_open'] = 'Eroare de fisier: Nu pot deschide
fisierul: ';
+$PHPMAILER_LANG['from_failed'] = 'Urmatoarele adrese From au dat
eroare: ';
+$PHPMAILER_LANG['instantiate'] = 'Nu am putut instantia functia
mail.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer nu este suportat.';
+$PHPMAILER_LANG['provide_address'] = 'Trebuie sa adaugati cel putin un
recipient (adresa de mail).';
+$PHPMAILER_LANG['recipients_failed'] = 'Eroare SMTP: Urmatoarele adrese de
mail au dat eroare: ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
+?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ru.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ru.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-ru.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,26 +1,25 @@
-<?php
-/**
- * PHPMailer language file.
- * Russian Version by Alexey Chumakov <address@hidden>
- */
-
-$PHPMAILER_LANG = array();
-
-$PHPMAILER_LANG["provide_address"] =
'\xCF\xEE\xE6\xE0\xEB\xF3\xE9\xF1\xF2\xE0, \xE2\xE2\xE5\xE4\xE8\xF2\xE5
\xF5\xEE\xF2\xFF \xE1\xFB \xEE\xE4\xE8\xED \xE0\xE4\xF0\xE5\xF1 e-mail ' .
-
'\xEF\xEE\xEB\xF3\xF7\xE0\xF2\xE5\xEB\xFF.';
-$PHPMAILER_LANG["mailer_not_supported"] = ' - \xEF\xEE\xF7\xF2\xEE\xE2\xFB\xE9
\xF1\xE5\xF0\xE2\xE5\xF0 \xED\xE5
\xEF\xEE\xE4\xE4\xE5\xF0\xE6\xE8\xE2\xE0\xE5\xF2\xF1\xFF.';
-$PHPMAILER_LANG["execute"] =
'\xCD\xE5\xE2\xEE\xE7\xEC\xEE\xE6\xED\xEE \xE2\xFB\xEF\xEE\xEB\xED\xE8\xF2\xFC
\xEA\xEE\xEC\xE0\xED\xE4\xF3: ';
-$PHPMAILER_LANG["instantiate"] =
'\xCD\xE5\xE2\xEE\xE7\xEC\xEE\xE6\xED\xEE \xE7\xE0\xEF\xF3\xF1\xF2\xE8\xF2\xFC
\xF4\xF3\xED\xEA\xF6\xE8\xFE mail.';
-$PHPMAILER_LANG["authenticate"] = '\xCE\xF8\xE8\xE1\xEA\xE0 SMTP:
\xEE\xF8\xE8\xE1\xEA\xE0 \xE0\xE2\xF2\xEE\xF0\xE8\xE7\xE0\xF6\xE8\xE8.';
-$PHPMAILER_LANG["from_failed"] = '\xCD\xE5\xE2\xE5\xF0\xED\xFB\xE9
\xE0\xE4\xF0\xE5\xF1 \xEE\xF2\xEF\xF0\xE0\xE2\xE8\xF2\xE5\xEB\xFF: ';
-$PHPMAILER_LANG["recipients_failed"] = '\xCE\xF8\xE8\xE1\xEA\xE0 SMTP:
\xEE\xF2\xEF\xF0\xE0\xE2\xEA\xE0 \xEF\xEE \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xEC
' .
- '\xE0\xE4\xF0\xE5\xF1\xE0\xEC
\xEF\xEE\xEB\xF3\xF7\xE0\xF2\xE5\xEB\xE5\xE9 \xED\xE5
\xF3\xE4\xE0\xEB\xE0\xF1\xFC: ';
-$PHPMAILER_LANG["data_not_accepted"] = '\xCE\xF8\xE8\xE1\xEA\xE0 SMTP:
\xE4\xE0\xED\xED\xFB\xE5 \xED\xE5 \xEF\xF0\xE8\xED\xFF\xF2\xFB.';
-$PHPMAILER_LANG["connect_host"] = '\xCE\xF8\xE8\xE1\xEA\xE0 SMTP:
\xED\xE5 \xF3\xE4\xE0\xE5\xF2\xF1\xFF
\xEF\xEE\xE4\xEA\xEB\xFE\xF7\xE8\xF2\xFC\xF1\xFF \xEA
\xF1\xE5\xF0\xE2\xE5\xF0\xF3 SMTP.';
-$PHPMAILER_LANG["file_access"] = '\xCD\xE5\xF2
\xE4\xEE\xF1\xF2\xF3\xEF\xE0 \xEA \xF4\xE0\xE9\xEB\xF3: ';
-$PHPMAILER_LANG["file_open"] = '\xD4\xE0\xE9\xEB\xEE\xE2\xE0\xFF
\xEE\xF8\xE8\xE1\xEA\xE0: \xED\xE5 \xF3\xE4\xE0\xE5\xF2\xF1\xFF
\xEE\xF2\xEA\xF0\xFB\xF2\xFC \xF4\xE0\xE9\xEB: ';
-$PHPMAILER_LANG["encoding"] =
'\xCD\xE5\xE8\xE7\xE2\xE5\xF1\xF2\xED\xFB\xE9 \xE2\xE8\xE4
\xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE8: ';
-$PHPMAILER_LANG["signing"] = 'Signing Error: ';
-
-?>
-
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Russian Version by Alexey Chumakov <address@hidden>
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'Ошибка SMTP: ошибка авторизации.';
+$PHPMAILER_LANG['connect_host'] = 'Ошибка SMTP: не удается
подключиться к серверу SMTP.';
+$PHPMAILER_LANG['data_not_accepted'] = 'Ошибка SMTP: данные не приняты.';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'Неизвестный вид кодировки: ';
+$PHPMAILER_LANG['execute'] = 'Невозможно выполнить команду: ';
+$PHPMAILER_LANG['file_access'] = 'Нет доступа к файлу: ';
+$PHPMAILER_LANG['file_open'] = 'Файловая ошибка: не удается открыть
файл: ';
+$PHPMAILER_LANG['from_failed'] = 'Неверный адрес отправителя: ';
+$PHPMAILER_LANG['instantiate'] = 'Невозможно запустить функцию mail.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['provide_address'] = 'Пожалуйста, введите хотя бы один
адрес e-mail получателя.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' - почтовый сервер не
поддерживается.';
+$PHPMAILER_LANG['recipients_failed'] = 'Ошибка SMTP: отправка по следующим
адресам получателей не удалась: ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
+?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-se.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-se.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-se.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,26 +1,26 @@
-<?php
-/**
- * PHPMailer language file.
- * Swedish Version
- * Author: Johan Linn\xE9r <address@hidden>
- */
-
-$PHPMAILER_LANG = array();
-
-$PHPMAILER_LANG["provide_address"] = 'Du m\xE5ste ange minst en ' .
- 'mottagares e-postadress.';
-$PHPMAILER_LANG["mailer_not_supported"] = ' mailer st\xF6ds inte.';
-$PHPMAILER_LANG["execute"] = 'Kunde inte k\xF6ra: ';
-$PHPMAILER_LANG["instantiate"] = 'Kunde inte initiera e-postfunktion.';
-$PHPMAILER_LANG["authenticate"] = 'SMTP fel: Kunde inte autentisera.';
-$PHPMAILER_LANG["from_failed"] = 'F\xF6ljande avs\xE4ndaradress \xE4r
felaktig: ';
-$PHPMAILER_LANG["recipients_failed"] = 'SMTP fel: F\xF6ljande ' .
- 'mottagare \xE4r 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 \xE5tkomst till fil: ';
-$PHPMAILER_LANG["file_open"] = 'Fil fel: Kunde inte \xF6ppna fil: ';
-$PHPMAILER_LANG["encoding"] = 'Ok\xE4nt encode-format: ';
-$PHPMAILER_LANG["signing"] = 'Signing Error: ';
-
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Swedish Version
+* Author: Johan Linnér <address@hidden>
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'SMTP fel: Kunde inte autentisera.';
+$PHPMAILER_LANG['connect_host'] = 'SMTP fel: Kunde inte ansluta till
SMTP-server.';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP fel: Data accepterades inte.';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'Okänt encode-format: ';
+$PHPMAILER_LANG['execute'] = 'Kunde inte köra: ';
+$PHPMAILER_LANG['file_access'] = 'Ingen åtkomst till fil: ';
+$PHPMAILER_LANG['file_open'] = 'Fil fel: Kunde inte öppna fil: ';
+$PHPMAILER_LANG['from_failed'] = 'Följande avsändaradress är
felaktig: ';
+$PHPMAILER_LANG['instantiate'] = 'Kunde inte initiera
e-postfunktion.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['provide_address'] = 'Du måste ange minst en mottagares
e-postadress.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer stöds inte.';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP fel: Följande mottagare är
felaktig: ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
?>
\ No newline at end of file
Modified:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-tr.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-tr.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-tr.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,26 +1,27 @@
-<?php
-/**
- * PHPMailer dil dosyas\xFD.
- * T\xFCrk\xE7e Versiyonu
- * \xDDZYAZILIM - El\xE7in \xD6zel - Can Y\xFDlmaz - Mehmet Benlio\xF0lu
- */
-
-$PHPMAILER_LANG = array();
-
-$PHPMAILER_LANG["provide_address"] = 'En az bir tane mail adresi belirtmek
zorundas\xFDn\xFDz ' .
- 'al\xFDc\xFDn\xFDn email adresi.';
-$PHPMAILER_LANG["mailer_not_supported"] = ' mailler desteklenmemektedir.';
-$PHPMAILER_LANG["execute"] = '\xC7al\xFD\xFEt\xFDr\xFDlam\xFDyor: ';
-$PHPMAILER_LANG["instantiate"] = '\xD6rnek mail fonksiyonu
yarat\xFDlamad\xFD.';
-$PHPMAILER_LANG["authenticate"] = 'SMTP Hatas\xFD: Do\xF0rulanam\xFDyor.';
-$PHPMAILER_LANG["from_failed"] = 'Ba\xFEar\xFDs\xFDz olan g\xF6nderici adresi:
';
-$PHPMAILER_LANG["recipients_failed"] = 'SMTP Hatas\xFD: ' .
- 'al\xFDc\xFDlara ula\xFEmad\xFD: ';
-$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Hatas\xFD: Veri kabul edilmedi.';
-$PHPMAILER_LANG["connect_host"] = 'SMTP Hatas\xFD: SMTP hosta
ba\xF0lan\xFDlam\xFDyor.';
-$PHPMAILER_LANG["file_access"] = 'Dosyaya eri\xFEilemiyor: ';
-$PHPMAILER_LANG["file_open"] = 'Dosya Hatas\xFD: Dosya a\xE7\xFDlam\xFDyor: ';
-$PHPMAILER_LANG["encoding"] = 'Bilinmeyen \xFEifreleme: ';
-$PHPMAILER_LANG["signing"] = 'Signing Error: ';
-
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Turkish version
+* Türkçe Versiyonu
+* ÝZYAZILIM - Elçin Özel - Can Yýlmaz - Mehmet Benlioðlu
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'SMTP Hatasý: Doðrulanamýyor.';
+$PHPMAILER_LANG['connect_host'] = 'SMTP Hatasý: SMTP hosta
baðlanýlamýyor.';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP Hatasý: Veri kabul edilmedi.';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = 'Bilinmeyen þifreleme: ';
+$PHPMAILER_LANG['execute'] = 'Çalýþtýrýlamýyor: ';
+$PHPMAILER_LANG['file_access'] = 'Dosyaya eriþilemiyor: ';
+$PHPMAILER_LANG['file_open'] = 'Dosya Hatasý: Dosya açýlamýyor: ';
+$PHPMAILER_LANG['from_failed'] = 'Baþarýsýz olan gönderici adresi: ';
+$PHPMAILER_LANG['instantiate'] = 'Örnek mail fonksiyonu
yaratýlamadý.';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$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['recipients_failed'] = 'SMTP Hatasý: alýcýlara ulaþmadý: ';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
?>
\ No newline at end of file
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-zh.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-zh.php
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-zh.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,26 @@
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Traditional Chinese Version
+* @author liqwei <address@hidden>
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'SMTP 錯誤：登錄失敗。';
+$PHPMAILER_LANG['connect_host'] = 'SMTP 錯誤：無法連接到 SMTP 主機。';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP 錯誤：數據不被接受。';
+//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = '未知編碼: ';
+$PHPMAILER_LANG['file_access'] = '無法訪問文件：';
+$PHPMAILER_LANG['file_open'] = '文件錯誤：無法打開文件：';
+$PHPMAILER_LANG['from_failed'] = '發送地址錯誤：';
+$PHPMAILER_LANG['execute'] = '無法執行：';
+$PHPMAILER_LANG['instantiate'] = '未知函數調用。';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['provide_address'] = '必須提供至少一個收件人地址。';
+$PHPMAILER_LANG['mailer_not_supported'] = '發信客戶端不被支持。';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP 錯誤：收件人地址錯誤：';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
+?>
\ No newline at end of file
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-zh_cn.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-zh_cn.php
(rev 0)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/language/phpmailer.lang-zh_cn.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,26 @@
+<?php
+/**
+* PHPMailer language file: refer to English translation for definitive list
+* Simplified Chinese Version
+* @author liqwei <address@hidden>
+*/
+
+$PHPMAILER_LANG['authenticate'] = 'SMTP 错误：登录失败。';
+$PHPMAILER_LANG['connect_host'] = 'SMTP 错误：无法连接到 SMTP 主机。';
+$PHPMAILER_LANG['data_not_accepted'] = 'SMTP 错误：数据不被接受。';
+//$P$PHPMAILER_LANG['empty_message'] = 'Message body empty';
+$PHPMAILER_LANG['encoding'] = '未知编码: ';
+$PHPMAILER_LANG['execute'] = '无法执行：';
+$PHPMAILER_LANG['file_access'] = '无法访问文件：';
+$PHPMAILER_LANG['file_open'] = '文件错误：无法打开文件：';
+$PHPMAILER_LANG['from_failed'] = '发送地址错误：';
+$PHPMAILER_LANG['instantiate'] = '未知函数调用。';
+//$PHPMAILER_LANG['invalid_email'] = 'Not sending, email address is
invalid: ';
+$PHPMAILER_LANG['mailer_not_supported'] = '发信客户端不被支持。';
+$PHPMAILER_LANG['provide_address'] = '必须提供至少一个收件人地址。';
+$PHPMAILER_LANG['recipients_failed'] = 'SMTP 错误：收件人地址错误：';
+//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
+?>
\ No newline at end of file
Added: people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/contents.html
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/contents.html
(rev 0)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/contents.html
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+ <head>
+ <title>Email test</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ </head>
+ <body>
+ <p>Here is a test HTML email</p>
+ </body>
+</html>
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/phpmailerTest.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/phpmailerTest.php
(rev 0)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/phpmailerTest.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,670 @@
+<?php
+/**
+* PHPMailer - PHP email transport unit tests
+* Before running these tests you need to install PHPUnit 3.3 or later through
pear, like this:
+* pear install "channel://pear.phpunit.de/PHPUnit"
+* Then run the tests like this:
+* phpunit phpmailerTest
+* @package PHPMailer
+* @author Andy Prevost
+* @author Marcus Bointon
+* @copyright 2004 - 2009 Andy Prevost
+* @version $Id: phpmailerTest.php 444 2009-05-05 11:22:26Z coolbru $
+* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public
License
+*/
+
+require 'PHPUnit/Framework.php';
+
+$INCLUDE_DIR = "../";
+
+require $INCLUDE_DIR . 'class.phpmailer.php';
+error_reporting(E_ALL);
+
+/**
+* PHPMailer - PHP email transport unit test class
+* Performs authentication tests
+*/
+class phpmailerTest extends PHPUnit_Framework_TestCase {
+ /**
+ * Holds the default phpmailer instance.
+ * @private
+ * @type object
+ */
+ var $Mail = false;
+
+ /**
+ * Holds the SMTP mail host.
+ * @public
+ * @type string
+ */
+ var $Host = "";
+
+ /**
+ * Holds the change log.
+ * @private
+ * @type string array
+ */
+ var $ChangeLog = array();
+
+ /**
+ * Holds the note log.
+ * @private
+ * @type string array
+ */
+ var $NoteLog = array();
+
+ /**
+ * Run before each test is started.
+ */
+ function setUp() {
+ global $INCLUDE_DIR;
+
+ @include './testbootstrap.php'; //Overrides go in here
+
+ $this->Mail = new PHPMailer();
+
+ $this->Mail->Priority = 3;
+ $this->Mail->Encoding = "8bit";
+ $this->Mail->CharSet = "iso-8859-1";
+ if (array_key_exists('mail_from', $_REQUEST)) {
+ $this->Mail->From = $_REQUEST['mail_from'];
+ } else {
+ $this->Mail->From = 'address@hidden';
+ }
+ $this->Mail->FromName = "Unit Tester";
+ $this->Mail->Sender = "";
+ $this->Mail->Subject = "Unit Test";
+ $this->Mail->Body = "";
+ $this->Mail->AltBody = "";
+ $this->Mail->WordWrap = 0;
+ if (array_key_exists('mail_host', $_REQUEST)) {
+ $this->Mail->Host = $_REQUEST['mail_host'];
+ } else {
+ $this->Mail->Host = 'mail.example.com';
+ }
+ $this->Mail->Port = 25;
+ $this->Mail->Helo = "localhost.localdomain";
+ $this->Mail->SMTPAuth = false;
+ $this->Mail->Username = "";
+ $this->Mail->Password = "";
+ $this->Mail->PluginDir = $INCLUDE_DIR;
+ $this->Mail->AddReplyTo("address@hidden", "Reply Guy");
+ $this->Mail->Sender = "address@hidden";
+
+ if(strlen($this->Mail->Host) > 0) {
+ $this->Mail->Mailer = "smtp";
+ } else {
+ $this->Mail->Mailer = "mail";
+ $this->Sender = "address@hidden";
+ }
+
+ if (array_key_exists('mail_to', $_REQUEST)) {
+ $this->SetAddress($_REQUEST['mail_to'], 'Test User', 'to');
+ }
+ if (array_key_exists('mail_cc', $_REQUEST) and
strlen($_REQUEST['mail_cc']) > 0) {
+ $this->SetAddress($_REQUEST['mail_cc'], 'Carbon User', 'cc');
+ }
+ }
+
+ /**
+ * Run after each test is completed.
+ */
+ function tearDown() {
+ // Clean global variables
+ $this->Mail = NULL;
+ $this->ChangeLog = array();
+ $this->NoteLog = array();
+ }
+
+
+ /**
+ * Build the body of the message in the appropriate format.
+ * @private
+ * @returns void
+ */
+ function BuildBody() {
+ $this->CheckChanges();
+
+ // Determine line endings for message
+ if($this->Mail->ContentType == "text/html" ||
strlen($this->Mail->AltBody) > 0)
+ {
+ $eol = "<br/>";
+ $bullet = "<li>";
+ $bullet_start = "<ul>";
+ $bullet_end = "</ul>";
+ }
+ else
+ {
+ $eol = "\n";
+ $bullet = " - ";
+ $bullet_start = "";
+ $bullet_end = "";
+ }
+
+ $ReportBody = "";
+
+ $ReportBody .= "---------------------" . $eol;
+ $ReportBody .= "Unit Test Information" . $eol;
+ $ReportBody .= "---------------------" . $eol;
+ $ReportBody .= "phpmailer version: " . PHPMailer::VERSION . $eol;
+ $ReportBody .= "Content Type: " . $this->Mail->ContentType . $eol;
+
+ if(strlen($this->Mail->Host) > 0)
+ $ReportBody .= "Host: " . $this->Mail->Host . $eol;
+
+ // If attachments then create an attachment list
+ $attachments = $this->Mail->GetAttachments();
+ if(count($attachments) > 0)
+ {
+ $ReportBody .= "Attachments:" . $eol;
+ $ReportBody .= $bullet_start;
+ foreach($attachments as $attachment) {
+ $ReportBody .= $bullet . "Name: " . $attachment[1] . ", ";
+ $ReportBody .= "Encoding: " . $attachment[3] . ", ";
+ $ReportBody .= "Type: " . $attachment[4] . $eol;
+ }
+ $ReportBody .= $bullet_end . $eol;
+ }
+
+ // If there are changes then list them
+ if(count($this->ChangeLog) > 0)
+ {
+ $ReportBody .= "Changes" . $eol;
+ $ReportBody .= "-------" . $eol;
+
+ $ReportBody .= $bullet_start;
+ for($i = 0; $i < count($this->ChangeLog); $i++)
+ {
+ $ReportBody .= $bullet . $this->ChangeLog[$i][0] . " was
changed to [" .
+ $this->ChangeLog[$i][1] . "]" . $eol;
+ }
+ $ReportBody .= $bullet_end . $eol . $eol;
+ }
+
+ // If there are notes then list them
+ if(count($this->NoteLog) > 0)
+ {
+ $ReportBody .= "Notes" . $eol;
+ $ReportBody .= "-----" . $eol;
+
+ $ReportBody .= $bullet_start;
+ for($i = 0; $i < count($this->NoteLog); $i++)
+ {
+ $ReportBody .= $bullet . $this->NoteLog[$i] . $eol;
+ }
+ $ReportBody .= $bullet_end;
+ }
+
+ // Re-attach the original body
+ $this->Mail->Body .= $eol . $eol . $ReportBody;
+ }
+
+ /**
+ * Check which default settings have been changed for the report.
+ * @private
+ * @returns void
+ */
+ function CheckChanges() {
+ if($this->Mail->Priority != 3)
+ $this->AddChange("Priority", $this->Mail->Priority);
+ if($this->Mail->Encoding != "8bit")
+ $this->AddChange("Encoding", $this->Mail->Encoding);
+ if($this->Mail->CharSet != "iso-8859-1")
+ $this->AddChange("CharSet", $this->Mail->CharSet);
+ if($this->Mail->Sender != "")
+ $this->AddChange("Sender", $this->Mail->Sender);
+ if($this->Mail->WordWrap != 0)
+ $this->AddChange("WordWrap", $this->Mail->WordWrap);
+ if($this->Mail->Mailer != "mail")
+ $this->AddChange("Mailer", $this->Mail->Mailer);
+ if($this->Mail->Port != 25)
+ $this->AddChange("Port", $this->Mail->Port);
+ if($this->Mail->Helo != "localhost.localdomain")
+ $this->AddChange("Helo", $this->Mail->Helo);
+ if($this->Mail->SMTPAuth)
+ $this->AddChange("SMTPAuth", "true");
+ }
+
+ /**
+ * Adds a change entry.
+ * @private
+ * @returns void
+ */
+ function AddChange($sName, $sNewValue) {
+ $cur = count($this->ChangeLog);
+ $this->ChangeLog[$cur][0] = $sName;
+ $this->ChangeLog[$cur][1] = $sNewValue;
+ }
+
+ /**
+ * Adds a simple note to the message.
+ * @public
+ * @returns void
+ */
+ function AddNote($sValue) {
+ $this->NoteLog[] = $sValue;
+ }
+
+ /**
+ * Adds all of the addresses
+ * @public
+ * @returns void
+ */
+ function SetAddress($sAddress, $sName = "", $sType = "to") {
+ switch($sType)
+ {
+ case "to":
+ return $this->Mail->AddAddress($sAddress, $sName);
+ case "cc":
+ return $this->Mail->AddCC($sAddress, $sName);
+ case "bcc":
+ return $this->Mail->AddBCC($sAddress, $sName);
+ }
+ }
+
+ /////////////////////////////////////////////////
+ // UNIT TESTS
+ /////////////////////////////////////////////////
+
+ /**
+ * Try a plain message.
+ */
+ function test_WordWrap() {
+
+ $this->Mail->WordWrap = 40;
+ $my_body = "Here is the main body of this message. It should " .
+ "be quite a few lines. It should be wrapped at the " .
+ "40 characters. Make sure that it is.";
+ $nBodyLen = strlen($my_body);
+ $my_body .= "\n\nThis is the above body length: " . $nBodyLen;
+
+ $this->Mail->Body = $my_body;
+ $this->Mail->Subject .= ": Wordwrap";
+
+ $this->BuildBody();
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+ }
+
+ /**
+ * Try a plain message.
+ */
+ function test_Low_Priority() {
+
+ $this->Mail->Priority = 5;
+ $this->Mail->Body = "Here is the main body. There should be " .
+ "a reply to address in this message.";
+ $this->Mail->Subject .= ": Low Priority";
+ $this->Mail->AddReplyTo("address@hidden", "Nobody (Unit Test)");
+
+ $this->BuildBody();
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+ }
+
+ /**
+ * Simple plain file attachment test.
+ */
+ function test_Multiple_Plain_FileAttachment() {
+
+ $this->Mail->Body = "Here is the text body";
+ $this->Mail->Subject .= ": Plain + Multiple FileAttachments";
+
+ if(!$this->Mail->AddAttachment("test.png"))
+ {
+ $this->assertTrue(false, $this->Mail->ErrorInfo);
+ return;
+ }
+
+ if(!$this->Mail->AddAttachment(__FILE__, "test.txt"))
+ {
+ $this->assertTrue(false, $this->Mail->ErrorInfo);
+ return;
+ }
+
+ $this->BuildBody();
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+ }
+
+ /**
+ * Simple plain string attachment test.
+ */
+ function test_Plain_StringAttachment() {
+
+ $this->Mail->Body = "Here is the text body";
+ $this->Mail->Subject .= ": Plain + StringAttachment";
+
+ $sAttachment = "These characters are the content of the " .
+ "string attachment.\nThis might be taken from a ".
+ "database or some other such thing. ";
+
+ $this->Mail->AddStringAttachment($sAttachment, "string_attach.txt");
+
+ $this->BuildBody();
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+ }
+
+ /**
+ * Plain quoted-printable message.
+ */
+ function test_Quoted_Printable() {
+
+ $this->Mail->Body = "Here is the main body";
+ $this->Mail->Subject .= ": Plain + Quoted-printable";
+ $this->Mail->Encoding = "quoted-printable";
+
+ $this->BuildBody();
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+
+ //Check that a quoted printable encode and decode results in the same
as went in
+ $t = substr(file_get_contents(__FILE__), 0, 1024); //Just pick a chunk
of this file as test content
+ $this->assertEquals($t,
quoted_printable_decode($this->Mail->EncodeQP($t)), 'QP encoding round-trip
failed');
+ //$this->assertEquals($t,
quoted_printable_decode($this->Mail->EncodeQPphp($t)), 'Native PHP QP encoding
round-trip failed'); //TODO the PHP qp encoder is quite broken
+
+ }
+
+ /**
+ * Try a plain message.
+ */
+ function test_Html() {
+
+ $this->Mail->IsHTML(true);
+ $this->Mail->Subject .= ": HTML only";
+
+ $this->Mail->Body = "This is a <b>test message</b> written in HTML.
</br>" .
+ "Go to <a
href=\"http://phpmailer.sourceforge.net/\";>" .
+ "http://phpmailer.sourceforge.net/</a> for new
versions of " .
+ "phpmailer. <p/> Thank you!";
+
+ $this->BuildBody();
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+ }
+
+ /**
+ * Simple HTML and attachment test
+ */
+ function test_HTML_Attachment() {
+
+ $this->Mail->Body = "This is the <b>HTML</b> part of the email.";
+ $this->Mail->Subject .= ": HTML + Attachment";
+ $this->Mail->IsHTML(true);
+
+ if(!$this->Mail->AddAttachment(__FILE__, "test_attach.txt"))
+ {
+ $this->assertTrue(false, $this->Mail->ErrorInfo);
+ return;
+ }
+
+ $this->BuildBody();
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+ }
+
+ /**
+ * An embedded attachment test.
+ */
+ function test_Embedded_Image() {
+
+ $this->Mail->Body = "Embedded Image: <img alt=\"phpmailer\"
src=\"cid:my-attach\">" .
+ "Here is an image!</a>";
+ $this->Mail->Subject .= ": Embedded Image";
+ $this->Mail->IsHTML(true);
+
+ if(!$this->Mail->AddEmbeddedImage("test.png", "my-attach", "test.png",
+ "base64", "image/png"))
+ {
+ $this->assertTrue(false, $this->Mail->ErrorInfo);
+ return;
+ }
+
+ $this->BuildBody();
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+ //For code coverage
+ $this->Mail->AddEmbeddedImage('thisfiledoesntexist', 'xyz');
//Non-existent file
+ $this->Mail->AddEmbeddedImage(__FILE__, '123'); //Missing name
+
+ }
+
+ /**
+ * An embedded attachment test.
+ */
+ function test_Multi_Embedded_Image() {
+
+ $this->Mail->Body = "Embedded Image: <img alt=\"phpmailer\"
src=\"cid:my-attach\">" .
+ "Here is an image!</a>";
+ $this->Mail->Subject .= ": Embedded Image + Attachment";
+ $this->Mail->IsHTML(true);
+
+ if(!$this->Mail->AddEmbeddedImage("test.png", "my-attach", "test.png",
+ "base64", "image/png"))
+ {
+ $this->assertTrue(false, $this->Mail->ErrorInfo);
+ return;
+ }
+
+ if(!$this->Mail->AddAttachment(__FILE__, "test.txt"))
+ {
+ $this->assertTrue(false, $this->Mail->ErrorInfo);
+ return;
+ }
+
+ $this->BuildBody();
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+ }
+
+ /**
+ * Simple multipart/alternative test.
+ */
+ function test_AltBody() {
+
+ $this->Mail->Body = "This is the <b>HTML</b> part of the email.";
+ $this->Mail->AltBody = "Here is the text body of this message. " .
+ "It should be quite a few lines. It should be wrapped at
the " .
+ "40 characters. Make sure that it is.";
+ $this->Mail->WordWrap = 40;
+ $this->AddNote("This is a mulipart alternative email");
+ $this->Mail->Subject .= ": AltBody + Word Wrap";
+
+ $this->BuildBody();
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+ }
+
+ /**
+ * Simple HTML and attachment test
+ */
+ function test_AltBody_Attachment() {
+
+ $this->Mail->Body = "This is the <b>HTML</b> part of the email.";
+ $this->Mail->AltBody = "This is the text part of the email.";
+ $this->Mail->Subject .= ": AltBody + Attachment";
+ $this->Mail->IsHTML(true);
+
+ if(!$this->Mail->AddAttachment(__FILE__, "test_attach.txt"))
+ {
+ $this->assertTrue(false, $this->Mail->ErrorInfo);
+ return;
+ }
+
+ $this->BuildBody();
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+ if (is_writable('.')) {
+ file_put_contents('message.txt', $this->Mail->CreateHeader() .
$this->Mail->CreateBody());
+ } else {
+ $this->assertTrue(false, 'Could not write local file - check
permissions');
+ }
+ }
+
+ function test_MultipleSend() {
+ $this->Mail->Body = "Sending two messages without keepalive";
+ $this->BuildBody();
+ $subject = $this->Mail->Subject;
+
+ $this->Mail->Subject = $subject . ": SMTP 1";
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+
+ $this->Mail->Subject = $subject . ": SMTP 2";
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+ }
+
+ function test_SendmailSend() {
+ $this->Mail->Body = "Sending via sendmail";
+ $this->BuildBody();
+ $subject = $this->Mail->Subject;
+
+ $this->Mail->Subject = $subject . ": sendmail";
+ $this->Mail->IsSendmail();
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+ }
+
+ function test_MailSend() {
+ $this->Mail->Body = "Sending via mail()";
+ $this->BuildBody();
+ $subject = $this->Mail->Subject;
+
+ $this->Mail->Subject = $subject . ": mail()";
+ $this->Mail->IsMail();
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+ }
+
+ function test_SmtpKeepAlive() {
+ $this->Mail->Body = "This was done using the SMTP keep-alive.";
+ $this->BuildBody();
+ $subject = $this->Mail->Subject;
+
+ $this->Mail->SMTPKeepAlive = true;
+ $this->Mail->Subject = $subject . ": SMTP keep-alive 1";
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+
+ $this->Mail->Subject = $subject . ": SMTP keep-alive 2";
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+ $this->Mail->SmtpClose();
+ }
+
+ /**
+ * Tests this denial of service attack:
+ * http://www.cybsec.com/vuln/PHPMailer-DOS.pdf
+ */
+ function test_DenialOfServiceAttack() {
+ $this->Mail->Body = "This should no longer cause a denial of service.";
+ $this->BuildBody();
+
+ $this->Mail->Subject = str_repeat("A", 998);
+ $this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
+ }
+
+ function test_Error() {
+ $this->Mail->Subject .= ": This should be sent";
+ $this->BuildBody();
+ $this->Mail->ClearAllRecipients(); // no addresses should cause
an error
+ $this->assertTrue($this->Mail->IsError() == false, "Error
found");
+ $this->assertTrue($this->Mail->Send() == false, "Send
succeeded");
+ $this->assertTrue($this->Mail->IsError(), "No error found");
+ $this->assertEquals('You must provide at least one recipient
email address.', $this->Mail->ErrorInfo);
+ $this->Mail->AddAddress($_REQUEST['mail_to']);
+ $this->assertTrue($this->Mail->Send(), "Send failed");
+ }
+
+ function test_Addressing() {
+ $this->assertFalse($this->Mail->AddAddress('address@hidden'),
'Invalid address accepted');
+ $this->assertTrue($this->Mail->AddAddress('address@hidden'),
'Addressing failed');
+ $this->assertFalse($this->Mail->AddAddress('address@hidden'),
'Duplicate addressing failed');
+ $this->assertTrue($this->Mail->AddCC('address@hidden'), 'CC
addressing failed');
+ $this->assertFalse($this->Mail->AddCC('address@hidden'), 'CC
duplicate addressing failed');
+ $this->assertFalse($this->Mail->AddCC('address@hidden'), 'CC
duplicate addressing failed (2)');
+ $this->assertTrue($this->Mail->AddBCC('address@hidden'), 'BCC
addressing failed');
+ $this->assertFalse($this->Mail->AddBCC('address@hidden'), 'BCC
duplicate addressing failed');
+ $this->assertFalse($this->Mail->AddBCC('address@hidden'), 'BCC
duplicate addressing failed (2)');
+ $this->assertTrue($this->Mail->AddReplyTo('address@hidden'),
'Replyto Addressing failed');
+ $this->assertFalse($this->Mail->AddReplyTo('address@hidden'),
'Invalid Replyto address accepted');
+ $this->Mail->ClearAddresses();
+ $this->Mail->ClearCCs();
+ $this->Mail->ClearBCCs();
+ $this->Mail->ClearReplyTos();
+ }
+
+ /**
+ * Test language files for missing and excess translations
+ * All languages are compared with English
+ */
+ function test_Translations() {
+ $this->Mail->SetLanguage('en');
+ $definedStrings = $this->Mail->GetTranslations();
+ foreach (new DirectoryIterator('../language') as $fileInfo) {
+ if($fileInfo->isDot()) continue;
+ $matches = array();
+ //Only look at language files, ignore anything else in
there
+ if (preg_match('/^phpmailer\.lang-([a-z_]{2,})\.php$/',
$fileInfo->getFilename(), $matches)) {
+ $lang = $matches[1]; //Extract language code
+ $PHPMAILER_LANG = array(); //Language strings
get put in here
+ include $fileInfo->getPathname(); //Get
language strings
+ $missing =
array_diff(array_keys($definedStrings), array_keys($PHPMAILER_LANG));
+ $extra =
array_diff(array_keys($PHPMAILER_LANG), array_keys($definedStrings));
+ $this->assertTrue(empty($missing), "Missing
translations in $lang: ". implode(', ', $missing));
+ $this->assertTrue(empty($extra), "Extra
translations in $lang: ". implode(', ', $extra));
+ }
+ }
+ }
+
+ /**
+ * Encoding tests
+ */
+ function test_Encodings() {
+ $this->Mail->Charset = 'iso-8859-1';
+ $this->assertEquals('=A1Hola!_Se=F1or!',
$this->Mail->EncodeQ('\xA1Hola! Se\xF1or!', 'text'), 'Q Encoding (text)
failed');
+ $this->assertEquals('=A1Hola!_Se=F1or!',
$this->Mail->EncodeQ('\xA1Hola! Se\xF1or!', 'comment'), 'Q Encoding (comment)
failed');
+ $this->assertEquals('=A1Hola!_Se=F1or!',
$this->Mail->EncodeQ('\xA1Hola! Se\xF1or!', 'phrase'), 'Q Encoding (phrase)
failed');
+ }
+
+ /**
+ * Signing tests
+ */
+ function test_Signing() {
+ $this->Mail->Sign('certfile.txt', 'keyfile.txt', 'password');
//TODO this is not really testing signing, but at least helps coverage
+ }
+
+ /**
+ * Miscellaneous calls to improve test coverage and some small tests
+ */
+ function test_Miscellaneous() {
+ $this->assertEquals('application/pdf',
PHPMailer::_mime_types('pdf') , 'MIME TYPE lookup failed');
+ $this->Mail->AddCustomHeader('SomeHeader: Some Value');
+ $this->Mail->ClearCustomHeaders();
+ $this->Mail->ClearAttachments();
+ $this->Mail->IsHTML(false);
+ $this->Mail->IsSMTP();
+ $this->Mail->IsMail();
+ $this->Mail->IsSendMail();
+ $this->Mail->IsQmail();
+ $this->Mail->SetLanguage('fr');
+ $this->Mail->Sender = '';
+ $this->Mail->CreateHeader();
+ $this->assertFalse($this->Mail->set('x', 'y'), 'Invalid property
set succeeded');
+ $this->assertTrue($this->Mail->set('Timeout', 11), 'Valid property
set failed');
+ $this->Mail->getFile(__FILE__);
+ }
+}
+
+/**
+* This is a sample form for setting appropriate test values through a browser
+* These values can also be set using a file called testbootstrap.php (not in
svn) in the same folder as this script
+* which is probably more useful if you run these tests a lot
+<html>
+<body>
+<h3>phpmailer Unit Test</h3>
+By entering a SMTP hostname it will automatically perform tests with SMTP.
+
+<form name="phpmailer_unit" action=__FILE__ method="get">
+<input type="hidden" name="submitted" value="1"/>
+From Address: <input type="text" size="50" name="mail_from" value="<?php echo
get("mail_from"); ?>"/>
+<br/>
+To Address: <input type="text" size="50" name="mail_to" value="<?php echo
get("mail_to"); ?>"/>
+<br/>
+Cc Address: <input type="text" size="50" name="mail_cc" value="<?php echo
get("mail_cc"); ?>"/>
+<br/>
+SMTP Hostname: <input type="text" size="50" name="mail_host" value="<?php echo
get("mail_host"); ?>"/>
+<p/>
+<input type="submit" value="Run Test"/>
+
+</form>
+</body>
+</html>
+ */
+
+?>
\ No newline at end of file
Deleted:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/phpmailer_test.php
===================================================================
---
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/phpmailer_test.php
2009-11-22 16:31:30 UTC (rev 20878)
+++
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/phpmailer_test.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,572 +0,0 @@
-<?php
-/*******************
- Unit Test
- Type: phpmailer class
-********************/
-
-$INCLUDE_DIR = "../";
-
-require("phpunit.php");
-require($INCLUDE_DIR . "class.phpmailer.php");
-error_reporting(E_ALL);
-
-/**
- * Performs authentication tests
- */
-class phpmailerTest extends TestCase
-{
- /**
- * Holds the default phpmailer instance.
- * @private
- * @type object
- */
- var $Mail = false;
-
- /**
- * Holds the SMTP mail host.
- * @public
- * @type string
- */
- var $Host = "";
-
- /**
- * Holds the change log.
- * @private
- * @type string array
- */
- var $ChangeLog = array();
-
- /**
- * Holds the note log.
- * @private
- * @type string array
- */
- var $NoteLog = array();
-
- /**
- * Class constuctor.
- */
- function phpmailerTest($name) {
- /* must define this constructor */
- $this->TestCase( $name );
- }
-
- /**
- * Run before each test is started.
- */
- function setUp() {
- global $global_vars;
- global $INCLUDE_DIR;
-
- $this->Mail = new PHPMailer();
-
- $this->Mail->Priority = 3;
- $this->Mail->Encoding = "8bit";
- $this->Mail->CharSet = "iso-8859-1";
- $this->Mail->From = "address@hidden";
- $this->Mail->FromName = "Unit Tester";
- $this->Mail->Sender = "";
- $this->Mail->Subject = "Unit Test";
- $this->Mail->Body = "";
- $this->Mail->AltBody = "";
- $this->Mail->WordWrap = 0;
- $this->Mail->Host = $global_vars["mail_host"];
- $this->Mail->Port = 25;
- $this->Mail->Helo = "localhost.localdomain";
- $this->Mail->SMTPAuth = false;
- $this->Mail->Username = "";
- $this->Mail->Password = "";
- $this->Mail->PluginDir = $INCLUDE_DIR;
- $this->Mail->AddReplyTo("address@hidden", "Reply Guy");
- $this->Mail->Sender = "address@hidden";
-
- if(strlen($this->Mail->Host) > 0)
- $this->Mail->Mailer = "smtp";
- else
- {
- $this->Mail->Mailer = "mail";
- $this->Sender = "address@hidden";
- }
-
- global $global_vars;
- $this->SetAddress($global_vars["mail_to"], "Test User");
- if(strlen($global_vars["mail_cc"]) > 0)
- $this->SetAddress($global_vars["mail_cc"], "Carbon User", "cc");
- }
-
- /**
- * Run after each test is completed.
- */
- function tearDown() {
- // Clean global variables
- $this->Mail = NULL;
- $this->ChangeLog = array();
- $this->NoteLog = array();
- }
-
-
- /**
- * Build the body of the message in the appropriate format.
- * @private
- * @returns void
- */
- function BuildBody() {
- $this->CheckChanges();
-
- // Determine line endings for message
- if($this->Mail->ContentType == "text/html" ||
strlen($this->Mail->AltBody) > 0)
- {
- $eol = "<br/>";
- $bullet = "<li>";
- $bullet_start = "<ul>";
- $bullet_end = "</ul>";
- }
- else
- {
- $eol = "\n";
- $bullet = " - ";
- $bullet_start = "";
- $bullet_end = "";
- }
-
- $ReportBody = "";
-
- $ReportBody .= "---------------------" . $eol;
- $ReportBody .= "Unit Test Information" . $eol;
- $ReportBody .= "---------------------" . $eol;
- $ReportBody .= "phpmailer version: " . $this->Mail->Version . $eol;
- $ReportBody .= "Content Type: " . $this->Mail->ContentType . $eol;
-
- if(strlen($this->Mail->Host) > 0)
- $ReportBody .= "Host: " . $this->Mail->Host . $eol;
-
- // If attachments then create an attachment list
- if(count($this->Mail->attachment) > 0)
- {
- $ReportBody .= "Attachments:" . $eol;
- $ReportBody .= $bullet_start;
- for($i = 0; $i < count($this->Mail->attachment); $i++)
- {
- $ReportBody .= $bullet . "Name: " .
$this->Mail->attachment[$i][1] . ", ";
- $ReportBody .= "Encoding: " . $this->Mail->attachment[$i][3] .
", ";
- $ReportBody .= "Type: " . $this->Mail->attachment[$i][4] .
$eol;
- }
- $ReportBody .= $bullet_end . $eol;
- }
-
- // If there are changes then list them
- if(count($this->ChangeLog) > 0)
- {
- $ReportBody .= "Changes" . $eol;
- $ReportBody .= "-------" . $eol;
-
- $ReportBody .= $bullet_start;
- for($i = 0; $i < count($this->ChangeLog); $i++)
- {
- $ReportBody .= $bullet . $this->ChangeLog[$i][0] . " was
changed to [" .
- $this->ChangeLog[$i][1] . "]" . $eol;
- }
- $ReportBody .= $bullet_end . $eol . $eol;
- }
-
- // If there are notes then list them
- if(count($this->NoteLog) > 0)
- {
- $ReportBody .= "Notes" . $eol;
- $ReportBody .= "-----" . $eol;
-
- $ReportBody .= $bullet_start;
- for($i = 0; $i < count($this->NoteLog); $i++)
- {
- $ReportBody .= $bullet . $this->NoteLog[$i] . $eol;
- }
- $ReportBody .= $bullet_end;
- }
-
- // Re-attach the original body
- $this->Mail->Body .= $eol . $eol . $ReportBody;
- }
-
- /**
- * Check which default settings have been changed for the report.
- * @private
- * @returns void
- */
- function CheckChanges() {
- if($this->Mail->Priority != 3)
- $this->AddChange("Priority", $this->Mail->Priority);
- if($this->Mail->Encoding != "8bit")
- $this->AddChange("Encoding", $this->Mail->Encoding);
- if($this->Mail->CharSet != "iso-8859-1")
- $this->AddChange("CharSet", $this->Mail->CharSet);
- if($this->Mail->Sender != "")
- $this->AddChange("Sender", $this->Mail->Sender);
- if($this->Mail->WordWrap != 0)
- $this->AddChange("WordWrap", $this->Mail->WordWrap);
- if($this->Mail->Mailer != "mail")
- $this->AddChange("Mailer", $this->Mail->Mailer);
- if($this->Mail->Port != 25)
- $this->AddChange("Port", $this->Mail->Port);
- if($this->Mail->Helo != "localhost.localdomain")
- $this->AddChange("Helo", $this->Mail->Helo);
- if($this->Mail->SMTPAuth)
- $this->AddChange("SMTPAuth", "true");
- }
-
- /**
- * Adds a change entry.
- * @private
- * @returns void
- */
- function AddChange($sName, $sNewValue) {
- $cur = count($this->ChangeLog);
- $this->ChangeLog[$cur][0] = $sName;
- $this->ChangeLog[$cur][1] = $sNewValue;
- }
-
- /**
- * Adds a simple note to the message.
- * @public
- * @returns void
- */
- function AddNote($sValue) {
- $this->NoteLog[] = $sValue;
- }
-
- /**
- * Adds all of the addresses
- * @public
- * @returns void
- */
- function SetAddress($sAddress, $sName = "", $sType = "to") {
- switch($sType)
- {
- case "to":
- $this->Mail->AddAddress($sAddress, $sName);
- break;
- case "cc":
- $this->Mail->AddCC($sAddress, $sName);
- break;
- case "bcc":
- $this->Mail->AddBCC($sAddress, $sName);
- break;
- }
- }
-
- /////////////////////////////////////////////////
- // UNIT TESTS
- /////////////////////////////////////////////////
-
- /**
- * Try a plain message.
- */
- function test_WordWrap() {
-
- $this->Mail->WordWrap = 40;
- $my_body = "Here is the main body of this message. It should " .
- "be quite a few lines. It should be wrapped at the " .
- "40 characters. Make sure that it is.";
- $nBodyLen = strlen($my_body);
- $my_body .= "\n\nThis is the above body length: " . $nBodyLen;
-
- $this->Mail->Body = $my_body;
- $this->Mail->Subject .= ": Wordwrap";
-
- $this->BuildBody();
- $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
- }
-
- /**
- * Try a plain message.
- */
- function test_Low_Priority() {
-
- $this->Mail->Priority = 5;
- $this->Mail->Body = "Here is the main body. There should be " .
- "a reply to address in this message.";
- $this->Mail->Subject .= ": Low Priority";
- $this->Mail->AddReplyTo("address@hidden", "Nobody (Unit Test)");
-
- $this->BuildBody();
- $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
- }
-
- /**
- * Simple plain file attachment test.
- */
- function test_Multiple_Plain_FileAttachment() {
-
- $this->Mail->Body = "Here is the text body";
- $this->Mail->Subject .= ": Plain + Multiple FileAttachments";
-
- if(!$this->Mail->AddAttachment("test.png"))
- {
- $this->assert(false, $this->Mail->ErrorInfo);
- return;
- }
-
- if(!$this->Mail->AddAttachment("phpmailer_test.php", "test.txt"))
- {
- $this->assert(false, $this->Mail->ErrorInfo);
- return;
- }
-
- $this->BuildBody();
- $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
- }
-
- /**
- * Simple plain string attachment test.
- */
- function test_Plain_StringAttachment() {
-
- $this->Mail->Body = "Here is the text body";
- $this->Mail->Subject .= ": Plain + StringAttachment";
-
- $sAttachment = "These characters are the content of the " .
- "string attachment.\nThis might be taken from a ".
- "database or some other such thing. ";
-
- $this->Mail->AddStringAttachment($sAttachment, "string_attach.txt");
-
- $this->BuildBody();
- $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
- }
-
- /**
- * Plain quoted-printable message.
- */
- function test_Quoted_Printable() {
-
- $this->Mail->Body = "Here is the main body";
- $this->Mail->Subject .= ": Plain + Quoted-printable";
- $this->Mail->Encoding = "quoted-printable";
-
- $this->BuildBody();
- $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
- }
-
- /**
- * Try a plain message.
- */
- function test_Html() {
-
- $this->Mail->IsHTML(true);
- $this->Mail->Subject .= ": HTML only";
-
- $this->Mail->Body = "This is a <b>test message</b> written in HTML.
</br>" .
- "Go to <a
href=\"http://phpmailer.sourceforge.net/\";>" .
- "http://phpmailer.sourceforge.net/</a> for new
versions of " .
- "phpmailer. <p/> Thank you!";
-
- $this->BuildBody();
- $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
- }
-
- /**
- * Simple HTML and attachment test
- */
- function test_HTML_Attachment() {
-
- $this->Mail->Body = "This is the <b>HTML</b> part of the email.";
- $this->Mail->Subject .= ": HTML + Attachment";
- $this->Mail->IsHTML(true);
-
- if(!$this->Mail->AddAttachment("phpmailer_test.php",
"test_attach.txt"))
- {
- $this->assert(false, $this->Mail->ErrorInfo);
- return;
- }
-
- $this->BuildBody();
- $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
- }
-
- /**
- * An embedded attachment test.
- */
- function test_Embedded_Image() {
-
- $this->Mail->Body = "Embedded Image: <img alt=\"phpmailer\"
src=\"cid:my-attach\">" .
- "Here is an image!</a>";
- $this->Mail->Subject .= ": Embedded Image";
- $this->Mail->IsHTML(true);
-
- if(!$this->Mail->AddEmbeddedImage("test.png", "my-attach", "test.png",
- "base64", "image/png"))
- {
- $this->assert(false, $this->Mail->ErrorInfo);
- return;
- }
-
- $this->BuildBody();
- $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
- }
-
- /**
- * An embedded attachment test.
- */
- function test_Multi_Embedded_Image() {
-
- $this->Mail->Body = "Embedded Image: <img alt=\"phpmailer\"
src=\"cid:my-attach\">" .
- "Here is an image!</a>";
- $this->Mail->Subject .= ": Embedded Image + Attachment";
- $this->Mail->IsHTML(true);
-
- if(!$this->Mail->AddEmbeddedImage("test.png", "my-attach", "test.png",
- "base64", "image/png"))
- {
- $this->assert(false, $this->Mail->ErrorInfo);
- return;
- }
-
- if(!$this->Mail->AddAttachment("phpmailer_test.php", "test.txt"))
- {
- $this->assert(false, $this->Mail->ErrorInfo);
- return;
- }
-
- $this->BuildBody();
- $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
- }
-
- /**
- * Simple multipart/alternative test.
- */
- function test_AltBody() {
-
- $this->Mail->Body = "This is the <b>HTML</b> part of the email.";
- $this->Mail->AltBody = "Here is the text body of this message. " .
- "It should be quite a few lines. It should be wrapped at
the " .
- "40 characters. Make sure that it is.";
- $this->Mail->WordWrap = 40;
- $this->AddNote("This is a mulipart alternative email");
- $this->Mail->Subject .= ": AltBody + Word Wrap";
-
- $this->BuildBody();
- $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
- }
-
- /**
- * Simple HTML and attachment test
- */
- function test_AltBody_Attachment() {
-
- $this->Mail->Body = "This is the <b>HTML</b> part of the email.";
- $this->Mail->AltBody = "This is the text part of the email.";
- $this->Mail->Subject .= ": AltBody + Attachment";
- $this->Mail->IsHTML(true);
-
- if(!$this->Mail->AddAttachment("phpmailer_test.php",
"test_attach.txt"))
- {
- $this->assert(false, $this->Mail->ErrorInfo);
- return;
- }
-
- $this->BuildBody();
- $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
-
- $fp = fopen("message.txt", "w");
- fwrite($fp, $this->Mail->CreateHeader() . $this->Mail->CreateBody());
- fclose($fp);
- }
-
- function test_MultipleSend() {
- $this->Mail->Body = "Sending two messages without keepalive";
- $this->BuildBody();
- $subject = $this->Mail->Subject;
-
- $this->Mail->Subject = $subject . ": SMTP 1";
- $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
-
- $this->Mail->Subject = $subject . ": SMTP 2";
- $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
- }
-
- function test_SmtpKeepAlive() {
- $this->Mail->Body = "This was done using the SMTP keep-alive.";
- $this->BuildBody();
- $subject = $this->Mail->Subject;
-
- $this->Mail->SMTPKeepAlive = true;
- $this->Mail->Subject = $subject . ": SMTP keep-alive 1";
- $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
-
- $this->Mail->Subject = $subject . ": SMTP keep-alive 2";
- $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
- $this->Mail->SmtpClose();
- }
-
- /**
- * Tests this denial of service attack:
- * http://www.cybsec.com/vuln/PHPMailer-DOS.pdf
- */
- function test_DenialOfServiceAttack() {
- $this->Mail->Body = "This should no longer cause a denial of service.";
- $this->BuildBody();
-
- $this->Mail->Subject = str_repeat("A", 998);
- $this->assert($this->Mail->Send(), $this->Mail->ErrorInfo);
- }
-
- function test_Error() {
- $this->Mail->Subject .= ": This should be sent";
- $this->BuildBody();
- $this->Mail->ClearAllRecipients(); // no addresses should cause an
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);
- $this->Mail->AddAddress(get("mail_to"));
- $this->assert($this->Mail->Send(), "Send failed");
- }
-}
-
-/**
- * Create and run test instance.
- */
-
-if(isset($HTTP_GET_VARS))
- $global_vars = $HTTP_GET_VARS;
-else
- $global_vars = $_REQUEST;
-
-if(isset($global_vars["submitted"]))
-{
- echo "Test results:<br>";
- $suite = new TestSuite( "phpmailerTest" );
-
- $testRunner = new TestRunner;
- $testRunner->run($suite);
- echo "<hr noshade/>";
-}
-
-function get($sName) {
- global $global_vars;
- if(isset($global_vars[$sName]))
- return $global_vars[$sName];
- else
- return "";
-}
-
-?>
-
-<html>
-<body>
-<h3>phpmailer Unit Test</h3>
-By entering a SMTP hostname it will automatically perform tests with SMTP.
-
-<form name="phpmailer_unit" action="phpmailer_test.php" method="get">
-<input type="hidden" name="submitted" value="1"/>
-To Address: <input type="text" size="50" name="mail_to" value="<?php echo
get("mail_to"); ?>"/>
-<br/>
-Cc Address: <input type="text" size="50" name="mail_cc" value="<?php echo
get("mail_cc"); ?>"/>
-<br/>
-SMTP Hostname: <input type="text" size="50" name="mail_host" value="<?php echo
get("mail_host"); ?>"/>
-<p/>
-<input type="submit" value="Run Test"/>
-
-</form>
-</body>
-</html>
Deleted: people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/phpunit.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/phpunit.php
2009-11-22 16:31:30 UTC (rev 20878)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/phpunit.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -1,376 +0,0 @@
-<?php
-//
-// PHP framework for testing, based on the design of "JUnit".
-//
-// Written by Fred Yankowski <address@hidden>
-// OntoSys, Inc <http://www.OntoSys.com>
-//
-// $Id: phpunit.php 1040 2008-05-26 10:27:54Z dave $
-
-// Copyright (c) 2000 Fred Yankowski
-
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use, copy,
-// modify, merge, publish, distribute, sublicense, and/or sell copies
-// of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE |
- E_CORE_ERROR | E_CORE_WARNING);
-
-/*
-interface Test {
- function run(&$aTestResult);
- function countTestCases();
-}
-*/
-
-function trace($msg) {
- return;
- print($msg);
- flush();
-}
-
-
-class Exception {
- /* Emulate a Java exception, sort of... */
- var $message;
- function Exception($message) {
- $this->message = $message;
- }
- function getMessage() {
- return $this->message;
- }
-}
-
-class Assert {
- function assert($boolean, $message=0) {
- if (! $boolean)
- $this->fail($message);
- }
-
- function assertEquals($expected, $actual, $message=0) {
- if ($expected != $actual) {
- $this->failNotEquals($expected, $actual, "expected", $message);
- }
- }
-
- function assertRegexp($regexp, $actual, $message=false) {
- if (! preg_match($regexp, $actual)) {
- $this->failNotEquals($regexp, $actual, "pattern", $message);
- }
- }
-
- function failNotEquals($expected, $actual, $expected_label, $message=0) {
- // Private function for reporting failure to match.
- $str = $message ? ($message . ' ') : '';
- $str .= "($expected_label/actual)<br>";
- $htmlExpected = htmlspecialchars($expected);
- $htmlActual = htmlspecialchars($actual);
- $str .= sprintf("<pre>%s\n--------\n%s</pre>",
- $htmlExpected, $htmlActual);
- $this->fail($str);
- }
-}
-
-class TestCase extends Assert /* implements Test */ {
- /* Defines context for running tests. Specific context -- such as
- instance variables, global variables, global state -- is defined
- by creating a subclass that specializes the setUp() and
- tearDown() methods. A specific test is defined by a subclass
- that specializes the runTest() method. */
- var $fName;
- var $fResult;
- var $fExceptions = array();
-
- function TestCase($name) {
- $this->fName = $name;
- }
-
- function run($testResult=0) {
- /* Run this single test, by calling the run() method of the
- TestResult object which will in turn call the runBare() method
- of this object. That complication allows the TestResult object
- to do various kinds of progress reporting as it invokes each
- test. Create/obtain a TestResult object if none was passed in.
- Note that if a TestResult object was passed in, it must be by
- reference. */
- if (! $testResult)
- $testResult = $this->_createResult();
- $this->fResult = $testResult;
- $testResult->run(&$this);
- $this->fResult = 0;
- return $testResult;
- }
-
- function countTestCases() {
- return 1;
- }
-
- function runTest() {
- $name = $this->name();
- // Since isset($this->$name) is false, no way to run defensive checks
- $this->$name();
- }
-
- function setUp() /* expect override */ {
- //print("TestCase::setUp()<br>\n");
- }
-
- function tearDown() /* possible override */ {
- //print("TestCase::tearDown()<br>\n");
- }
-
- ////////////////////////////////////////////////////////////////
-
-
- function _createResult() /* protected */ {
- /* override this to use specialized subclass of TestResult */
- return new TestResult;
- }
-
- function fail($message=0) {
- //printf("TestCase::fail(%s)<br>\n", ($message) ? $message : '');
- /* JUnit throws AssertionFailedError here. We just record the
- failure and carry on */
- $this->fExceptions[] = new Exception(&$message);
- }
-
- function error($message) {
- /* report error that requires correction in the test script
- itself, or (heaven forbid) in this testing infrastructure */
- printf('<b>ERROR: ' . $message . '</b><br>');
- $this->fResult->stop();
- }
-
- function failed() {
- return count($this->fExceptions);
- }
-
- function getExceptions() {
- return $this->fExceptions;
- }
-
- function name() {
- return $this->fName;
- }
-
- function runBare() {
- $this->setup();
- $this->runTest();
- $this->tearDown();
- }
-}
-
-
-class TestSuite /* implements Test */ {
- /* Compose a set of Tests (instances of TestCase or TestSuite), and
- run them all. */
- var $fTests = array();
-
- function TestSuite($classname=false) {
- if ($classname) {
- // Find all methods of the given class whose name starts with
- // "test" and add them to the test suite. We are just _barely_
- // able to do this with PHP's limited introspection... Note
- // that PHP seems to store method names in lower case, and we
- // have to avoid the constructor function for the TestCase class
- // superclass. This will fail when $classname starts with
- // "Test" since that will have a constructor method that will
- // get matched below and then treated (incorrectly) as a test
- // method. So don't name any TestCase subclasses as "Test..."!
- if (floor(phpversion()) >= 4) {
- // PHP4 introspection, submitted by Dylan Kuhn
- $names = get_class_methods($classname);
- while (list($key, $method) = each($names)) {
- if (preg_match('/^test/', $method) && $method != "testcase") {
- $this->addTest(new $classname($method));
- }
- }
- }
- else {
- $dummy = new $classname("dummy");
- $names = (array) $dummy;
- while (list($key, $value) = each($names)) {
- $type = gettype($value);
- if ($type == "user function" && preg_match('/^test/', $key)
- && $key != "testcase") {
- $this->addTest(new $classname($key));
- }
- }
- }
- }
- }
-
- function addTest($test) {
- /* Add TestCase or TestSuite to this TestSuite */
- $this->fTests[] = $test;
- }
-
- function run(&$testResult) {
- /* Run all TestCases and TestSuites comprising this TestSuite,
- accumulating results in the given TestResult object. */
- reset($this->fTests);
- while (list($na, $test) = each($this->fTests)) {
- if ($testResult->shouldStop())
- break;
- $test->run(&$testResult);
- }
- }
-
- function countTestCases() {
- /* Number of TestCases comprising this TestSuite (including those
- in any constituent TestSuites) */
- $count = 0;
- reset($fTests);
- while (list($na, $test_case) = each($this->fTests)) {
- $count += $test_case->countTestCases();
- }
- return $count;
- }
-}
-
-
-class TestFailure {
- /* Record failure of a single TestCase, associating it with the
- exception(s) that occurred */
- var $fFailedTestName;
- var $fExceptions;
-
- function TestFailure(&$test, &$exceptions) {
- $this->fFailedTestName = $test->name();
- $this->fExceptions = $exceptions;
- }
-
- function getExceptions() {
- return $this->fExceptions;
- }
- function getTestName() {
- return $this->fFailedTestName;
- }
-}
-
-
-class TestResult {
- /* Collect the results of running a set of TestCases. */
- var $fFailures = array();
- var $fRunTests = 0;
- var $fStop = false;
-
- function TestResult() { }
-
- function _endTest($test) /* protected */ {
- /* specialize this for end-of-test action, such as progress
- reports */
- }
-
- function getFailures() {
- return $this->fFailures;
- }
-
- function run($test) {
- /* Run a single TestCase in the context of this TestResult */
- $this->_startTest($test);
- $this->fRunTests++;
-
- $test->runBare();
-
- /* this is where JUnit would catch AssertionFailedError */
- $exceptions = $test->getExceptions();
- if ($exceptions)
- $this->fFailures[] = new TestFailure(&$test, &$exceptions);
- $this->_endTest($test);
- }
-
- function countTests() {
- return $this->fRunTests;
- }
-
- function shouldStop() {
- return $this->fStop;
- }
-
- function _startTest($test) /* protected */ {
- /* specialize this for start-of-test actions */
- }
-
- function stop() {
- /* set indication that the test sequence should halt */
- $fStop = true;
- }
-
- function countFailures() {
- return count($this->fFailures);
- }
-}
-
-
-class TextTestResult extends TestResult {
- /* Specialize TestResult to produce text/html report */
- function TextTestResult() {
- $this->TestResult(); // call superclass constructor
- }
-
- function report() {
- /* report result of test run */
- $nRun = $this->countTests();
- $nFailures = $this->countFailures();
- printf("<p>%s test%s run<br>", $nRun, ($nRun == 1) ? '' : 's');
- printf("%s failure%s.<br>\n", $nFailures, ($nFailures == 1) ? '' : 's');
- if ($nFailures == 0)
- return;
-
- print("<ol>\n");
- $failures = $this->getFailures();
- while (list($i, $failure) = each($failures)) {
- $failedTestName = $failure->getTestName();
- printf("<li>%s\n", $failedTestName);
-
- $exceptions = $failure->getExceptions();
- print("<ul>");
- while (list($na, $exception) = each($exceptions))
- printf("<li>%s\n", $exception->getMessage());
- print("</ul>");
- }
- print("</ol>\n");
- }
-
- function _startTest($test) {
- printf("%s ", $test->name());
- flush();
- }
-
- function _endTest($test) {
- $outcome = $test->failed()
- ? "<font color=\"red\">FAIL</font>"
- : "<font color=\"green\">ok</font>";
- printf("$outcome<br>\n");
- flush();
- }
-}
-
-
-class TestRunner {
- /* Run a suite of tests and report results. */
- function run($suite) {
- $result = new TextTestResult;
- $suite->run($result);
- $result->report();
- }
-}
-
-?>
Added:
people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/test_callback.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/test_callback.php
(rev 0)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/test_callback.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,84 @@
+<html>
+<head>
+<title>PHPMailer Lite - DKIM and Callback Function test</title>
+</head>
+<body>
+
+<?php
+/* This is a sample callback function for PHPMailer Lite.
+ * This callback function will echo the results of PHPMailer processing.
+ */
+
+/* Callback (action) function
+ * bool $result result of the send action
+ * string $to email address of the recipient
+ * string $cc cc email addresses
+ * string $bcc bcc email addresses
+ * string $subject the subject
+ * string $body the email body
+ * @return boolean
+ */
+function callbackAction ($result, $to, $cc, $bcc, $subject, $body) {
+ /*
+ this callback example echos the results to the screen - implement to
+ post to databases, build CSV log files, etc., with minor changes
+ */
+ $to = cleanEmails($to,'to');
+ $cc = cleanEmails($cc[0],'cc');
+ $bcc = cleanEmails($bcc[0],'cc');
+ echo $result . "\tTo: " . $to['Name'] . "\tTo: " . $to['Email'] . "\tCc: "
. $cc['Name'] . "\tCc: " . $cc['Email'] . "\tBcc: " . $bcc['Name'] . "\tBcc:
" . $bcc['Email'] . "\t" . $subject . "<br />\n";
+ return true;
+}
+
+$testLite = false;
+
+if ($testLite) {
+ require_once '../class.phpmailer-lite.php';
+ $mail = new PHPMailerLite();
+} else {
+ require_once '../class.phpmailer.php';
+ $mail = new PHPMailer();
+}
+
+try {
+ $mail->IsMail(); // telling the class to use SMTP
+ $mail->SetFrom('address@hidden', 'Your Name');
+ $mail->AddAddress('address@hidden', 'John Doe');
+ $mail->Subject = 'PHPMailer Lite Test Subject via Mail()';
+ $mail->AltBody = 'To view the message, please use an HTML compatible email
viewer!'; // optional - MsgHTML will create an alternate automatically
+ $mail->MsgHTML(file_get_contents('contents.html'));
+ $mail->AddAttachment('images/phpmailer.gif'); // attachment
+ $mail->AddAttachment('images/phpmailer_mini.gif'); // attachment
+ $mail->action_function = 'callbackAction';
+ $mail->Send();
+ echo "Message Sent OK</p>\n";
+} catch (phpmailerException $e) {
+ echo $e->errorMessage(); //Pretty error messages from PHPMailer
+} catch (Exception $e) {
+ echo $e->getMessage(); //Boring error messages from anything else!
+}
+
+function cleanEmails($str,$type) {
+ if ($type == 'cc') {
+ $addy['Email'] = $str[0];
+ $addy['Name'] = $str[1];
+ return $addy;
+ }
+ if (!strstr($str, ' <')) {
+ $addy['Name'] = '';
+ $addy['Email'] = $addy;
+ return $addy;
+ }
+ $addyArr = explode(' <', $str);
+ if (substr($addyArr[1],-1) == '>') {
+ $addyArr[1] = substr($addyArr[1],0,-1);
+ }
+ $addy['Name'] = $addyArr[0];
+ $addy['Email'] = $addyArr[1];
+ $addy['Email'] = str_replace('@', '@', $addy['Email']);
+ return $addy;
+}
+
+?>
+</body>
+</html>
Added: people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/testemail.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/testemail.php
(rev 0)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/phpmailer/test/testemail.php
2009-11-22 19:32:35 UTC (rev 20879)
@@ -0,0 +1,48 @@
+<?php
+/**
+* Simple example script using PHPMailer with exceptions enabled
+* @package phpmailer
+* @version $Id$
+*/
+
+require '../class.phpmailer.php';
+
+try {
+ $mail = new PHPMailer(true); //New instance, with exceptions enabled
+
+ $body = file_get_contents('contents.html');
+ $body = preg_replace('/\\\\/','', $body); //Strip
backslashes
+
+ $mail->IsSMTP(); // tell the class to use SMTP
+ $mail->SMTPAuth = true; // enable SMTP authentication
+ $mail->Port = 25; // set the SMTP server port
+ $mail->Host = "mail.yourdomain.com"; // SMTP server
+ $mail->Username = "address@hidden"; // SMTP server username
+ $mail->Password = "password"; // SMTP server password
+
+ $mail->IsSendmail(); // tell the class to use Sendmail
+
+ $mail->AddReplyTo("address@hidden","First Last");
+
+ $mail->From = "address@hidden";
+ $mail->FromName = "First Last";
+
+ $to = "address@hidden";
+
+ $mail->AddAddress($to);
+
+ $mail->Subject = "First PHPMailer Message";
+
+ $mail->AltBody = "To view the message, please use an HTML compatible
email viewer!"; // optional, comment out and test
+ $mail->WordWrap = 80; // set word wrap
+
+ $mail->MsgHTML($body);
+
+ $mail->IsHTML(true); // send as HTML
+
+ $mail->Send();
+ echo 'Message has been sent.';
+} catch (phpmailerException $e) {
+ echo $e->errorMessage();
+}
+?>
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] [20879] Update phpmailer to latest from upstream,
Sigurd Nes <=