extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 09:32:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

an implementation of imap_rfc822_parse_adrlist and imap_rfc822_write_address, to obsolete imap extension

Browse Source
This commit is contained in:
Ralf Becker 2014-04-18 12:51:17 +00:00
parent 90d2c68139
commit 54dc648b18
2 changed files with 103 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
phpgwapi/inc/common_functions.inc.php
View File

@ -73,11 +73,20 @@ function cut_bytes(&$data,$offset,$len=null)
if (!function_exists('imap_rfc822_parse_adrlist')) if (!function_exists('imap_rfc822_parse_adrlist'))
{ {
/** /**
* parses an address string * parses a (comma-separated) address string
* Examples: Joe Doe <doe@example.com>, "Doe, Joe" <doe@example.com> , "\'Joe Doe\'" <doe@example.com>, *
* postmaster@example.com, root, "Joe on its way Down Under :-\)" <doe@example.com>, * Examples:
* "Giant; \"Big\" Box" <sysservices@example.net>, sysservices@example.net <sysservices@example.net>, * - Joe Doe <doe@example.com>
* - "Doe, Joe" <doe@example.com>
* - "\'Joe Doe\'" <doe@example.com> // actually not necessary to quote
* - postmaster@example.com
* - root
* - "Joe on its way Down Under :-\)" <doe@example.com>
* - "Giant; \"Big\" Box" <sysservices@example.net>
* - sysservices@example.net <sysservices@example.net> // this is wrong, because @ need to be quoted
*
* Invalid addresses, if detected, set host to '.SYNTAX-ERROR.' * Invalid addresses, if detected, set host to '.SYNTAX-ERROR.'
*
* @param string $address - A string containing addresses * @param string $address - A string containing addresses
* @param string $default_host - The default host name * @param string $default_host - The default host name
* @return array of objects. The objects properties are: * @return array of objects. The objects properties are:
@ -86,10 +95,48 @@ if (!function_exists('imap_rfc822_parse_adrlist'))
* personal - the personal name * personal - the personal name
* adl - at domain source route * adl - at domain source route
*/ */
//function imap_rfc822_parse_adrlist(string $address, string $default_host) function imap_rfc822_parse_adrlist($address, $default_host)
//{ {
// return array(); $addresses = array();
//} $pending = '';
foreach(explode(',', $address) as $part)
{
$trimmed = trim(($pending ? $pending.',' : '').$part);
if ($trimmed[0] == '"' && substr($trimmed, -1) != '>')
{
$pending .= ($pending ? $pending.',' : '').$part;
continue;
}
$pending = '';
$matches = $personal = $mailbox = $host = null;
if (preg_match('/^(.*)<([^>@]+)(@([^>]+))?>$/', $trimmed, $matches))
{
$personal = trim($matches[1]);
$mailbox = $matches[2];
$host = $matches[4];
}
elseif (strpos($trimmed, '@') !== false)
{
list($mailbox, $host) = explode('@', $trimmed);
}
else
{
$mailbox = $trimmed;
}
if ($personal[0] == '"' && substr($personal, -1) == '"')
{
$personal = str_replace('\\', '', substr($personal, 1, -1));
}
if (empty($host)) $host = $default_host;
$addresses[] = (object)array_diff(array(
'mailbox' => $mailbox,
'host' => $host,
'personal' => $personal,
), array(null, ''));
}
return $addresses;
}
} }
if (!function_exists('imap_rfc822_write_address')) if (!function_exists('imap_rfc822_write_address'))
@ -101,11 +148,14 @@ if (!function_exists('imap_rfc822_write_address'))
* @param string $personal - The name of the account owner * @param string $personal - The name of the account owner
* @return string properly formatted email address as defined in » RFC2822. * @return string properly formatted email address as defined in » RFC2822.
*/ */
function imap_rfc822_write_address(string $mailbox , string $host , string $personal) function imap_rfc822_write_address($mailbox, $host, $personal)
{ {
// ToDo: correctly handle personal strings like "Giant; \"Big\" Box" or Fuzzy, Brain //if (!preg_match('/^[!#$%&\'*+/0-9=?A-Z^_`a-z{|}~-]+$/u', $personal)) // that's how I read the rfc(2)822
if (stripos($personal,',')) $personal = '"'.$personal.'"'; // probably too simplistic if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal)) // but quoting is never wrong, so quote more then necessary
return (!empty($personal)?$personal.' ':'').'<'.$mailbox.'@'.$host.'>'; {
$personal = '"'.str_replace(array('\\', '"'),array('\\\\', '\\"'), $personal).'"';
}
return ($personal ? $personal.' <' : '').$mailbox.($host ? '@'.$host : '').($personal ? '>' : '');
} }
} }

41
phpgwapi/tests/rfc822.php Normal file
View File

@ -0,0 +1,41 @@
<?php
/**
* Test for imap_rfc822_parse_adrlist replacement in common_functions.inc.php
*
* @author Ralf Becker <rb@stylite.de>
*/
if (php_sapi_name() != 'cli')
{
echo "<pre>\n";
}
else
{
chdir(__DIR__);
}
include '../inc/common_functions.inc.php';
$addresses = array(
'Joe Doe <doe@example.com>',
'"Doe, Joe" <doe@example.com>',
'"\\\'Joe Doe\\\'" <doe@example.com>', // "\'Joe Doe\'" <doe@example.com>
'postmaster@example.com',
'root',
'"Joe on its way Down Under :-\)" <doe@example.com>',
'"Giant; \\"Big\\" Box" <sysservices@example.net>', // "Giant; \"Big\" Box" <sysservices@example.net>
'"sysservices@example.net" <sysservices@example.net>',
);
$addresses[] = implode(', ', $addresses);
$default_host = 'default.host';
foreach($addresses as $address)
{
echo "\n\n$address:\n";
$parsed = my_imap_rfc822_parse_adrlist($address, $default_host);
print_r($parsed);
echo my_imap_rfc822_write_address($parsed[0]->mailbox,
$parsed[0]->host !== $default_host ? $parsed[0]->host : '',
!empty($parsed[0]->personal) ? $parsed[0]->personal : '')."\n";
}