* This file contains functions needed to extract email address headers from
* mime messages.
*
- * @copyright © 2003-2006 The SquirrelMail Project Team
+ * @copyright © 2003-2009 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
: $this->mailbox);
$personal = trim($this->personal);
$is_encoded = false;
- if (preg_match('/(=\?([^?]*)\?(Q|B)\?([^?]*)\?=)(.*)/Ui',$personal,$reg)) {
+ if (preg_match('/(=\?([^?]*)\?(Q|B)\?([^?]*)\?=)(.*)/i',$personal,$reg)) {
$is_encoded = true;
}
if ($personal) {
if ($encoded && !$is_encoded) {
$personal_encoded = encodeHeader($personal);
if ($personal !== $personal_encoded) {
- $personal = $personal_encoded;
+ $personal = '"' . $personal_encoded . '"';
} else {
- $personal = '"'.$this->personal.'"';
+ $personal = '"' . $this->personal . '"';
}
} else {
if (!$is_encoded) {
- $personal = '"'.$this->personal.'"';
+ $personal = '"' . $this->personal . '"';
}
}
$addr = ($email ? $personal . ' <' .$email.'>'
function getEncodedAddress() {
return $this->getAddress(true, true);
}
+
+ /**
+ * Return just the email portion of this address
+ * @return string
+ * @since 1.5.2
+ */
+ function getEmail () {
+ $r = '';
+ if (is_object($this)) {
+ $r = $this->host ? $this->mailbox.'@'.$this->host : $this->mailbox;
+ }
+ return $r;
+ }
}
-
-?>
\ No newline at end of file