stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-20 05:45:11 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move test-related extensions to Sendmail into a subclass that we only

Browse Source 
use in the test code (Sendmail_For_Test).
This commit is contained in:
Bharat Mediratta
2009-02-05 07:51:11 +00:00
parent 9e2b84d406
commit 1894a673bf
2 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/libraries/Sendmail.php
+8 -17
View File
@@ -25,11 +25,6 @@ class Sendmail_Core {
protected $line_length = 70;
protected $header_separator = "\r\n";
/**
* In test mode this gets the message that would have been set
*/
private $_send_text;
/**
* Return an instance of a Menu_Element
* @chainable
@@ -47,9 +42,6 @@ class Sendmail_Core {
}
public function __get($key) {
if (TEST_MODE && $key == "send_text") {
return $this->_send_text;
}
return null;
}
@@ -91,16 +83,15 @@ class Sendmail_Core {
// need to use a single \n. This can be set in config/sendmail.php
$headers = implode($this->header_separator, $headers);
$message = wordwrap($this->message, $this->line_length, "\n");
if (!TEST_MODE) {
if (!mail($to, $this->subject, $this->message, $headers)) {
Kohana::log("error", wordwrap("Sending mail failed:\nTo: $to\n $this->subject\n" .
"Headers: $headers\n $this->message"));
throw new Exception("@todo SEND MAIL FAILED");
}
} else {
$this->_send_text = "To: $to\r\n{$headers}\r\nSubject: $this->subject\r\n\r\n$message";
if ($this->mail($to, $this->subject, $message, $headers)) {
Kohana::log("error", wordwrap("Sending mail failed:\nTo: $to\n $this->subject\n" .
"Headers: $headers\n $this->message"));
throw new Exception("@todo SEND MAIL FAILED");
}
return $this;
}
public function mail($to, $subject, $message, $headers) {
return mail($to, $subject, $message, $headers);
}
}