Index: trunk/admin/import/inlinkimport4.php =================================================================== diff -u -r27 -r288 --- trunk/admin/import/inlinkimport4.php (.../inlinkimport4.php) (revision 27) +++ trunk/admin/import/inlinkimport4.php (.../inlinkimport4.php) (revision 288) @@ -75,141 +75,129 @@ 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(); + + //Set Section + $section = "in-portal:inlink_inport"; + + //Set Environment Variable + $envar = "env=" . BuildEnv(); + + $sec = $objSections->GetSection($section); + $objCatToolBar = new clsToolBar(); -$formaction = $adminURL."/import/import.php?".$envar; -$sec = $objSections->GetSection($section); -$objCatToolBar = new clsToolBar(); -$formaction = "import.php?".$envar; + //check if the previous input is correct + if( $_POST["Action"] == 'checkconn') + { + // save supplied connection info + $objSession->SetVariable("import_inlink_sql_type", $_POST["inlink_sql_type"]); + $objSession->SetVariable("import_inlink_server", $_POST["inlink_server"]); + $objSession->SetVariable("import_inlink_db", $_POST["inlink_db"]); + $objSession->SetVariable("import_inlink_user", $_POST["inlink_user"]); + $objSession->SetVariable("import_inlink_pass", $_POST["inlink_pass"]); + $objSession->SetVariable("error_importing", ''); + + + $inlink_sql_type = $objSession->GetVariable("import_inlink_sql_type"); + $inlink_server = $objSession->GetVariable("import_inlink_server"); + $inlink_db = $objSession->GetVariable("import_inlink_db"); + $inlink_user = $objSession->GetVariable("import_inlink_user"); + $inlink_pass = $objSession->GetVariable("import_inlink_pass"); + + // check supplied connection + $linkconn = ADONewConnection($inlink_sql_type); + if(!$linkconn->PConnect($inlink_server, $inlink_user, $inlink_pass, $inlink_db) || $inlink_server =="" || $inlink_db=="") + { + $objSession->SetVariable("error_importing","Error: The connection to the DB failed please check your settings"); + header("Location:inlinkimport3.php?".$envar); + } + unset($linkconn); + } -//check if the previous input is correct -if( $_POST["Action"]=="checkconn") -{ - $objSession->SetVariable("import_inlink_sql_type",$_POST["inlink_sql_type"]); - $objSession->SetVariable("import_inlink_server",$_POST["inlink_server"]); - $objSession->SetVariable("import_inlink_db",$_POST["inlink_db"]); - $objSession->SetVariable("import_inlink_user",$_POST["inlink_user"]); - $objSession->SetVariable("import_inlink_pass",$_POST["inlink_pass"]); - $objSession->SetVariable("error_importing",""); - - $inlink_sql_type=$objSession->GetVariable("import_inlink_sql_type"); - $inlink_server=$objSession->GetVariable("import_inlink_server"); - $inlink_db=$objSession->GetVariable("import_inlink_db"); - $inlink_user=$objSession->GetVariable("import_inlink_user"); - $inlink_pass=$objSession->GetVariable("import_inlink_pass"); - - - $linkconn = ADONewConnection($inlink_sql_type); - - if(!$linkconn->PConnect($inlink_server, $inlink_user, $inlink_pass, $inlink_db) || $inlink_server =="" || $inlink_db=="") - { - // echo "Database connection failed. DB Type: $sql_type, DB Server: $inlink_server, DB User: $inlink_user, DB Name: $inlink_db"; //fatal; - $objSession->SetVariable("error_importing","Error: The connection to the DB failed please check your settings"); - header("Location:inlinkimport3.php?".$envar); - //$linkconn->ErrorMsg(); - } - unset($linkconn); -} -//if it is not then we redirect the user back to the page with a message of what went wrong. - -if (true) -{ + $import_script = GetImportScript( $objSession->GetVariable('ImportScriptID') ); - if(true) - { - - $MouseOver="swap('moveleft','toolbar/tool_prev_f2.gif');"; - $MouseOut="swap('moveleft', 'toolbar/tool_prev.gif');"; - $var="?env=".BuildEnv()."&en=$en_prev"; - $link=$adminURL."/import/inlinkimport3.php".$var; + $var = "?env=".BuildEnv(); + // Previous Button + $MouseOver = "swap('moveleft','toolbar/tool_prev_f2.gif');"; + $MouseOut = "swap('moveleft', 'toolbar/tool_prev.gif');"; + $link = $adminURL."/import/inlinkimport3.php".$var; $objCatToolBar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Step"),$link,$MouseOver,$MouseOut,"","tool_prev.gif"); - } - - if(true) - { - $MouseOver="swap('moveright','toolbar/tool_next_f2.gif');"; - $MouseOut="swap('moveright', 'toolbar/tool_next.gif');"; - $var="?env=".BuildEnv()."&en=$en_next"; - $link=$adminURL."/import/inlinkimport4.php".$var; - - $onClick="if(document.inlinkimport4.user_admin.value=='' || document.inlinkimport4.user_regular.value=='' || document.inlinkimport4.init_cat.value=='' || document.inlinkimport4.link_image.value =='') alert('Please fill in all of the fields'); else import_submit('inlinkimport4','$formaction','');"; - $link="#"; - $objCatToolBar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Step"),$link,$MouseOver,$MouseOut,$onClick,"tool_next.gif"); - } + // Next Button + $MouseOver = "swap('moveright','toolbar/tool_next_f2.gif');"; + $MouseOut = "swap('moveright', 'toolbar/tool_next.gif');"; + $formaction = $adminURL.'/import/'.$import_script['url'].'.php?'.$envar; + $link = $adminURL."/import/inlinkimport4.php".$var; + $onClick = "if( !CheckFinalForm('import_form') ) alert('Please fill in all of the fields'); else import_submit('import_form','$formaction',''); "; + $objCatToolBar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Step"),'#',$MouseOver,$MouseOut,$onClick,"tool_next.gif"); - $title = admin_language("la_performing_import")." - ".admin_language("la_Step")." 4"; - - int_header($objCatToolBar,NULL,$title); -} + // Header + $title = admin_language("la_performing_import")." - ".admin_language("la_Step")." 4"; + int_header($objCatToolBar,NULL,$title); + ?> +
"> + -"> - - > - - - - > - - - - > - > + + + + > + + + + > + - - - > - - - - - - - - -
- GetVariable("user_admin_names"); ?> - - - - - -
- GetVariable("user_regular_names"); ?> - - - - - -
- GetVariable("categoryid"); - if($catid>0) - { - $c = $objCatList->GetItemByField("ResourceId",$catid); - $path = prompt_language($objConfig->Get("Root_Name")). ">".$c->GetCachedNavBar(); - } - else - $path = prompt_language($objConfig->Get("Root_Name")); + + +
+ GetVariable("user_admin_names"); ?> + "> + + +
+ GetVariable("user_regular_names"); ?> + "> + + +
GetVariable('categoryid'); + $path = prompt_language($objConfig->Get("Root_Name")); + if($catid > 0) + { + $c = $objCatList->GetItemByField('ResourceId', $catid); + $path .= ">".$c->GetCachedNavBar(); + } ?> - - - - - - - - -
- -
-
+ + + + "> + + + + + + + > + + + "> + + + + + + +