Index: includes/destinations.email.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/backup_migrate/includes/destinations.email.inc,v
retrieving revision 1.1.2.1.2.7
diff -u -r1.1.2.1.2.7 destinations.email.inc
--- includes/destinations.email.inc	25 Aug 2009 16:25:18 -0000	1.1.2.1.2.7
+++ includes/destinations.email.inc	26 Sep 2009 21:56:01 -0000
@@ -73,60 +73,6 @@
  *   filename and "filename" which is just the filename.
  */
 function _backup_migrate_destination_email_mail_backup($attachment, $to) {
-  class mime_mail {
-    var $parts;
-    var $to;
-    var $from;
-    var $headers;
-    var $subject;
-    var $body;
-
-    function mime_mail() {
-      $this->parts   = array();
-      $this->to      = "";
-      $this->from    = "";
-      $this->headers = "";
-      $this->subject = "";
-      $this->body    = "";
-    }
-
-    function add_attachment($message, $name = "", $ctype = "application/octet-stream", $encode = NULL, $attach = FALSE) {
-      $this->parts[] = array(
-        "ctype" => $ctype,
-        "message" => $message,
-        "encode" => $encode,
-        "name" => $name,
-        "attach" => $attach,
-      );
-    }
-
-    function build_message($part) {
-      $message  = $part["message"];
-      $message  = chunk_split(base64_encode($message));
-      $encoding = "base64";
-      $disposition = $part['attach'] ? "Content-Disposition: attachment; filename=$part[name]\n" : '';
-      return "Content-Type: ". $part["ctype"] . ($part["name"] ? "; name = \"". $part["name"] ."\"" : "") ."\nContent-Transfer-Encoding: $encoding\n$disposition\n$message\n";
-    }
-
-    function build_multipart() {
-      $boundary = "b". md5(uniqid(time()));
-      $multipart = "Content-Type: multipart/mixed; boundary = $boundary\n\nThis is a MIME encoded message.\n\n--$boundary";
-      for ($i = sizeof($this->parts) - 1; $i >= 0; $i--) {
-        $multipart .= "\n". $this->build_message($this->parts[$i]) ."--$boundary";
-      }
-      return $multipart .= "--\n";
-    }
-
-    function send() {
-      $mime = "";
-      if (!empty($this->from)) $mime .= "From: ". $this->from ."\n";
-      if (!empty($this->headers)) $mime .= $this->headers ."\n";
-      if (!empty($this->body)) $this->add_attachment($this->body, "", "text/plain");
-      $mime .= "MIME-Version: 1.0\n". $this->build_multipart();
-      mail($this->to, $this->subject, "", $mime);
-    }
-  }
-
   // Send mail
   $attach        = fread(fopen($attachment->path, "r"), filesize($attachment->path));
   $mail          = new mime_mail();
@@ -140,3 +86,56 @@
   $mail->send();
 }
 
+class mime_mail {
+  var $parts;
+  var $to;
+  var $from;
+  var $headers;
+  var $subject;
+  var $body;
+
+  function mime_mail() {
+    $this->parts   = array();
+    $this->to      = "";
+    $this->from    = "";
+    $this->headers = "";
+    $this->subject = "";
+    $this->body    = "";
+  }
+
+  function add_attachment($message, $name = "", $ctype = "application/octet-stream", $encode = NULL, $attach = FALSE) {
+    $this->parts[] = array(
+      "ctype" => $ctype,
+      "message" => $message,
+      "encode" => $encode,
+      "name" => $name,
+      "attach" => $attach,
+    );
+  }
+
+  function build_message($part) {
+    $message  = $part["message"];
+    $message  = chunk_split(base64_encode($message));
+    $encoding = "base64";
+    $disposition = $part['attach'] ? "Content-Disposition: attachment; filename=$part[name]\n" : '';
+    return "Content-Type: ". $part["ctype"] . ($part["name"] ? "; name = \"". $part["name"] ."\"" : "") ."\nContent-Transfer-Encoding: $encoding\n$disposition\n$message\n";
+  }
+
+  function build_multipart() {
+    $boundary = "b". md5(uniqid(time()));
+    $multipart = "Content-Type: multipart/mixed; boundary = $boundary\n\nThis is a MIME encoded message.\n\n--$boundary";
+    for ($i = sizeof($this->parts) - 1; $i >= 0; $i--) {
+      $multipart .= "\n". $this->build_message($this->parts[$i]) ."--$boundary";
+    }
+    return $multipart .= "--\n";
+  }
+
+  function send() {
+    $mime = "";
+    if (!empty($this->from)) $mime .= "From: ". $this->from ."\n";
+    if (!empty($this->headers)) $mime .= $this->headers ."\n";
+    if (!empty($this->body)) $this->add_attachment($this->body, "", "text/plain");
+    $mime .= "MIME-Version: 1.0\n". $this->build_multipart();
+    mail($this->to, $this->subject, "", $mime);
+  }
+}