From 78fe98c7f6f2097d466b6351de0c259cf2db57a9 Mon Sep 17 00:00:00 2001
From: uckelman <uckelman@nomic.net>
Date: Sat, 20 Mar 2010 15:33:53 +0000
Subject: Refactored to make EmailMessage abstract.

git-svn-id: https://vassalengine.svn.sourceforge.net/svnroot/vassalengine/site-src/trunk@6621 67b53d14-2c14-4ace-a08f-0dab2b34000c
---
 src/EmailMessage.php   | 73 --------------------------------------------------
 src/MailmanMessage.php | 17 ++++++++++++
 src/MessageTest.php    | 69 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 73 deletions(-)
 delete mode 100644 src/EmailMessage.php
 create mode 100644 src/MailmanMessage.php
 create mode 100644 src/MessageTest.php

(limited to 'src')

diff --git a/src/EmailMessage.php b/src/EmailMessage.php
deleted file mode 100644
index d6ff762..0000000
--- a/src/EmailMessage.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-require_once('Mail/mimeDecode.php');
-require_once('Mail/RFC822.php');
-
-require_once('Message.php');
-
-class EMailMessage implements Message {
-
-  protected $msg;
-
-  public function __construct($input) {
-    $this->msg = EMailMessage::decode_raw_message($input);
-  }
-
-  public function getSource() {
-# FIXME: fill in!
-    return null;
-  }
-
-  public function getPostId() {
-# FIXME: get from message-id to post-id database
-    return null;
-  }
-
-  public function getFrom() {
-    return EMailMessage::parse_addr($this->msg->headers['from']);
-  }
-
-  public function getSubject() {
-    return $this->msg->headers['subject'];
-  }
-  
-  public function getMessageId() {
-    return $this->msg->headers['message-id'];
-  }
-
-  public function getInReplyTo() {
-    return $this->msg->headers['in-reply-to'];
-  }
-
-  public function getReferences() {
-    return $this->msg->headers['references'];
-  }
-
-  public function getBody() {
-    return $this->msg->body;
-  }
-
-  protected static function decode_raw_message($input) {
-    $params['include_bodies'] = true;
-    $params['decode_bodies']  = true;
-    $params['decode_headers'] = true;
-    $params['input']          = $input;
-    $params['crlf']           = "\r\n";
-
-    $msg = Mail_mimeDecode::decode($params);
-
-    if (count($msg->headers) == 1 && array_key_exists(null, $msg->headers)) {
-      # An empty message has one null header.
-      trigger_error('No message', E_USER_ERROR);
-    }
-
-    return $msg;
-  }
-
-  protected static function parse_addr($s) {
-    $addr = Mail_RFC822::parseAddressList($s);
-    return strtolower($addr[0]->mailbox . '@' . $addr[0]->host);
-  }
-}
-
-?>
diff --git a/src/MailmanMessage.php b/src/MailmanMessage.php
new file mode 100644
index 0000000..c284a8e
--- /dev/null
+++ b/src/MailmanMessage.php
@@ -0,0 +1,17 @@
+<?php
+
+require_once(__DIR__ . '/EmailMessage.php');
+
+class MailmanMessage extends EmailMessage {
+  public function __construct($input) {
+    parent::__construct($input); 
+  }
+
+  public function getSource() {
+    return self::parse_addr(
+      substr_replace($this->msg->headers['list-post'], '', 1, 7)
+    );
+  }
+}
+
+?>
diff --git a/src/MessageTest.php b/src/MessageTest.php
new file mode 100644
index 0000000..ce04cf6
--- /dev/null
+++ b/src/MessageTest.php
@@ -0,0 +1,69 @@
+<?php
+
+require_once('Mail/mimeDecode.php');
+require_once('Mail/RFC822.php');
+
+require_once('Message.php');
+
+abstract class EmailMessage implements Message {
+
+  protected $msg;
+
+  public function __construct($input) {
+    $this->msg = self::decode_raw_message($input);
+  }
+
+  public abstract function getSource();
+
+  public function getPostId() {
+    return null;
+  }
+
+  public function getFrom() {
+    return self::parse_addr($this->msg->headers['from']);
+  }
+
+  public function getSubject() {
+    return $this->msg->headers['subject'];
+  }
+  
+  public function getMessageId() {
+    return $this->msg->headers['message-id'];
+  }
+
+  public function getInReplyTo() {
+    return $this->msg->headers['in-reply-to'];
+  }
+
+  public function getReferences() {
+    return $this->msg->headers['references'];
+  }
+
+  public function getBody() {
+    return $this->msg->body;
+  }
+
+  protected static function decode_raw_message($input) {
+    $params['include_bodies'] = true;
+    $params['decode_bodies']  = true;
+    $params['decode_headers'] = true;
+    $params['input']          = $input;
+    $params['crlf']           = "\r\n";
+
+    $msg = Mail_mimeDecode::decode($params);
+
+    if (count($msg->headers) == 1 && array_key_exists(null, $msg->headers)) {
+      # An empty message has one null header.
+      trigger_error('No message', E_USER_ERROR);
+    }
+
+    return $msg;
+  }
+
+  protected static function parse_addr($s) {
+    $addr = Mail_RFC822::parseAddressList($s);
+    return strtolower($addr[0]->mailbox . '@' . $addr[0]->host);
+  }
+}
+
+?>
-- 
cgit v1.2.3