0
0
mirror of https://github.com/PHPMailer/PHPMailer.git synced 2024-09-20 18:03:04 +02:00
Commit Graph

704 Commits

Author SHA1 Message Date
Marcus Bointon
37d3550706 Merge pull request #554 from aranaur/patch-1
grammar
2015-11-09 08:21:34 +01:00
Drew Gates
56bac7f161 Update README.md 2015-11-06 09:51:38 -05:00
Drew Gates
485e685f1e grammar 2015-11-04 12:19:54 -05:00
Synchro
e774bc9152 Merge remote-tracking branch 'upstream/master' 2015-11-01 11:15:28 +01:00
Synchro
1102fd37ae Bump version to 5.2.14 2015-11-01 11:14:44 +01:00
Synchro
6687a96a18 Add test for line breaks in addresses vulnerability
Don't allow line breaks in addresses
Don't allow line breaks in SMTP commands
Rearrange tests so slowest tests run last
2015-11-01 11:12:04 +01:00
Marcus Bointon
5de0a5246c Merge pull request #548 from phelipealves/master
Brazilian Portuguese updated
2015-11-01 10:01:02 +00:00
Phelipe Alves de Souza
18ef11685a Brazilian Portuguese updated 2015-10-31 23:00:13 -02:00
Marcus Bointon
1cd906ba05 Merge pull request #545 from Forst/master
Updated Russian localization
2015-10-28 22:34:41 +00:00
Foster Forst Snowhill
3b660771d0 Updated Russian localization
* Translated "Extension missing: "
* Removed duplicate "Extension missing: " stub in Galician
* Added "Extension missing: " stub to Hebrew
2015-10-28 18:27:41 +03:00
Marcus Bointon
fe1e8699f0 Don't try to set accessType, at least until upstream fixes access to it 2015-10-23 21:25:23 +01:00
Marcus Bointon
c24f242d9b Fix xoauth package suggestions 2015-10-23 14:59:55 +02:00
Marcus Bointon
a4b8b91027 Partial fix for #539 2015-10-23 13:32:43 +02:00
Marcus Bointon
45bb9a3636 Merge pull request #536 from Jonadabe/patch-2
Update phpmailer.lang-pt.php
2015-10-21 20:11:20 +02:00
Jonadabe
6f94d76d23 Update phpmailer.lang-pt.php 2015-10-21 18:39:15 +01:00
Synchro
0f24d1e679 Version checks are no use for language constructs 2015-10-21 14:47:35 +02:00
Marcus Bointon
dc0e0935ab Merge pull request #534 from fbonzon/patch-1
Fix a typo in comment
2015-10-19 17:11:10 +02:00
François B
5a17d6a1fc Fix a typo in comment 2015-10-19 17:09:43 +02:00
Synchro
881289ba64 Changelog 2015-10-14 23:33:44 +02:00
Synchro
8e02d00823 Correct documented type of OAuth property. Will probably need to change this when merging xoauth banch. 2015-10-14 23:29:11 +02:00
Marcus Bointon
efd91ea796 Merge pull request #529 from fbonzon/master
Allow addresses with IDN
2015-10-14 23:10:52 +02:00
Marcus Bointon
aeae681c99 Merge pull request #530 from fbonzon/scrutinizer
Fix comments, suggested by scrutinizer
2015-10-14 23:08:16 +02:00
François B
65c213ae70 Fix comments, suggested by scrutinizer 2015-10-14 22:33:01 +02:00
François B
0fa9518609 Allow addresses with IDN
Accepts Internationalized Domain Name everywhere PHPMailler expects
email addresses (To, CC, BCC, Reply-To, From, Sender and
ConfirmReadingTo).

Requires PHP >= 5.3 with "intl" extension installed and "mbstring"
extension enabled. Earlier versions don't see a change, i.e. specifying
an address with IDN still fails validation.

Follow-up to PR #516. Ran test/phpmailerTest.php

Other changes:

- From, Sender and ConfirmReadingTo addresses are now validated in
send(). Previously, only From and Sender addresses would be validated
only if specified via the setFrom() method. ConfirmReadingTo was never
validated.

