Index: trunk/admin/users/group_select.php
===================================================================
diff -u -r13 -r338
--- trunk/admin/users/group_select.php	(.../group_select.php)	(revision 13)
+++ trunk/admin/users/group_select.php	(.../group_select.php)	(revision 338)
@@ -134,13 +134,13 @@
 
 $order = $objConfig->Get("GroupSelect_SortOrder");
 
-$SelectorType="checkbox";
-if($_GET["Selector"])
-  $SelectorType=$_GET["Selector"];
+$SelectorType = GetVar('Selector');
+if(!$SelectorType) $SelectorType = 'checkbox';
+$source = GetVar('source');
 
-if(strlen($_GET["source"])>0)
+if($source)
 {
-  switch($_GET["source"])
+  switch($source)
   {
     case "addcategory_permissions":
       $SelectorType = "radio"; 
@@ -209,23 +209,19 @@
 
 $objListView->ColumnHeaders->SetSort($objConfig->Get("GroupSelect_SortField"),$order);
 
-
-
 $objListView->PrintToolBar = FALSE;
 $objListView->CurrentPageVar = "Page_Grouplist";
 $objListView->PerPageVar = "Perpage_Grouplist";
 $objListView->CheckboxName = "itemlist[]";
-$objListView->TotalItemCount = $itemcount;
-$objListView->SelectorType=$SelectorType;
+$objListView->TotalItemCount = $objGroups->QueryItemCount;
+$objListView->SelectorType = $SelectorType;
 
-
-
+$title = 'Select Group';
 int_header($objListToolBar,NULL,$title);
 
-if(strlen($_GET["values"]))
-{
-  $current_value = explode(",",$_GET["values"]);
-}
+$values = GetVar('values');
+if($values) $current_value = explode(',', $values);
+
 ?>
 
 <FORM method="POST" ACTION="" NAME="grouplistform" ID="grouplistform">
Index: trunk/kernel/admin/include/toolbar/main_import.php
===================================================================
diff -u -r326 -r338
--- trunk/kernel/admin/include/toolbar/main_import.php	(.../main_import.php)	(revision 326)
+++ trunk/kernel/admin/include/toolbar/main_import.php	(.../main_import.php)	(revision 338)
@@ -43,13 +43,11 @@
 		// checks if all required fields are filled
 		var frm = document.getElementById(form);
 		<?php
-			$required = Array('user_admin','user_regular','init_cat');
 			$import_script = GetImportScript( $objSession->GetVariable('ImportScriptID') );
 			if( ($import_script !== false) && strlen($import_script['required_fields']) > 0 )
-			{
-				$script_required = explode(',', $import_script['required_fields']);
-				$required = array_merge($required, $script_required);	
-			}
+				$required = explode(',', $import_script['required_fields']);
+			else
+				$required = Array();
 			echo "var required_fields = Array('".implode("','", $required)."');\n";
 		?>
 		var form_is_valid = true;
Index: trunk/admin/import/step4.php
===================================================================
diff -u -r326 -r338
--- trunk/admin/import/step4.php	(.../step4.php)	(revision 326)
+++ trunk/admin/import/step4.php	(.../step4.php)	(revision 338)
@@ -112,7 +112,7 @@
 	   	}
 	    unset($linkconn);
 	}
-
+	
 	$import_script = GetImportScript( $objSession->GetVariable('ImportScriptID') );
 	
 	$var = "?env=".BuildEnv();
@@ -192,16 +192,30 @@
 <?php
 	if( $import_script['id'] == 'in-link' )
 	{
+		if( GetVar('link_image') ) $objSession->SetVariable('link_image', GetVar('link_image') );
 ?>	
 	<tr <?php echo int_table_color(); ?>> 
 		<td width="60%" valign="top"><span class="text"><?php echo admin_language("la_prompt_Import_ImageName"); ?></span></td>
 		<td> 
-			<input type="text" name="link_image" class="text" size="30" value="<?php echo $objSession->GetVariable("link_image"); ?>">
+			<input type="text" name="link_image" class="text" size="30" value="<?php echo $objSession->GetVariable('link_image'); ?>">
 		</td>
 	</tr>
 <?php
 	}
+	
+	if( $import_script['module'] == 'in-bulletin' )
+	{
+		if( GetVar('bb_prefix') ) $objSession->SetVariable('import_table_prefix', GetVar('bb_prefix') );
 ?>
+	<tr <?php echo int_table_color(); ?>> 
+		<td width="60%" valign="top"><span class="text"><?php echo admin_language("la_prompt_Import_Prefix"); ?></span></td>
+		<td> 
+			<input type="text" name="bb_prefix" class="text" size="30" value="<?php echo $objSession->GetVariable('import_table_prefix'); ?>">
+		</td>
+	</tr>
+<?php
+	}
+?>
 <!-- script spefific fields: end -->
 </table>
 </form>