[vassalengine-svn] SF.net SVN: vassalengine:[7042] site-src/trunk/bridge/src/forum_post_send. php
Brought to you by:
rodneykinney,
uckelman
From: <uck...@us...> - 2010-07-27 20:52:39
|
Revision: 7042 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7042&view=rev Author: uckelman Date: 2010-07-27 20:52:33 +0000 (Tue, 27 Jul 2010) Log Message: ----------- * Don't throw on replies to old posts. * Only utf8_quote non-ascii names and subjects. Modified Paths: -------------- site-src/trunk/bridge/src/forum_post_send.php Modified: site-src/trunk/bridge/src/forum_post_send.php =================================================================== --- site-src/trunk/bridge/src/forum_post_send.php 2010-07-27 20:47:16 UTC (rev 7041) +++ site-src/trunk/bridge/src/forum_post_send.php 2010-07-27 20:52:33 UTC (rev 7042) @@ -16,7 +16,7 @@ function send_post_to_lists($config, $user, $mode, $data, $post_data) { require_once('Log.php'); - $logger = &Log::singleton('file', '/var/log/listbridge', 'test2'); + $logger = &Log::singleton('file', '/var/log/listbridge', 'one'); /* print '<p>'; @@ -54,11 +54,18 @@ $userName = $user->data['username']; $userEmail = $user->data['user_email']; - $from = utf8_quote($userName) . ' <' . $userEmail . '>'; - $sender = 'for...@te...'; - $subject = utf8_quote('[' . $post_data['forum_name'] . '] ' - . $post_data['post_subject']); + # NB: Don't use utf8_quote on things which don't need it. + $from = (is_ascii($userName) ? $userName : utf8_quote($userName)) . + ' <' . $userEmail . '>'; + $sender = 'for...@va...'; + + $subject = '[' . $post_data['forum_name'] . '] ' + . $post_data['post_subject']; + if (!is_ascii($subject)) { + $subject = utf8_quote($subject); + } + $phpbb = new PhpBB3(); $time = null; @@ -82,10 +89,12 @@ $firstId = $data['topic_first_post_id']; $firstMessageId = $bridge->getMessageId($firstId); if ($firstMessageId === false) { - throw new Exception('unrecognized post id: ' . $firstId); + $logger->info($postId . ' replies to an unknown message'); } - - $inReplyTo = $references = $firstMessageId; + else { + $inReplyTo = $references = $firstMessageId; + $logger->info($postId . ' replies to ' . $firstMessageId); + } } else if ($mode == 'edit') { $inReplyTo = $bridge->getMessageId($postId); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |