Index: trunk/admin/import/step2.php
===================================================================
diff -u -N -r6093 -r7391
--- trunk/admin/import/step2.php	(.../step2.php)	(revision 6093)
+++ trunk/admin/import/step2.php	(.../step2.php)	(revision 7391)
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 // new startup: begin
 define('REL_PATH', 'admin/import');
@@ -15,24 +15,24 @@
 require_once($pathtoroot.$admin."/toolbar.php");
 	//Set Section
 	$section = "in-portal:main_import";
-	
+
 	//Set Environment Variable
 	$envar = "env=" . BuildEnv();
 	$var = '?env='.BuildEnv();
-	
+
 	$sec = $objSections->GetSection($section);
 	$objCatToolBar = new clsToolBar();
-   	
+
    	// Previous Button
 	$MouseOver="swap('moveleft','toolbar/tool_prev_f2.gif');";
 	$MouseOut="swap('moveleft', 'toolbar/tool_prev.gif');";
 	$link = $adminURL.'/import/step1.php'.$var;
 	$objCatToolBar->Add('moveleft','la_ToolTip_PreviousStep', $link, $MouseOver, $MouseOut,'','tool_prev.gif');
-	
+
 	// Next Button
 	$MouseOver = "if( ChoiseMade('import_form','choose') !== false ) swap('moveright','toolbar/tool_next_f2.gif');";
 	$MouseOut = "if( ChoiseMade('import_form','choose') !== false ) swap('moveright', 'toolbar/tool_next.gif');";
-	
+
 	if($ro_perm)
 	{
 		$click_url = $adminURL."/import/step1.php".$var;
@@ -41,24 +41,24 @@
 	else
 	{
 		$application =& kApplication::Instance();
-		$click_url = $application->HREF('import_redirect', '', null, 'index.php'); //  $adminURL."/import/step3.php".$var;
+		$click_url = $application->HREF('in-portal/import_redirect', '', null, 'index.php'); //  $adminURL."/import/step3.php".$var;
 		$onClick = "ImportRedirect('import_form', ChoiseMade('import_form','choose'), '$click_url');";
 	}
 	$objCatToolBar->Add("moveright",'la_ToolTip_NextStep','#',$MouseOver,$MouseOut,$onClick,"tool_next_f3.gif");
-	
+
 	// header
 	$title = admin_language("la_performing_import")." - ".admin_language("la_Step")." 2";
   	int_header($objCatToolBar,NULL,$title);
-  	
+
 	$objSession->SetVariable("ReturnScript", 'browse.php'); // return to catalog if import is made
-	
+
 ?>
 <form name="import_form" id="import_form" method="post" action="<?php echo $click_url; ?>">
 	<input type="hidden" name="import_id" id="import_id" value="">
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
 
 	<?php int_subsection_title("Import Source"); ?>
- 	<tr <?php echo int_table_color(); ?>> 
+ 	<tr <?php echo int_table_color(); ?>>
     	<td><span class="text">Select the program you are importing the data from:</span></td>
  	</tr>
  	<tr <?php echo int_table_color(); ?>>