[dkendall]

I found and fixed a few bugs:

1. When an article is imported to a sub-forum, the NNTP gateway was doubling thread and post counts in the parent forum(s).
   
2. It was updating the "latest post" fields, even if the forum (or parent forum) has newer posts.
   
3. The postings added by the gateway were not inheriting the icon of the thread to which they were added (if I understand this concept correctly).

I wanted imported NNTP messages to be linked to the vBulletin user profile of the poster. As the code is intertwined with the above bug fixes, I've included it here too.

To get the vBulletin user id from the NNTP post e-mail address, locate the following lines in gateway.php:

	//Separate name and email address
	$from_name = from_name($message['from']);
	$from_email = from_email($message['from']);

Add the following lines immediately beneath:

	//Get user id from email address
	$from_userid = 0;
	if ($from_email AND ($nntp_settings['associate_by_email'] == 1))
	{
		$user_data = $db->query_first("SELECT userid FROM "
			. TABLE_PREFIX . "user WHERE email='" . addslashes($from_email) . "'");
		if (!empty($user_data))
			$from_userid = $user_data['userid'];
	}

Note that we require each unique email addresses in vBulletin.

Fix up the SQL statements in the if ($threadid) / else block in gateway.php as follows:

	// if the correct thread was found, insert it.
	if ($threadid) {
		$lasticonid = 0;
		$icon_data = $db->query_first("SELECT iconid FROM " . TABLE_PREFIX . "thread WHERE threadid=$threadid");
		if (!empty($icon_data))
			$lasticonid = $icon_data['iconid'];

		$postid = insert_post($threadid, $forumid, $foruminfo, $subject, $from_name, $from_email, $from_userid, $date, $lasticonid, $parentid);

		// update thread
		$db->query("UPDATE " . TABLE_PREFIX . "thread
			SET lastpost = '" . $date . "',
			replycount = replycount + 1,
			lastposter = '" . addslashes($from_name) . "'
			WHERE threadid = $threadid
		");

		// update the forum counts
		$db->query("UPDATE " . TABLE_PREFIX . "forum
			SET replycount = replycount + 1
			WHERE forumid = $forumid");

		// update forum last-post data
		$db->query("
			UPDATE " . TABLE_PREFIX . "forum
			SET lastpost = '" . $date . "',
			lastposter = '" . addslashes($from_name) . "',
			lasticonid = $lasticonid,
			lastthreadid = $threadid,
			lastthread = '" . addslashes($subject) . "'
			WHERE forumid IN ({$foruminfo['parentlist']})
			AND lastpost < '" . $date . "'
		");


		// send out email notices
		exec_send_notification($threadid, "0", $postid);
	} else {
		//can only be here if no thread is found
		//Needs to create new thread

		// Create thread
		if ($vbulletin->options['similarthreadsearch'])
		{
			require_once(MY_DIR . '/includes/functions_search.php');
			$similarthreads = fetch_similar_threads($subject);
		}
		else
		{
			$similarthreads = '';
		}

		$db->query("INSERT INTO " . TABLE_PREFIX . "thread 
			(title, lastpost, forumid, open, replycount,
			postusername, postuserid, lastposter, dateline, iconid,
			visible, views, similar)
			VALUES ('" . addslashes($subject) . "', '" . $date . "', $forumid, 1, 0,
			'" . addslashes($from_name) . "', $from_userid,
			'" . addslashes($from_name) . "', '" . $date . "', 0, 1, 0,
			'" . $similarthreads . "')
		");


		$threadid = $db->insert_id();

		//insert_post
		$postid = insert_post($threadid, $forumid, $foruminfo, $subject, $from_name, $from_email, $from_userid, $date);

		// update the forum counts
		$db->query("UPDATE " . TABLE_PREFIX . "forum
			SET replycount = replycount + 1,
			threadcount = threadcount + 1
			WHERE forumid = $forumid");

		// update forum last-post data
		$db->query("UPDATE " . TABLE_PREFIX . "forum
			SET lastpost = '" . $date . "',
			lastposter = '" . addslashes($from_name) . "',
			lasticonid = 0,
			lastthread = '" . addslashes($subject) . "',
			lastthreadid = $threadid
			WHERE forumid IN ({$foruminfo['parentlist']})
			AND lastpost < '" . $date . "'
			");

		logging("'$subject' from ". $from_name . ". New thread.");

	} //new thread or not

In functions_nntp.php replace function insert_post with the following:

//Insert post and follow up

function insert_post($threadid, $forumid, $foruminfo, $subject, $from_name, $from_email, $from_userid, $date, $iconid = 0, $parentid = 0)
{
	global $db, $nntp;

	$message =& $nntp['message'];

	$db->query("INSERT INTO " . TABLE_PREFIX . "post
		(postid, threadid, title, username, userid, dateline, pagetext,
		allowsmilie, showsignature, ipaddress, iconid, visible,
		isusenetpost, msgid, ref, parentid) VALUES
		(NULL, $threadid, '". addslashes($subject) . "',
		'" . addslashes($from_name) . "', $from_userid, '" . $date . "',
		'" . addslashes($message['text']) . "', 1, 0,
		'" . addslashes($from_email) . "', $iconid, 1, 1,
		'" . addslashes($message['message-id']) . "',
		'" . addslashes($message['references']) . "', "
		. $parentid . ")");

	$postid=$db->insert_id();

	//So that thread preview works
        $db->query("
		UPDATE " . TABLE_PREFIX . "thread
                SET firstpostid = $postid
		WHERE threadid = $threadid
	");

	// ULTRASOFT HACK
	if($from_userid != 0)
	{
		// update user's post count
		$db->query("UPDATE " . TABLE_PREFIX . "user
			SET lastpost = '" . $date . "',
			lastactivity = '" . $date . "',
			posts = posts + 1
			WHERE userid = $from_userid
		");
	}

	//save attachments if any
	if ($message['attachments'])
	{
		process_attachments($date, $postid, $threadid, $forumid);
	}

	// Index post for searching
	build_post_index($postid, $foruminfo);

	return $postid;
}

In AdminCP go the to NNTP Gateway Settings, click the Add a New Setting button, and add this:

	Title: Associate by Email
	Varname: associate_by_email
	Value: 1
	Description: Use the email address to associate postings with the corresponding vBulletin user.

Hopefully, the owner/maintainer of this hack can add this to the "official" version.

David