Index: trunk/admin/config/importlang_progress.php =================================================================== diff -u -N -r640 -r701 --- trunk/admin/config/importlang_progress.php (.../importlang_progress.php) (revision 640) +++ trunk/admin/config/importlang_progress.php (.../importlang_progress.php) (revision 701) @@ -108,10 +108,10 @@ { if((int)$file["size"]>0) { - move_uploaded_file($file["tmp_name"],$pathtoroot.$admin."/export/".$file["name"]); - @chmod($pathtoroot.$admin."/export/".$file["name"], 0666); - $filename = $pathtoroot.$admin."/export/".$file["name"]; + move_uploaded_file($file["tmp_name"],$filename)?1:0; + @chmod($filename, 0666); + if(file_exists($filename)) { /* parse xml file */ @@ -121,6 +121,8 @@ $objInXML = new xml_doc($xml); $objInXML->parse(); + $ado->Execute("DROP TABLE IF EXISTS $PhraseTable"); + $ado->Execute("DROP TABLE IF EXISTS $EventTable"); $sql = "CREATE TABLE $PhraseTable SELECT Phrase,Translation,PhraseType,LanguageId FROM ".GetTablePrefix()."Phrase WHERE PhraseId=-1"; $ado->Execute($sql); @@ -215,7 +217,7 @@ $Types = implode(",",$_POST["langtypes"]); $objSession->SetVariable("lang_types",$Types); $objSession->SetVariable("lang_overwrite",(int)$_POST["overwrite"]); - $Total = TableCount($PhraseTable,"PhraseType IN ($Types)",0); + $Total = $Types?TableCount($PhraseTable,"PhraseType IN ($Types)",0):0; $objSession->SetVariable("phrase_total",$Total); $Total = TableCount($EventTable,"",0); $objSession->SetVariable("event_total",$Total); @@ -272,7 +274,11 @@ $url = $_SERVER["PHP_SELF"]."?env=".BuildEnv()."&Offset=0&Status=1"; } else + { + $ado->Execute("DROP TABLE IF EXISTS $PhraseTable"); + $ado->Execute("DROP TABLE IF EXISTS $EventTable"); $url = $adminURL."/config/config_lang.php?env=".BuildEnv(); + } } reload($url);