1 files changed, 10 insertions, 226 deletions

diff --git a/src/forum_post_send.php b/src/forum_post_send.php
index ffab780..c2b23bd 100644
--- a/src/forum_post_send.php
+++ b/src/forum_post_send.php
@@ -34,7 +34,6 @@ catch (Exception $e) {
 }
 
 function send_post_to_lists($config, $user, $mode, $data, $post_data) {
-
   require_once('Log.php');
   $logger = &Log::singleton('file', '/var/log/listbridge', 'one');
 
@@ -45,234 +44,19 @@ function send_post_to_lists($config, $user, $mode, $data, $post_data) {
   print '</p>';
 */
 
-  # Sanity check
-  if (!in_array($mode, array('post', 'reply', 'quote', 'edit'))) {
-    throw new Exception('unrecognized mode: ' . $mode);
-  }
-
-  require_once('Mail.php');
-
-  require_once(__DIR__ . '/BBCodeParser.php');
-  require_once(__DIR__ . '/Bridge.php');
-  require_once(__DIR__ . '/PhpBB3.php');
-  require_once(__DIR__ . '/Util.php');
-
-  $postId = $data['post_id'];
-  $forumId = $data['forum_id'];
+  require_once(__DIR__ . '/BridgeConf.php');
+  require_once(__DIR__ . '/BridgeImpl.php');
+  require_once(__DIR__ . '/PhpBB3Conf.php');
+  require_once(__DIR__ . '/PhpBB3Impl.php');
+  require_once(__DIR__ . '/PhpBB3ToMailman.php');
  
-  $logger->info($postId . ' received from phpBB forum ' . $forumId);
-
-  $bridge = new Bridge();
-
-  $to = $bridge->getLists($forumId);
-  if (count($to) == 0) {
-    # No lists to send to, bail out.
-    return;    
-  }
-  $to = implode(', ', $to);
-
-  $userName = $user->data['username'];
-  $userEmail = $user->data['user_email'];
-
-  # NB: Don't use utf8_quote on things which don't need it.
-  $from = (is_ascii($userName) ? $userName : utf8_quote($userName)) . 
-          ' <' . $userEmail . '>';
-
-  $sender = 'forum-bridge@vassalengine.org';
-
-  $subject = html_entity_decode(
-    '[' . $post_data['forum_name'] . '] ' . $post_data['post_subject'],
-    ENT_QUOTES
-  );
-
-  if (!is_ascii($subject)) {
-    $subject = utf8_quote($subject);
-  }
-
-  $phpbb = new PhpBB3();
-
-  $time = null;
-  if ($mode == 'edit') {
-    # Post time is NOT updated on edit, so we get the current time
-    $time = time();
-  }
-  else {
-    $time = $phpbb->getPostTime($postId);
-    if ($time === false) {
-      throw new Exception('no post time: ' . $postId);
-    }
-  }
-
-  $date = date(DATE_RFC2822, $time);
-
-  $inReplyTo = null;
-  $references = null;
-  
-  if ($mode == 'reply' || $mode == 'quote') {
-    $firstId = $data['topic_first_post_id'];
-    $firstMessageId = $bridge->getMessageId($firstId);
-    if ($firstMessageId === false) {
-      $logger->info($postId . ' replies to an unknown message');
-    }
-    else {
-      $inReplyTo = $references = $firstMessageId;
-      $logger->info($postId . ' replies to ' . $firstMessageId);
-    }
-  }
-  else if ($mode == 'edit') {
-    $inReplyTo = $bridge->getMessageId($postId);
-  }
-
-  $forumURL = 'http://' . $_SERVER['SERVER_NAME'] .
-                  dirname($_SERVER['SCRIPT_NAME']);
-
-  $editId = $bridge->reserveEditId($postId);
-  $messageId = build_message_id($postId, $editId,
-                                $time, $_SERVER['SERVER_NAME']);
-
-  # Assemble the message headers
-  $headers = array(
-    'To'          => $to,
-    'From'        => $from,
-    'Sender'      => $sender,
-    'Subject'     => $subject,
-    'Date'        => $date,
-    'Message-ID'  => $messageId,
-    'X-BeenThere' => $forumURL
-  );
-
-  if ($inReplyTo !== null) {
-    $headers['In-Reply-To'] = $inReplyTo;
-  }
-  
-  if ($references !== null) {
-    $headers['References'] = $references;
-  }
-
-  # Build the message body
-  $parser = new BBCodeParser();
-  $text = $parser->parse($data['message'], $data['bbcode_uid']);
-
-  if ($mode == 'edit') {
-    $edit_notice = <<<EOF
-[This message has been edited.]
-
+  $db = new PDO('mysql:host=' . DB_HOST . ';dbname=' . DB, DB_USER, DB_PASS);
+  $bridge = new BridgeImpl($db);
 
-EOF;
-
-    $edit_header = 'Edit: ';
-
-    $text = $edit_notice . $text;
-    $headers['Subject'] = $edit_header . $headers['Subject'];
-  }
-
-  # Build the bridge footer
-  $postURL = "$forumURL/viewtopic.php?p=$postId#p$postId";
-  $footer = <<<EOF
-
-_______________________________________________
-Read this topic online here:
-$postURL
-EOF;
-
-  $body = null;
-
-  # Handle attachements, if any
-  if (empty($data['attachment_data'])) {
-    # No attachments, send a plain email
-    $body = $text . "\n" . $footer;
-    $headers['Content-Type'] = 'text/plain; charset=UTF-8; format=flowed';
-    $headers['Content-Transfer-Encoding'] = '8bit';
-  }
-  else {
-    # Attachments, build a MIME email
-    require_once('Mail/mimePart.php');
-
-    $headers['MIME-Version'] = '1.0';
-
-    $params = array('content_type' => 'multipart/mixed');
-    $mime = new Mail_mimePart('', $params);
-
-    # Build the main body
-    build_text_part($mime, $text);
-
-    # Build each attachment
-    foreach ($data['attachment_data'] as $a) {
-      $attachId = $a['attach_id'];
-      $adata = $phpbb->getAttachmentData($attachId);
-      if ($adata === false) {
-        throw new Exception('unrecognized attachment id: ' . $attachId);
-      }
-
-      $afile = $phpbb_root_path . $config['upload_path'] . '/' .
-               utf8_basename($adata['physical_filename']); 
-
-      $bytes = file_get_contents($afile);
-      if ($bytes === false) {
-        throw new Exception('failed to read file: ' . $afile);
-      }
-
-      build_attachment(
-        $mime,
-        $adata['mimetype'],
-        $adata['real_filename'],
-        $adata['attach_comment'],
-        $bytes
-      );
-    }
-
-    # Build footer
-    build_text_part($mime, $footer);
-
-    # Encode the message
-    $msg = $mime->encode();
-    $headers = array_merge($headers, $msg['headers']);
-    $body = $msg['body'];
-  }
-
-  $mailer = Mail::factory('sendmail');
-
-  # Register the message
-  $seen = !$bridge->registerByEditId($editId, $messageId, $inReplyTo);
-  if ($seen) {
-    throw new Exception('message id already seen: ' . $messageId);
-  }
-
-  try {
-    # Send the message
-    $err = $mailer->send($to, $headers, $body);
-    if (PEAR::isError($err)) {
-      throw new Exception('Mail::send error: ' . $err->toString());
-    }
-
-    $logger->info($postId . ' sent to ' . $to . ' as ' . $messageId);
-  }
-  catch (Exception $e) {
-    # Bridging failed, unregister message.
-    $bridge->unregisterMessage($editId);
-    throw $e;
-  }
-}
-
-function build_text_part($mime, $text) {
-  $params = array(
-    'content_type' => 'text/plain',
-    'charset'      => 'utf-8',
-    'encoding'     => '8bit',
-    'disposition'  => 'inline'
-  );
-  $mime->addSubPart($text, $params);
-}
+  $phpbb = new PhpBB3Impl();
 
-function build_attachment($mime, $type, $filename, $descr, $data) {
-  $params = array( 
-    'content_type' => $type,
-    'encoding'     => 'base64',
-    'disposition'  => 'attachment',
-    'dfilename'    => $filename,
-    'description'  => $descr
-  );
-  $mime->addSubPart($data, $params);
+  $conduit = new PhpBB3ToMailman($bridge, $phpbb, $logger);
+  $conduit->process($config, $user, $mode, $data, $post_data);
 }
 
 ?>