Index: modules/image.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xoops_import/modules/image.inc,v
retrieving revision 1.8
diff -u -r1.8 image.inc
--- modules/image.inc	18 Nov 2007 00:27:30 -0000	1.8
+++ modules/image.inc	28 Apr 2008 07:39:42 -0000
@@ -29,11 +29,11 @@
   
   _xoops_import_db_connect();
   
-  $xoops_import_table_preffix = variable_get('xoops_import_table_preffix', 'xoops');
+  $xoops_import_table_prefix = variable_get('xoops_import_table_prefix', 'xoops');
 
   db_set_active('xoops');
   
-  $imageRes = db_query("select COUNT(*) from {$xoops_import_table_preffix}_imagecategory");
+  $imageRes = db_query("select COUNT(*) from {$xoops_import_table_prefix}_imagecategory");
   
   if ($imageRes) {
     $catCnt = db_result($imageRes);
@@ -41,7 +41,7 @@
     $disable = TRUE;
   }
   
-  $imageRes = db_query("select COUNT(*) from {$xoops_import_table_preffix}_image");
+  $imageRes = db_query("select COUNT(*) from {$xoops_import_table_prefix}_image");
   
   if ($imageRes) {
     $imageCnt = db_result($imageRes);
@@ -89,7 +89,7 @@
 function xoops_import_module_image_import() {
   _xoops_import_db_connect();
   
-  $xoops_import_table_preffix = variable_get('xoops_import_table_preffix', 'xoops');
+  $xoops_import_table_prefix = variable_get('xoops_import_table_prefix', 'xoops');
   
   $output = '';
   
@@ -109,7 +109,7 @@
   
   db_set_active('xoops');
 
-  $xoopsImages = db_query("select * from {$xoops_import_table_preffix}_image ORDER BY image_weight, image_id");
+  $xoopsImages = db_query("select * from {$xoops_import_table_prefix}_image ORDER BY image_weight, image_id");
   
   db_set_active('default');
 
Index: modules/myalbum.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xoops_import/modules/myalbum.inc,v
retrieving revision 1.8
diff -u -r1.8 myalbum.inc
--- modules/myalbum.inc	22 Dec 2007 00:14:49 -0000	1.8
+++ modules/myalbum.inc	28 Apr 2008 07:40:09 -0000
@@ -50,11 +50,11 @@
   
   _xoops_import_db_connect();
   
-  $xoops_import_table_preffix = variable_get('xoops_import_table_preffix', 'xoops');
+  $xoops_import_table_prefix = variable_get('xoops_import_table_prefix', 'xoops');
 
   db_set_active('xoops');
   
-  $myAlbumRes = db_query("select COUNT(*) from {$xoops_import_table_preffix}_{$myalbum_base_table_name}_cat");
+  $myAlbumRes = db_query("select COUNT(*) from {$xoops_import_table_prefix}_{$myalbum_base_table_name}_cat");
   
   if ($myAlbumRes) {
     $catCnt = db_result($myAlbumRes);
@@ -62,7 +62,7 @@
     $disable = TRUE;
   }
   
-  $myAlbumRes = db_query("select COUNT(*) from {$xoops_import_table_preffix}_{$myalbum_base_table_name}_photos");
+  $myAlbumRes = db_query("select COUNT(*) from {$xoops_import_table_prefix}_{$myalbum_base_table_name}_photos");
   
   if ($myAlbumRes) {
     $photoCnt = db_result($myAlbumRes);
@@ -123,7 +123,7 @@
   
   _xoops_import_db_connect();
   
-  $xoops_import_table_preffix = variable_get('xoops_import_table_preffix', 'xoops');
+  $xoops_import_table_prefix = variable_get('xoops_import_table_prefix', 'xoops');
   
   $output = '';
   
@@ -143,7 +143,7 @@
   
   db_set_active('xoops');
 
-  $xoopsPhotos = db_query("select * from {$xoops_import_table_preffix}_{$myalbum_base_table_name}_photos AS p, {$xoops_import_table_preffix}_{$myalbum_base_table_name}_text AS t WHERE p.lid=t.lid ORDER BY p.lid");
+  $xoopsPhotos = db_query("select * from {$xoops_import_table_prefix}_{$myalbum_base_table_name}_photos AS p, {$xoops_import_table_prefix}_{$myalbum_base_table_name}_text AS t WHERE p.lid=t.lid ORDER BY p.lid");
   
   db_set_active('default');
 
Index: modules/newbb.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xoops_import/modules/newbb.inc,v
retrieving revision 1.6
diff -u -r1.6 newbb.inc
--- modules/newbb.inc	18 Nov 2007 00:27:30 -0000	1.6
+++ modules/newbb.inc	28 Apr 2008 07:40:53 -0000
@@ -32,12 +32,12 @@
   
   _xoops_import_db_connect();
   
-  $xoops_import_table_preffix = variable_get('xoops_import_table_preffix', 'xoops');
+  $xoops_import_table_prefix = variable_get('xoops_import_table_prefix', 'xoops');
   $xoops_newbb_module_dir = variable_get('xoops_import_module_newbb_dirname', 'newbb');
 
   db_set_active('xoops');
   
-  $newbbRes = db_query("select COUNT(*) from {$xoops_import_table_preffix}_bb_categories");
+  $newbbRes = db_query("select COUNT(*) from {$xoops_import_table_prefix}_bb_categories");
   
   if ($newbbRes) {
     $catCnt = db_result($newbbRes);
@@ -45,7 +45,7 @@
     $disable = TRUE;
   }
   
-  $newbbRes = db_query("select COUNT(*) from {$xoops_import_table_preffix}_bb_forums");
+  $newbbRes = db_query("select COUNT(*) from {$xoops_import_table_prefix}_bb_forums");
   
   if ($newbbRes) {
     $forumCnt = db_result($newbbRes);
@@ -53,7 +53,7 @@
     $disable = TRUE;
   }
   
-  $newbbRes = db_query("select COUNT(*) from {$xoops_import_table_preffix}_bb_posts");
+  $newbbRes = db_query("select COUNT(*) from {$xoops_import_table_prefix}_bb_posts");
   
   if ($newbbRes) {
     $postCnt = db_result($newbbRes);
@@ -105,12 +105,12 @@
 function xoops_import_module_newbb_import() {
   _xoops_import_db_connect();
   
-  $xoops_import_table_preffix = variable_get('xoops_import_table_preffix', 'xoops');
+  $xoops_import_table_prefix = variable_get('xoops_import_table_prefix', 'xoops');
   $xoops_newbb_module_dir = variable_get('xoops_import_module_newbb_dirname', 'newbb');
   
   db_set_active('xoops');
 
-  $xoopsForums = db_query("select * from {$xoops_import_table_preffix}_bb_categories ORDER BY cat_id");
+  $xoopsForums = db_query("select * from {$xoops_import_table_prefix}_bb_categories ORDER BY cat_id");
   
   db_set_active('default');
   
@@ -135,7 +135,7 @@
 
   db_set_active('xoops');
 
-  $xoopsForums = db_query("select * from {$xoops_import_table_preffix}_bb_forums ORDER BY forum_id");
+  $xoopsForums = db_query("select * from {$xoops_import_table_prefix}_bb_forums ORDER BY forum_id");
   
   db_set_active('default');
   
@@ -168,7 +168,7 @@
   
   db_set_active('xoops');
   
-  $xoopsPosts = db_query("SELECT * FROM {$xoops_import_table_preffix}_bb_posts, {$xoops_import_table_preffix}_bb_posts_text WHERE {$xoops_import_table_preffix}_bb_posts.post_id = {$xoops_import_table_preffix}_bb_posts_text.post_id AND {$xoops_import_table_preffix}_bb_posts.pid = %d AND {$xoops_import_table_preffix}_bb_posts_text.post_edit = '' ORDER BY {$xoops_import_table_preffix}_bb_posts.post_time", 0);
+  $xoopsPosts = db_query("SELECT * FROM {$xoops_import_table_prefix}_bb_posts, {$xoops_import_table_prefix}_bb_posts_text WHERE {$xoops_import_table_prefix}_bb_posts.post_id = {$xoops_import_table_prefix}_bb_posts_text.post_id AND {$xoops_import_table_prefix}_bb_posts.pid = %d AND {$xoops_import_table_prefix}_bb_posts_text.post_edit = '' ORDER BY {$xoops_import_table_prefix}_bb_posts.post_time", 0);
   
   db_set_active('default');
   
@@ -231,11 +231,11 @@
 }
 
 function _xoops_import_newbb_insert_comments($x_module_dir, $x_post_id, $nid, $parent_id, $thread) {
-  $xoops_import_table_preffix = variable_get("xoops_import_table_preffix", "xoops");
+  $xoops_import_table_prefix = variable_get("xoops_import_table_prefix", "xoops");
 
   db_set_active('xoops');
   
-  $xoopsPosts = db_query("SELECT * FROM {$xoops_import_table_preffix}_bb_posts, {$xoops_import_table_preffix}_bb_posts_text WHERE {$xoops_import_table_preffix}_bb_posts.post_id = {$xoops_import_table_preffix}_bb_posts_text.post_id AND {$xoops_import_table_preffix}_bb_posts.pid = %d AND {$xoops_import_table_preffix}_bb_posts_text.post_edit = '' ORDER BY {$xoops_import_table_preffix}_bb_posts.post_time", $x_post_id);
+  $xoopsPosts = db_query("SELECT * FROM {$xoops_import_table_prefix}_bb_posts, {$xoops_import_table_prefix}_bb_posts_text WHERE {$xoops_import_table_prefix}_bb_posts.post_id = {$xoops_import_table_prefix}_bb_posts_text.post_id AND {$xoops_import_table_prefix}_bb_posts.pid = %d AND {$xoops_import_table_prefix}_bb_posts_text.post_edit = '' ORDER BY {$xoops_import_table_prefix}_bb_posts.post_time", $x_post_id);
   
   db_set_active('default');
 
Index: modules/news.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xoops_import/modules/news.inc,v
retrieving revision 1.6
diff -u -r1.6 news.inc
--- modules/news.inc	18 Nov 2007 00:27:30 -0000	1.6
+++ modules/news.inc	28 Apr 2008 07:41:06 -0000
@@ -44,12 +44,12 @@
   
   _xoops_import_db_connect();
   
-  $xoops_import_table_preffix = variable_get('xoops_import_table_preffix', 'xoops');
+  $xoops_import_table_prefix = variable_get('xoops_import_table_prefix', 'xoops');
   $x_news_module_dir = variable_get('xoops_import_module_news_dirname', 'news');
 
   db_set_active('xoops');
   
-  $newsRes = db_query("select COUNT(*) from {$xoops_import_table_preffix}_topics");
+  $newsRes = db_query("select COUNT(*) from {$xoops_import_table_prefix}_topics");
   
   if ($newsRes) {
     $catCnt = db_result($newsRes);
@@ -57,7 +57,7 @@
     $disable = TRUE;
   }
   
-  $newsRes = db_query("select COUNT(*) from {$xoops_import_table_preffix}_stories");
+  $newsRes = db_query("select COUNT(*) from {$xoops_import_table_prefix}_stories");
   
   if ($newsRes) {
     $articleCnt = db_result($newsRes);
@@ -113,7 +113,7 @@
 function xoops_import_module_news_import() {
   _xoops_import_db_connect();
   
-  $xoops_import_table_preffix = variable_get('xoops_import_table_preffix', 'xoops');
+  $xoops_import_table_prefix = variable_get('xoops_import_table_prefix', 'xoops');
   
   $x_news_module_dir = variable_get('xoops_import_module_news_dirname', 'news');
   $x_news_module_id  = _xoops_import_get_xoops_module_id($x_news_module_dir);
@@ -136,7 +136,7 @@
   
   db_set_active('xoops');
 
-  $xoopsContent = db_query("select * from {$xoops_import_table_preffix}_stories ORDER BY storyid");
+  $xoopsContent = db_query("select * from {$xoops_import_table_prefix}_stories ORDER BY storyid");
   
   db_set_active('default');
   
Index: modules/smartsection.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xoops_import/modules/smartsection.inc,v
retrieving revision 1.8
diff -u -r1.8 smartsection.inc
--- modules/smartsection.inc	18 Nov 2007 00:27:30 -0000	1.8
+++ modules/smartsection.inc	28 Apr 2008 07:41:20 -0000
@@ -51,11 +51,11 @@
   
   _xoops_import_db_connect();
   
-  $xoops_import_table_preffix = variable_get('xoops_import_table_preffix', 'xoops');
+  $xoops_import_table_prefix = variable_get('xoops_import_table_prefix', 'xoops');
 
   db_set_active('xoops');
   
-  $smartsectionRes = db_query("select COUNT(*) from {$xoops_import_table_preffix}_{$smartsection_base_table_name}_categories");
+  $smartsectionRes = db_query("select COUNT(*) from {$xoops_import_table_prefix}_{$smartsection_base_table_name}_categories");
   
   if ($smartsectionRes) {
     $catCnt = db_result($smartsectionRes);
@@ -63,7 +63,7 @@
     $disable = TRUE;
   }
   
-  $smartsectionRes = db_query("select COUNT(*) from {$xoops_import_table_preffix}_{$smartsection_base_table_name}_items");
+  $smartsectionRes = db_query("select COUNT(*) from {$xoops_import_table_prefix}_{$smartsection_base_table_name}_items");
   
   if ($smartsectionRes) {
     $articleCnt = db_result($smartsectionRes);
@@ -124,7 +124,7 @@
   
   _xoops_import_db_connect();
   
-  $xoops_import_table_preffix = variable_get('xoops_import_table_preffix', 'xoops');
+  $xoops_import_table_prefix = variable_get('xoops_import_table_prefix', 'xoops');
   
   $output = '';
   
@@ -144,7 +144,7 @@
   
   db_set_active('xoops');
 
-  $xoopsArticles = db_query("select * from {$xoops_import_table_preffix}_{$smartsection_base_table_name}_items ORDER BY itemid");
+  $xoopsArticles = db_query("select * from {$xoops_import_table_prefix}_{$smartsection_base_table_name}_items ORDER BY itemid");
   
   db_set_active('default');
   
Index: modules/tinyd.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xoops_import/modules/tinyd.inc,v
retrieving revision 1.4
diff -u -r1.4 tinyd.inc
--- modules/tinyd.inc	18 Nov 2007 00:27:30 -0000	1.4
+++ modules/tinyd.inc	28 Apr 2008 07:41:32 -0000
@@ -49,11 +49,11 @@
   
   _xoops_import_db_connect();
   
-  $xoops_import_table_preffix = variable_get('xoops_import_table_preffix', 'xoops');
+  $xoops_import_table_prefix = variable_get('xoops_import_table_prefix', 'xoops');
 
   db_set_active('xoops');
   
-  $tinydRes = db_query("select COUNT(*) from {$xoops_import_table_preffix}_{$tinyd_base_table_name}");
+  $tinydRes = db_query("select COUNT(*) from {$xoops_import_table_prefix}_{$tinyd_base_table_name}");
   
   if ($tinydRes) {
     $pageCnt = db_result($tinydRes);
@@ -99,13 +99,13 @@
 
   _xoops_import_db_connect();
   
-  $xoops_import_table_preffix = variable_get('xoops_import_table_preffix', 'xoops');
+  $xoops_import_table_prefix = variable_get('xoops_import_table_prefix', 'xoops');
   
   $output = '';
   
   db_set_active('xoops');
 
-  $xoopsPages = db_query("select * from {$xoops_import_table_preffix}_{$tinyd_base_table_name} ORDER BY storyid");
+  $xoopsPages = db_query("select * from {$xoops_import_table_prefix}_{$tinyd_base_table_name} ORDER BY storyid");
   
   db_set_active('default');
   
Index: modules/users.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xoops_import/modules/users.inc,v
retrieving revision 1.4
diff -u -r1.4 users.inc
--- modules/users.inc	18 Nov 2007 00:27:30 -0000	1.4
+++ modules/users.inc	28 Apr 2008 07:42:20 -0000
@@ -22,11 +22,11 @@
   
   _xoops_import_db_connect();
   
-  $xoops_import_table_preffix = variable_get('xoops_import_table_preffix', 'xoops');
+  $xoops_import_table_prefix = variable_get('xoops_import_table_prefix', 'xoops');
 
   db_set_active('xoops');
   
-  $userRes = db_query("SELECT COUNT(*) FROM {$xoops_import_table_preffix}_users WHERE uid>1 AND last_login>0");
+  $userRes = db_query("SELECT COUNT(*) FROM {$xoops_import_table_prefix}_users WHERE uid>1 AND last_login>0");
   
   if ($userRes) {
     $userCnt = db_result($userRes);
@@ -81,11 +81,11 @@
   
   _xoops_import_db_connect();
   
-  $xoops_import_table_preffix = variable_get('xoops_import_table_preffix', 'xoops');
+  $xoops_import_table_prefix = variable_get('xoops_import_table_prefix', 'xoops');
 
   db_set_active('xoops');
   
-  $xoopsUsers = db_query("select * from {$xoops_import_table_preffix}_users WHERE uid>1 AND last_login>0 ORDER BY uid");
+  $xoopsUsers = db_query("select * from {$xoops_import_table_prefix}_users WHERE uid>1 AND last_login>0 ORDER BY uid");
   
   db_set_active('default');
   
Index: xoops_import.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xoops_import/xoops_import.module,v
retrieving revision 1.9
diff -u -r1.9 xoops_import.module
--- xoops_import.module	18 Nov 2007 00:27:30 -0000	1.9
+++ xoops_import.module	28 Apr 2008 07:38:55 -0000
@@ -168,11 +168,11 @@
   
   _xoops_import_db_connect();
   
-  $xoops_import_table_preffix = variable_get('xoops_import_table_preffix', 'xoops');
+  $xoops_import_table_prefix = variable_get('xoops_import_table_prefix', 'xoops');
   
   db_set_active('xoops');
   
-  $xoopsModules = db_query("select * from {$xoops_import_table_preffix}_modules WHERE is_active=1 ORDER BY weight");
+  $xoopsModules = db_query("select * from {$xoops_import_table_prefix}_modules WHERE is_active=1 ORDER BY weight");
   
   db_set_active('default');
   
Index: xoops_import_helper.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xoops_import/xoops_import_helper.inc,v
retrieving revision 1.8
diff -u -r1.8 xoops_import_helper.inc
--- xoops_import_helper.inc	22 Dec 2007 00:14:48 -0000	1.8
+++ xoops_import_helper.inc	28 Apr 2008 07:39:15 -0000
@@ -4,11 +4,11 @@
 function _xoops_import_get_xoops_module_id($xoops_module_dirname) {
   _xoops_import_db_connect();
   
-  $xoops_import_table_preffix = variable_get('xoops_import_table_preffix', 'xoops');
+  $xoops_import_table_prefix = variable_get('xoops_import_table_prefix', 'xoops');
   
   db_set_active('xoops');
 
-  $xoopsMid = db_query("select mid from {$xoops_import_table_preffix}_modules WHERE dirname='$xoops_module_dirname'");
+  $xoopsMid = db_query("select mid from {$xoops_import_table_prefix}_modules WHERE dirname='$xoops_module_dirname'");
   
   db_set_active('default');
   
@@ -108,7 +108,7 @@
 function _xoops_import_category(&$output, $vid, $name, $description, $node_type, $table, $col_id, $col_title, $col_description, $col_parent, $xoops_module_dir) {
   _xoops_import_db_connect();
   
-  $xoops_import_table_preffix = variable_get('xoops_import_table_preffix', 'xoops');
+  $xoops_import_table_prefix = variable_get('xoops_import_table_prefix', 'xoops');
   
   if (empty($vid)) {
     $output .= 'Creating category: ' . $description . '<br />';
@@ -132,7 +132,7 @@
   
   db_set_active('xoops');
 
-  $xoopsTopics = db_query("select * from {$xoops_import_table_preffix}_$table ORDER BY $col_id");
+  $xoopsTopics = db_query("select * from {$xoops_import_table_prefix}_$table ORDER BY $col_id");
   
   db_set_active('default');
   
@@ -168,11 +168,11 @@
 }
 
 function _xoops_import_comments($x_module_dir, $x_module_id, $x_item_id, $x_parent_id, $nid, $parent_id, $thread) {
-  $xoops_import_table_preffix = variable_get("xoops_import_table_preffix", "xoops");
+  $xoops_import_table_prefix = variable_get("xoops_import_table_prefix", "xoops");
   
   db_set_active('xoops');
   
-  $xoopsComments = db_query("SELECT * FROM {$xoops_import_table_preffix}_xoopscomments WHERE com_modid = %d AND com_itemid = %d AND com_pid = %d AND com_status = 2 ORDER BY com_created",
+  $xoopsComments = db_query("SELECT * FROM {$xoops_import_table_prefix}_xoopscomments WHERE com_modid = %d AND com_itemid = %d AND com_pid = %d AND com_status = 2 ORDER BY com_created",
     $x_module_id,
     $x_item_id,
     $x_parent_id