|
|
|
|
@ -451,7 +451,7 @@ class PHPMailer { |
|
|
|
|
*/ |
|
|
|
|
private function AddAnAddress($kind, $address, $name = '') { |
|
|
|
|
if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) { |
|
|
|
|
echo 'Invalid recipient array: ' . kind; |
|
|
|
|
error_log('Invalid recipient array: ' . $kind); |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
$address = trim($address); |
|
|
|
|
@ -461,7 +461,7 @@ class PHPMailer { |
|
|
|
|
if ($this->exceptions) { |
|
|
|
|
throw new phpmailerException($this->Lang('invalid_address').': '.$address); |
|
|
|
|
} |
|
|
|
|
echo $this->Lang('invalid_address').': '.$address; |
|
|
|
|
error_log($this->Lang('invalid_address').': '.$address); |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
if ($kind != 'ReplyTo') { |
|
|
|
|
@ -493,7 +493,7 @@ class PHPMailer { |
|
|
|
|
if ($this->exceptions) { |
|
|
|
|
throw new phpmailerException($this->Lang('invalid_address').': '.$address); |
|
|
|
|
} |
|
|
|
|
echo $this->Lang('invalid_address').': '.$address; |
|
|
|
|
error_log($this->Lang('invalid_address').': '.$address); |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
$this->From = $address; |
|
|
|
|
@ -583,7 +583,6 @@ class PHPMailer { |
|
|
|
|
if ($this->exceptions) { |
|
|
|
|
throw $e; |
|
|
|
|
} |
|
|
|
|
//echo $e->getMessage()."\n"; |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
@ -1367,7 +1366,7 @@ class PHPMailer { |
|
|
|
|
if ($this->exceptions) { |
|
|
|
|
throw $e; |
|
|
|
|
} |
|
|
|
|
echo $e->getMessage()."\n"; |
|
|
|
|
error_log($e->getMessage()."\n"); |
|
|
|
|
if ( $e->getCode() == self::STOP_CRITICAL ) { |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
|