diff --git a/e107_plugins/import/providers/phpbb3_import_class.php b/e107_plugins/import/providers/phpbb3_import_class.php
index bd5347571..9a56667fd 100644
--- a/e107_plugins/import/providers/phpbb3_import_class.php
+++ b/e107_plugins/import/providers/phpbb3_import_class.php
@@ -522,267 +522,8 @@ thread_lastuser
thread_lastuser_anon
thread_total_replies
thread_options
- *
-
-/*
-Historical info for conversion below here
-
-function convertParents($catid)
-{
- $parentArray = array(
- array("srcdata" => "cat_id", "e107" => "forum_id", "type" => "INT", "value" => $catid),
- array("srcdata" => "cat_title", "e107" => "forum_name", "type" => "STRING"),
- array("srcdata" => "cat_order", "e107" => "forum_order", "type" => "INT"),
- array("srcdata" => "cat_desc", "e107" => "forum_description", "type" => "STRING"),
- array("srcdata" => "null", "e107" => "forum_moderators", "type" => "INT", "value" => 254)
- );
- return $parentArray;
-}
-
-function convertForums($catid)
-{
- $forumArray = array(
- array("srcdata" => "forum_id", "e107" => "forum_id", "type" => "INT"),
- array("srcdata" => "cat_id", "e107" => "forum_parent", "type" => "STRING", "value" => $catid),
- array("srcdata" => "forum_name", "e107" => "forum_name", "type" => "STRING"),
- array("srcdata" => "forum_desc", "e107" => "forum_description", "type" => "STRING"),
- array("srcdata" => "forum_order", "e107" => "forum_order", "type" => "INT"),
- array("srcdata" => "forum_topics", "e107" => "forum_threads", "type" => "INT"),
- array("srcdata" => "forum_posts", "e107" => "forum_replies", "type" => "INT"),
- array("srcdata" => "null", "e107" => "forum_moderators", "type" => "INT", "value" => 254)
- );
- return $forumArray;
-}
-
-
-//function convertTopics($poster)
-function convertTopics()
-{
- $topicArray = array(
- array("srcdata" => "forum_id", "e107" => "thread_forum_id", "type" => "INT"),
- array("srcdata" => "topic_title", "e107" => "thread_name", "type" => "STRING"),
- array("srcdata" => "post_text", "e107" => "thread_thread", "type" => "STRING", "default" => "", "sproc" => "usebb,phpbb,bblower"),
- array("srcdata" => "topic_poster", "e107" => "thread_user", "type" => "STRING"),
- array("srcdata" => "null", "e107" => "thread_active", "type" => "INT", "value" => 1),
- array("srcdata" => "topic_time", "e107" => "thread_datestamp", "type" => "INT"),
- array("srcdata" => "topic_views", "e107" => "thread_views", "type" => "INT"),
- array("srcdata" => "topic_replies", "e107" => "thread_total_replies", "type" => "INT"),
- array("srcdata" => "null", "e107" => "thread_parent", "type" => "INT", "value" => 0),
- );
- return $topicArray;
-}
+ */
-
-function convertForumPosts($parent_id, $poster)
-{
- $postArray = array(
- array("srcdata" => "post_text", "e107" => "thread_thread", "type" => "STRING", "default" => "", "sproc" => "usebb,phpbb,bblower"),
- array("srcdata" => "forum_id", "e107" => "thread_forum_id", "type" => "INT"),
- array("srcdata" => "post_time", "e107" => "thread_datestamp", "type" => "INT"),
- array("srcdata" => "topic_views", "e107" => "thread_views", "type" => "INT"),
- array("srcdata" => "post_time", "e107" => "thread_lastpost", "type" => "INT"),
- array("srcdata" => "poster_id", "e107" => "thread_user", "type" => "STRING"),
- array("srcdata" => "post_subject", "e107" => "thread_name", "type" => "STRING"),
- array("srcdata" => "null", "e107" => "thread_parent", "type" => "INT", "value" => $parent_id),
- );
- return $postArray;
-}
-
-
-/*
--- --------------------------------------------------------
-PHPBB uses three tables to record a poll. Looks wildly different to E107!
---
--- Table structure for table `_phpbb_vote_desc`
-CREATE TABLE `_phpbb_vote_desc` (
- `vote_id` mediumint(8) unsigned NOT NULL auto_increment,
- `topic_id` mediumint(8) unsigned NOT NULL default '0',
- `vote_text` text NOT NULL,
- `vote_start` int(11) NOT NULL default '0',
- `vote_length` int(11) NOT NULL default '0',
- PRIMARY KEY (`vote_id`),
- KEY `topic_id` (`topic_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=36 ;
-
-
---
--- Table structure for table `_phpbb_vote_results`
-CREATE TABLE `_phpbb_vote_results` (
- `vote_id` mediumint(8) unsigned NOT NULL default '0',
- `vote_option_id` tinyint(4) unsigned NOT NULL default '0',
- `vote_option_text` varchar(255) NOT NULL default '',
- `vote_result` int(11) NOT NULL default '0',
- KEY `vote_option_id` (`vote_option_id`),
- KEY `vote_id` (`vote_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-
---
--- Table structure for table `_phpbb_vote_voters`
-CREATE TABLE `_phpbb_vote_voters` (
- `vote_id` mediumint(8) unsigned NOT NULL default '0',
- `vote_user_id` mediumint(8) NOT NULL default '0',
- `vote_user_ip` char(8) NOT NULL default '',
- KEY `vote_id` (`vote_id`),
- KEY `vote_user_id` (`vote_user_id`),
- KEY `vote_user_ip` (`vote_user_ip`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-*/
-
-
-/*
-
-//-----------------------------------------------------------
-// ### get phpbb categories and insert them as forum parents
-//-----------------------------------------------------------
-
-mysql_query("TRUNCATE TABLE {$mySQLprefix}forum", $e107Connection);
-
-
-$phpbb_res = mysql_query("SELECT * FROM {$phpbb2Prefix}categories", $phpbbConnection);
-if(!$phpbb_res)
-{
- goError("Error! Unable to access ".$phpbb2Prefix."categories table.");
-}
-
-$catcount = 500;
-while($parent = mysql_fetch_array($phpbb_res))
-{
-
- $parentArray = convertParents($catcount);
-
- $query = createQuery($parentArray, $parent, $mySQLprefix."forum");
- echo (mysql_query($query, $e107Connection) ? "Successfully inserted parent: ".$parent['cat_id'].": ".$parent['cat_title'] : "Unable to insert parent: ".$parent['cat_id'].": ".$parent['cat_title']."
".mysql_errno() . ": " . mysql_error())."
";
- flush();
-
- $phpbb_res2 = mysql_query("SELECT * FROM {$phpbb2Prefix}forums WHERE cat_id = ".$parent['cat_id'], $phpbbConnection);
- if($phpbb_res2)
- {
- while($forum = mysql_fetch_array($phpbb_res2))
- {
- $forumArray = convertForums($catcount);
- $query = createQuery($forumArray, $forum, $mySQLprefix."forum");
- echo (mysql_query($query, $e107Connection) ? "Successfully inserted forum: ".$parent['cat_id'].": ".$parent['cat_title'] : "Unable to insert forum: ".$parent['cat_id'].": ".$parent['cat_title']."
".mysql_errno() . ": " . mysql_error())."
";
- flush();
- }
- }
- else
- {
- echo "Didn't find any forums for parent '".$parent['cat_title']."'
";
- }
- $catcount ++;
-}
-
-
-//------------------------------------------------------
-// Read in forum topics
-//------------------------------------------------------
-
-mysql_query("TRUNCATE TABLE {$mySQLprefix}forum_t", $e107Connection);
-mysql_query("TRUNCATE TABLE {$mySQLprefix}polls", $e107Connection);
-
-$query = "SELECT * FROM {$phpbb2Prefix}topics
-LEFT JOIN {$phpbb2Prefix}posts_text ON ({$phpbb2Prefix}topics.topic_title = {$phpbb2Prefix}posts_text.post_subject)
-LEFT JOIN {$phpbb2Prefix}posts ON ({$phpbb2Prefix}posts.post_id = {$phpbb2Prefix}posts_text.post_id)
-ORDER BY topic_time ASC";
-
-$phpbb_res = mysql_query($query, $phpbbConnection);
-if(!$phpbb_res)
-{
- goError("Error! Unable to access ".$phpbb2Prefix."topics table.");
-}
-while($topic = mysql_fetch_array($phpbb_res))
-{
-
- //echo "
"; print_r($topic); echo ""; - - if($topic['topic_vote']) - { - // poll attached to this topic ... - $topic['topic_title'] = "[poll] ".$topic['topic_title']; - $query = "SELECT * FROM {$phpbb2Prefix}vote_desc WHERE topic_id=".$topic['topic_id']; - $phpbb_res3 = mysql_query($query, $phpbbConnection); - $pollQ = mysql_fetch_array($phpbb_res3); - - $query = "SELECT * FROM {$phpbb2Prefix}vote_results WHERE vote_id=".$pollQ['vote_id']; - $phpbb_res3 = mysql_query($query, $phpbbConnection); - $options = ""; - $votes = ""; - while($pollO = mysql_fetch_array($phpbb_res3)) - { - $options .= $pollO['vote_option_text'].chr(1); - $votes .= $pollO['vote_result'].chr(1); - } - - extract($pollQ); - $vote_text = $tp->toDB($vote_text); // McFly added 25/5/06 - $options = $tp->toDB($options); // McFly added 25/5/06 - $query = "INSERT INTO ".$mySQLprefix."polls VALUES ('0', {$vote_start}, {$vote_start}, 0, 0, '{$vote_text}', '{$options}', '{$votes}', '', 2, 0, 0, 0, 255, 0)"; - echo (mysql_query($query, $e107Connection) ? "Poll successfully inserted" : "Unable to insert poll ({$query})")."