From bae5c71500112f9cde317ed1508fe713083868fb Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Fri, 8 Oct 2010 02:14:46 +0800
Subject: [PATCH] Updated for Gallery 3.0 Release, this time with working
 code...

---
 modules/phpmailer/libraries/Sendmail.php | 95 +-----------------------
 1 file changed, 1 insertion(+), 94 deletions(-)

diff --git a/modules/phpmailer/libraries/Sendmail.php b/modules/phpmailer/libraries/Sendmail.php
index c24621a2..b53722c1 100644
--- a/modules/phpmailer/libraries/Sendmail.php
+++ b/modules/phpmailer/libraries/Sendmail.php
@@ -1,96 +1,3 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class Sendmail_Core {
-  protected $to;
-  protected $subject;
-  protected $message;
-  protected $headers;
-  protected $line_length = 70;
-  protected $header_separator = "\r\n";
-
-  /**
-   * Return an instance of Sendmail
-   * @chainable
-   */
-  static function factory() {
-    return new Sendmail();
-  }
-
-  public function __construct() {
-    $this->headers = array();
-    $config = Kohana::config("sendmail");
-    foreach ($config as $key => $value) {
-      $this->$key($value);
-    }
-  }
-
-  public function __get($key) {
-    return null;
-  }
-
-  public function __call($key, $value) {
-    switch ($key) {
-    case "to":
-      $this->to = is_array($value[0]) ? $value[0] : array($value[0]);
-      break;
-    case  "header":
-      if (count($value) != 2) {
-        Kohana_Log::add("error", wordwrap("Invalid header parameters\n" . Kohana::debug($value)));
-        throw new Exception("@todo INVALID_HEADER_PARAMETERS");
-      }
-      $this->headers[$value[0]] = $value[1];
-      break;
-    case "from":
-      $this->headers["From"] = $value[0];
-      break;
-    case "reply_to":
-      $this->headers["Reply-To"] = $value[0];
-      break;
-    default:
-      $this->$key = $value[0];
-    }
-    return $this;
-  }
-
-  public function send() {
-    if (empty($this->to)) {
-      Kohana_Log::add("error", wordwrap("Sending mail failed:\nNo to address specified"));
-      throw new Exception("@todo TO_IS_REQUIRED_FOR_MAIL");
-    }
-    $to = implode(", ", $this->to);
-    $headers = array();
-    foreach ($this->headers as $key => $value) {
-      $key = ucfirst($key);
-      $headers[] = "$key: $value";
-    }
-
-    // The docs say headers should be separated by \r\n, but occasionaly that doesn't work and you
-    // 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 (!$this->mail($to, $this->subject, $message, $headers)) {
-      throw new Exception("@todo SEND_MAIL_FAILED");
-    }
-    return $this;
-  }
-
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
@@ -213,4 +120,4 @@ class Sendmail_Core {
 
     return $mail->Send();
   }
-}
+}
\ No newline at end of file