projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved address-parsing to the displayable headers
[squirrelmail.git]
/
functions
/
imap_parse.php
diff --git
a/functions/imap_parse.php
b/functions/imap_parse.php
index a4b08fd065352a05d867a3b1b6870ac76475e513..3798bb9898622aaee06963652f9585cc88b48ea6 100644
(file)
--- a/
functions/imap_parse.php
+++ b/
functions/imap_parse.php
@@
-204,7
+204,7
@@
function sqimap_parse_RFC822Header ($read, $hdr) {
if (strlen(trim($hdr->subject)) == 0) {
$hdr->subject = _("(no subject)");
}
if (strlen(trim($hdr->subject)) == 0) {
$hdr->subject = _("(no subject)");
}
- if (strlen(trim($hdr->from)) == 0) {
+ if (
!is_object($hdr->from) &&
strlen(trim($hdr->from)) == 0) {
$hdr->from = _("(unknown sender)");
}
if (strlen(trim($hdr->date)) == 0) {
$hdr->from = _("(unknown sender)");
}
if (strlen(trim($hdr->date)) == 0) {
@@
-221,6
+221,13
@@
function sqimap_parse_RFC822Header ($read, $hdr) {
}
$i++;
break;
}
$i++;
break;
+ case 'u':
+ /* User-Agent */
+ if (strtolower(substr($line,0,10)) == 'user-agent') {
+ $hdr->xmailer = trim(substr($line, 10));
+ }
+ $i++;
+ break;
default:
$i++;
break;
default:
$i++;
break;
@@
-281,7
+288,7
@@
function sqimap_parse_address($address, $ar, $addr_ar = array(), $group = '') {
$name = substr($address,0,$addr_start);
}
$at = strpos($addr, '@');
$name = substr($address,0,$addr_start);
}
$at = strpos($addr, '@');
- $addr_structure = new
address_s
tructure();
+ $addr_structure = new
AddressS
tructure();
$addr_structure->personal = $name;
$addr_structure->group = $group;
$addr_structure->personal = $name;
$addr_structure->group = $group;
@@
-320,7
+327,7
@@
function sqimap_parse_address($address, $ar, $addr_ar = array(), $group = '') {
$name = substr($address,0,$addr_start);
}
$at = strpos($addr, '@');
$name = substr($address,0,$addr_start);
}
$at = strpos($addr, '@');
- $addr_structure = new
address_s
tructure();
+ $addr_structure = new
AddressS
tructure();
$addr_structure->group = $group;
if ($at) {
$addr_structure->mailbox = trim(substr($addr,0,$at));
$addr_structure->group = $group;
if ($at) {
$addr_structure->mailbox = trim(substr($addr,0,$at));
@@
-347,4
+354,4
@@
function sqimap_parse_address($address, $ar, $addr_ar = array(), $group = '') {
}
}
}
}
-?>
\ No newline at end of file
+?>