gunnar: server/php-kolab/Kolab_Filter/Filter Content.php,1.8,1.9
cvs at kolab.org
cvs at kolab.org
Wed Feb 27 08:09:58 CET 2008
Author: gunnar
Update of /kolabrepository/server/php-kolab/Kolab_Filter/Filter
In directory doto:/tmp/cvs-serv10323/Kolab_Filter/Filter
Modified Files:
Content.php
Log Message:
Add a test fo rkolab/issue1272 and fix a notice when the sender does only use a mail address (no plain text name.
Index: Content.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Content.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Content.php 13 Feb 2008 16:28:27 -0000 1.8
+++ Content.php 27 Feb 2008 07:09:56 -0000 1.9
@@ -522,7 +522,14 @@
Horde::logMessage(sprintf(_("%s is not an allowed From address for unauthenticated users, rewriting."),
$from), __FILE__, __LINE__, PEAR_LOG_DEBUG);
if (strpos( $fromhdr, $untrusted )===false) {
- return '"'.str_replace(array("\\",'"'),array("\\\\",'\"'),$adr->personal).' '.$untrusted.'" '.'<'.$from.'>';
+ if (property_exists($adr, 'personal')) {
+ $name = str_replace(array("\\", '"'),
+ array("\\\\",'\"'),
+ $adr->personal);
+ } else {
+ $name = '';
+ }
+ return '"' . $name . ' ' . $untrusted . '" <' . $from . '>';
} else {
return true;
}
More information about the commits
mailing list