- Half language strings for the 'invalid_address' message used colon at
the end and half didn't. Harmonized messages to always include colon,
and not add a second one with PHP code.
2015-10-14 22:02:07 +02:00
Marcus Bointon
6b12c212c4 Merge pull request #527 from fbonzon/array_key_exists
Prefer array_key_exists() over isset()
2015-10-13 23:18:14 +02:00
François B
c2447dcf97 Prefer array_key_exists() over isset() 2015-10-13 23:16:06 +02:00
Marcus Bointon
23c3589624 Merge pull request #526 from fbonzon/comments
Improve some comments and minor improvements
2015-10-13 22:53:18 +02:00
François B
4532cec50d Improve some comments and minor improvements
- Define an $error_message and reuse it, instead of recreating the
error message 3 times
- Use in_array() check instead of a regex
2015-10-13 22:38:15 +02:00
Marcus Bointon
8bea0ad20c Merge pull request #520 from fbonzon/master
Change line endings from CRLF to LF
2015-10-02 18:55:09 +02:00
François B
b87462979b Change line endings from CRLF to LF
All files in PHPMailer have LF line endings, except those two.
Harmonize line endings to LF for consistency.
2015-10-02 18:52:29 +02:00
Marcus Bointon
e2a9ec16bd Merge pull request #515 from dnepro/master
[TASK] replace "@type" annotation in favor of "@var" as proposed by phpdoc.org
2015-09-28 12:19:31 +02:00
Roman Minchyn
870350756b [TASK]
replace "@type" annotation in favor of "@var" as proposed by phpdoc.org

Issue #513
2015-09-28 11:35:42 +02:00
Synchro
40a0a1b160 Allow retrieving POP3 errors
Move private properties to protected
2015-09-24 10:23:39 +02:00
Synchro
b6f421c5ff Clean up 2015-09-22 08:16:40 +02:00
Synchro
d6d7a8d17c Avoid IDE warnings in a mixed PHP version project 2015-09-22 08:11:09 +02:00
Marcus Bointon
b3677b9b17 Merge pull request #504 from Nibbels/master
Certificate Chain fix for Thunderbird
2015-09-22 08:08:52 +02:00
Nibbels
6672f36063 Update signed-mail.phps 2015-09-22 01:57:45 +02:00
Nibbels
5353214121 Update signed-mail.phps 2015-09-22 01:55:56 +02:00
Nibbels
b58021454c Update signed-mail.phps 2015-09-22 01:53:29 +02:00
Marcus Bointon
d9b8d4a371 Merge pull request #503 from fbonzon/patch-1
Fix comments about $Hostname
2015-09-19 11:40:53 +02:00
François B
4cd1309cfe Improve again comment about $Hostname and HELO string relation 2015-09-19 05:58:10 +02:00
François B
8a07954fd1 Fix comments about $Hostname
According to changelog, setting the Received header has been removed in Version 1.72 in 2004.

The $Hostname value has actually no influence on the HELO string.
2015-09-19 05:29:18 +02:00
Marcus Bointon
b192b453e7 Merge pull request #502 from fbonzon/master
In examples, prefer setFrom() over separate From and FromName
2015-09-18 00:35:17 +02:00
François B
e1964ddce4 Make sure PHP default character encoding is UTF-8
Needed for htmlentities() call on line 173
2015-09-18 00:09:40 +02:00
François B
20112cc8fe Prefer setFrom() over separate From and FromName 2015-09-18 00:06:58 +02:00
Marcus Bointon
76619dd21a Merge pull request #501 from fbonzon/master
Remove exec bit
2015-09-17 16:24:09 +02:00
François B
6288e189b9 Remove exec bit
Introduced by mistake in dbf3fad6e2
2015-09-17 15:12:40 +02:00
Synchro
acaeaa9dd3 Remove exec bit 2015-09-17 11:52:54 +02:00
Marcus Bointon
20b705353a Merge pull request #497 from fbonzon/patch1
Update French translation, minor changes
2015-09-15 08:09:22 +02:00
François B
09c9ebae1a Remove trailing slash in URL
Trailing slash in GitHub URLs is not needed, and for consistency with
PHPMailer logo which does not have the trailing slash
2015-09-15 06:40:05 +02:00