Index: trunk/admin/import/inlinkimport2.php
===================================================================
diff -u -r203 -r288
--- trunk/admin/import/inlinkimport2.php	(.../inlinkimport2.php)	(revision 203)
+++ trunk/admin/import/inlinkimport2.php	(.../inlinkimport2.php)	(revision 288)
@@ -75,79 +75,61 @@
 require_once ($pathtoroot."kernel/admin/include/navmenu.php");
 require_once ($pathtolocal."admin/include/navmenu.php");
 require_once($pathtoroot.$admin."/toolbar.php");
-//Set Section
-$section = "in-portal:inlink_inport";
-//Set Environment Variable
-$envar = "env=" . BuildEnv();
-
-$formaction = $adminURL."/import/import.php?".$envar;
- $sec = $objSections->GetSection($section);
- $objCatToolBar = new clsToolBar();
-
-if (true)
-{
+	//Set Section
+	$section = "in-portal:inlink_inport";
 	
-   if(true)
-  {
-    $MouseOver="swap('moveleft','toolbar/tool_prev_f2.gif');";
-    $MouseOut="swap('moveleft', 'toolbar/tool_prev.gif');";
+	//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/inlinkimport1.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/inlinkimport1.php".$var;
+		$onClick = "if( ChoiseMade('import_form','choose') ) document.location= '$click_url'; ";
+	}
+	else
+	{
+		$click_url = $adminURL."/import/inlinkimport3.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);
 
-    $var="?env=".BuildEnv()."&en=$en_prev";
-    $link=$adminURL."/import/inlinkimport1.php".$var;
-    
-    $objCatToolBar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Step"),$link,$MouseOver,$MouseOut,"","tool_prev.gif");
-  }
-  
-  if(true)
-  {
-    $MouseOver="if (document.inlinkimport2.choose[0].checked) swap('moveright','toolbar/tool_next_f2.gif');";
-    $MouseOut="if (document.inlinkimport2.choose[0].checked) swap('moveright', 'toolbar/tool_next.gif');";
-
-
-    $var="?env=".BuildEnv()."&en=$en_next";
-    $ro_perm = $objSession->HasSystemPermission("SYSTEM_ACCESS.READONLY");
-	$script_name = $ro_perm ? 'inlinkimport1' : 'inlinkimport3';
-    $link2=$adminURL."/import/".$script_name.".php".$var;
-    
-    $onClick="if (document.inlinkimport2.choose[0].checked) document.location= '$link2'; ";
-   
-    $link="#";
-    $objCatToolBar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Step"),$link,$MouseOver,$MouseOut,$onClick,"tool_next_f3.gif");
-  }
-  
-  $title = admin_language("la_performing_import")." - ".admin_language("la_Step")." 2";
-  
-  int_header($objCatToolBar,NULL,$title);
-}
 ?>
-         
+<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">
-<form name="inlinkimport2" METHOD="POST" action="<?php echo $_SERVER["PHP_SELF"]."?".$envar; ?>">	
-<?php int_subsection_title("Import Source");  ?>
- <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(); ?>>
-  <td >
- 		<span class=\"small\">
- 		</span>  
-		<input type="radio" name="choose" id="ch1" value="1" onclick="swap('moveright', 'toolbar/tool_next.gif')"><span class=\"text\"><label for="ch1">Intechnic In-Link 2.x</label></span>  <br />
-    	<input type="radio" name="choose" id="ch2" value="2" onclick="swap('moveright', 'toolbar/tool_next.gif')" disabled="true"><span class=\"text\"><label for="ch2">Gossamer Threads Links 2.x</label></span>  <br />
-    	<input type="radio" name="choose" id="ch3" value="3" onclick="swap('moveright', 'toolbar/tool_next.gif')" disabled="true"><span class=\"text\"><label for="ch3">Gossamer Threads Links 2.x SQL version</label></span>  <br />
-		<input type="radio" name="choose" id="ch4" value="4" onclick="swap('moveright', 'toolbar/tool_next.gif')" disabled="true"><span class=\"text\"><label for="ch4">Sentrwaweb Index u 3.x</label></span>  <br />
 
-   	</td>
-   </tr>
- <tr>
- <td>
- </td>
- </tr>
-</FORM>
-</TABLE>
+	<?php int_subsection_title("Import Source"); ?>
+ 	<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(); ?>>
+  		<td>
+		<?php
+			foreach($import_scripts as $id => $iscript)
+				echo '<input type="radio" name="choose" id="ch'.$id.'" value="'.$id.'" onclick="swap(\'moveright\', \'toolbar/tool_next.gif\')"'.(!$iscript['enabled'] ? ' disabled="true"' : '').'><span class="text"><label for="ch'.$id.'">'.$iscript['label'].'</label></span><br />'."\n";
+		?>
+   		</td>
+   	</tr>
+</table>
+</form>
 <?php
 int_footer();
 ?>
\ No newline at end of file