Changeset 735 for branches/1.1dev
- Timestamp:
- Oct 30, 2020 11:44:05 PM (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/1.1dev/lib/Email.inc.php
r708 r735 76 76 . '((?:[^.<>\s@\",\[\]]+[^<>\s@\",\[\]])*[^.<>\s@\",\[\]]+)' // Local-part 77 77 . '@' // @ 78 . '((?:(\[)|[ A-Z0-9]?)' // Domain, first char78 . '((?:(\[)|[a-z0-9]?)' // Domain, first char 79 79 . '(?(4)' // Domain conditional for if first domain char is [ 80 80 . '(?:[0-9]{1,3}\.){3}[0-9]{1,3}\]' // TRUE, matches IP address 81 81 . '|' 82 . '[.-]?(?:[ A-Z0-9]+[-.])*(?:[A-Z0-9]+\.)+[A-Z]{2,6}))'// FALSE, matches domain name82 . '[.-]?(?:[a-z0-9]+[-.])*(?:[a-z0-9]+\.)+[a-z]{2,19}))' // FALSE, matches domain name 83 83 . '(?(1)' // Comment conditional for if initial < exists 84 84 . '(?:>\s*|>\s+\([^,@]+\)\s*)' // TRUE, ensure ending > … … 292 292 293 293 // This is the address where delivery problems are sent to. We must strip off everything except the local@domain part. 294 $envelope_sender_address = preg_replace('/^.*<?([^\s@\[\]<>()]+\@[A-Za-z0-9.-]{1,}\.[A-Za-z]{2, 5})>?$/iU', '$1', $this->_params['from']);294 $envelope_sender_address = preg_replace('/^.*<?([^\s@\[\]<>()]+\@[A-Za-z0-9.-]{1,}\.[A-Za-z]{2,19})>?$/iU', '$1', $this->_params['from']); 295 295 if ('' != $envelope_sender_address && $this->validEmail($envelope_sender_address)) { 296 296 $envelope_sender_header = sprintf('-f %s', $envelope_sender_address);
Note: See TracChangeset
for help on using the changeset viewer.