Zeile 33 | Zeile 33 |
---|
* @var string */ public $from;
|
* @var string */ public $from;
|
| /** * Full from string including name in format "name" <email> * * @var string */ public $from_named;
|
/** * Who the email should return to.
| /** * Who the email should return to.
|
Zeile 64 | Zeile 71 |
---|
/** * The headers of the mail.
|
/** * The headers of the mail.
|
* * @var string */
| * * @var string */
|
public $headers;
|
public $headers;
|
|
|
/** * The charset of the mail. *
| /** * The charset of the mail. *
|
Zeile 79 | Zeile 86 |
---|
/** * The currently used delimiter new lines.
|
/** * The currently used delimiter new lines.
|
* * @var string
| * * @var string
|
*/ public $delimiter = "\r\n";
|
*/ public $delimiter = "\r\n";
|
/**
| /**
|
* How it should parse the email (HTML or plain text?)
|
* How it should parse the email (HTML or plain text?)
|
* * @var string
| * * @var string
|
*/ public $parse_format = 'text';
/** * The last received response from the SMTP server.
|
*/ public $parse_format = 'text';
/** * The last received response from the SMTP server.
|
* * @var string
| * * @var string
|
*/ public $data = '';
|
*/ public $data = '';
|
/**
| /**
|
* The last received response code from the SMTP server. * * @var string
| * The last received response code from the SMTP server. * * @var string
|
Zeile 109 | Zeile 116 |
---|
* Selects between AdminEmail and ReturnEmail, dependant on if ReturnEmail is filled. * * @return string
|
* Selects between AdminEmail and ReturnEmail, dependant on if ReturnEmail is filled. * * @return string
|
*/
| */
|
function get_from_email() { global $mybb;
| function get_from_email() { global $mybb;
|
Zeile 150 | Zeile 157 |
---|
if($from) { $this->from = $from;
|
if($from) { $this->from = $from;
|
| $this->from_named = $this->from;
|
} else {
|
} else {
|
if($mybb->settings['mail_handler'] == 'smtp') { $this->from = $this->get_from_email(); } else { $this->from = '"'.$this->utf8_encode($mybb->settings['bbname']).'"'; $this->from .= " <".$this->get_from_email().">"; }
| $this->from = $this->get_from_email(); $this->from_named = '"'.$this->utf8_encode($mybb->settings['bbname']).'"'; $this->from_named .= " <".$this->from.">";
|
}
if($return_email)
| }
if($return_email)
|
Zeile 170 | Zeile 172 |
---|
} else {
|
} else {
|
$this->return_email = "";
| |
$this->return_email = $this->get_from_email(); }
| $this->return_email = $this->get_from_email(); }
|
Zeile 312 | Zeile 313 |
---|
global $mybb;
// Build mail headers
|
global $mybb;
// Build mail headers
|
$this->headers .= "From: {$this->from}{$this->delimiter}";
| $this->headers .= "From: {$this->from_named}{$this->delimiter}";
|
if($this->return_email) {
| if($this->return_email) {
|
Zeile 419 | Zeile 420 |
---|
{ $newpos = min($pos + $chunk_size, $len);
|
{ $newpos = min($pos + $chunk_size, $len);
|
while(ord($string[$newpos]) >= 0x80 && ord($string[$newpos]) < 0xC0)
| if($newpos != $len)
|
{
|
{
|
// Reduce len until it's safe to split UTF-8. $newpos--;
| while(ord($string[$newpos]) >= 0x80 && ord($string[$newpos]) < 0xC0) { // Reduce len until it's safe to split UTF-8. $newpos--; }
|
}
$chunk = substr($string, $pos, $newpos - $pos);
| }
$chunk = substr($string, $pos, $newpos - $pos);
|