X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=banana%2Fmessage.inc.php;h=51999cbc2c55c34a2480af92e7a66a5a7165fb0e;hb=66e812365e1cf26675f001408518059367fd4317;hp=ff08fd38cec4f36479565dd7370dc428c7a78889;hpb=1a85c7a672b790232ee7f0b27b8a6a05945d6570;p=banana.git diff --git a/banana/message.inc.php b/banana/message.inc.php index ff08fd3..51999cb 100644 --- a/banana/message.inc.php +++ b/banana/message.inc.php @@ -119,7 +119,7 @@ final class BananaMessage extends BananaMimePart public function getSender() { $from = $this->headers['from']; - $name = trim(preg_replace('/<[^ ]*>/', '', $from)); + $name = trim(strip_tags($from)); if (empty($name)) { return $from; } @@ -165,7 +165,7 @@ final class BananaMessage extends BananaMimePart } if (preg_match("/^([^ ]+@[^ ]+) \((.*)\)$/", $text, $regs)) { $result = $mailto . $regs[1] . $subject . '">' . banana_htmlentities($regs[2]) . ''; - } + } if (preg_match("/^\"?([^<>\"]+)\"? +<(.+@.+)>$/", $text, $regs)) { $nom = preg_replace("/^'(.*)'$/", '\1', $regs[1]); $nom = stripslashes($nom); @@ -180,7 +180,7 @@ final class BananaMessage extends BananaMimePart $name = null; if (preg_match("/^([^ ]+@[^ ]+) \((.*)\)$/", $text, $regs)) { $name = $regs[2]; - } + } if (preg_match("/^\"?([^<>\"]+)\"? +<(.+@.+)>$/", $text, $regs)) { $name = preg_replace("/^'(.*)'$/", '\1', $regs[1]); $name = stripslashes($name);