← All changes | back/Libraries/Imap2/Functions.php +2 -7 10.2.2 → 11.1.0 View file →

		@@ -94,11 +94,8 @@
94	94
95	95	return implode(', ', $sanitizedAddress);
96	96	}
97	97
98		- /**
99		- *
100		- */
101	98	public static function writeAddressFromEnvelope($addressList)
102	99	{
103	100	if (empty($addressList)) {
104	101	return null;
		@@ -105,9 +102,10 @@
105	102	}
106	103
107	104	$sanitizedAddress = [];
108	105	foreach ($addressList as $addressEntry) {
109		- $parsedAddressEntry = imap_rfc822_write_address($addressEntry[2], $addressEntry[3], $addressEntry[0]);
	106	+ $name = empty($addressEntry[0]) ? '' : $addressEntry[0];
	107	+ $parsedAddressEntry = imap_rfc822_write_address($addressEntry[2], $addressEntry[3], $name);
110	108	if (substr($parsedAddressEntry, -3) == '@""') {
111	109	$parsedAddressEntry = substr($parsedAddressEntry, 0, strlen($parsedAddressEntry) - 3).': ';
112	110	}
113	111	$sanitizedAddress[] = $parsedAddressEntry;
		@@ -115,11 +113,8 @@
115	113
116	114	return implode(', ', $sanitizedAddress);
117	115	}
118	116
119		- /**
120		- *
121		- */
122	117	public static function getListAttributesValue($attributes)
123	118	{
124	119	$attributesValue = 0;
125	120