Zeile 25 | Zeile 25 |
---|
* @var string */ public $additional_parameters = '';
|
* @var string */ public $additional_parameters = '';
|
| /** * Path where the sendmail program can be found. * * @var string */ public $sendmail = '';
/** * Which "From:" mail address should be used in mail sent directly via SMTP. * * @var string */ public $sendmail_from = '';
|
/** * Sends the email.
| /** * Sends the email.
|
Zeile 34 | Zeile 48 |
---|
function send() { global $lang, $mybb;
|
function send() { global $lang, $mybb;
|
|
|
// For some reason sendmail/qmail doesn't like \r\n
|
// For some reason sendmail/qmail doesn't like \r\n
|
| /*
|
$this->sendmail = @ini_get('sendmail_path'); if($this->sendmail) { $this->headers = str_replace("\r\n", "\n", $this->headers); $this->message = str_replace("\r\n", "\n", $this->message); $this->delimiter = "\n";
|
$this->sendmail = @ini_get('sendmail_path'); if($this->sendmail) { $this->headers = str_replace("\r\n", "\n", $this->headers); $this->message = str_replace("\r\n", "\n", $this->message); $this->delimiter = "\n";
|
}
| } */
|
// Some mail providers ignore email's with incorrect return-to path's so try and fix that here $this->sendmail_from = @ini_get('sendmail_from'); if($this->sendmail_from != $mybb->settings['adminemail'])
|
// Some mail providers ignore email's with incorrect return-to path's so try and fix that here $this->sendmail_from = @ini_get('sendmail_from'); if($this->sendmail_from != $mybb->settings['adminemail'])
|
{
| {
|
@ini_set("sendmail_from", $mybb->settings['adminemail']);
|
@ini_set("sendmail_from", $mybb->settings['adminemail']);
|
| }
$dir = "/{$mybb->config['admin_dir']}/"; $pos = strrpos($_SERVER['PHP_SELF'], $dir); if(defined('IN_ADMINCP') && $pos !== false) { $temp_script_path = $_SERVER['PHP_SELF']; $_SERVER['PHP_SELF'] = substr($_SERVER['PHP_SELF'], $pos + strlen($dir) - 1);
|
}
// If safe mode is on, don't send the additional parameters as we're not allowed to
| }
// If safe mode is on, don't send the additional parameters as we're not allowed to
|
Zeile 61 | Zeile 85 |
---|
$sent = @mail($this->to, $this->subject, $this->message, trim($this->headers), $this->additional_parameters); } $function_used = 'mail()';
|
$sent = @mail($this->to, $this->subject, $this->message, trim($this->headers), $this->additional_parameters); } $function_used = 'mail()';
|
| if(defined('IN_ADMINCP') && $pos !== false) { $_SERVER['PHP_SELF'] = $temp_script_path; }
|
if(!$sent) {
| if(!$sent) {
|