diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php index f4d3038ce..eea3d219b 100644 --- a/classes/file/FileHandler.class.php +++ b/classes/file/FileHandler.class.php @@ -137,6 +137,7 @@ $fp = @fsockopen($url_info['host'], $url_info['port']); if(!$fp) return; + $url_info['path'] = str_replace(' ','%20',$url_info['path']); $header = sprintf("GET %s HTTP/1.0\r\nHost: %s\r\nReferer: %s://%s\r\n\r\n", $url_info['path'], $url_info['host'], $url_info['scheme'], $url_info['host']); @fwrite($fp, $header); diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php index d6568b5f1..c893bddf6 100644 --- a/modules/importer/importer.admin.controller.php +++ b/modules/importer/importer.admin.controller.php @@ -127,6 +127,7 @@ $message = sprintf(Context::getLang('msg_importing'), $this->total_count, $this->imported_count); if($this->msg) $message .= "
".$this->msg; + $message .= "
"; $this->setMessage( $message ); } } diff --git a/modules/importer/tpl/css/importer.css b/modules/importer/tpl/css/importer.css new file mode 100644 index 000000000..cdd6e64a7 --- /dev/null +++ b/modules/importer/tpl/css/importer.css @@ -0,0 +1,3 @@ +@charset "utf-8"; + +#step2_position { height:150px; overflow-y:scroll; border:2px solid #DDDDDD; } diff --git a/modules/importer/tpl/index.html b/modules/importer/tpl/index.html index 3fdbd6c1c..5794600d0 100644 --- a/modules/importer/tpl/index.html +++ b/modules/importer/tpl/index.html @@ -1,4 +1,5 @@ + diff --git a/modules/importer/tpl/js/importer_admin.js b/modules/importer/tpl/js/importer_admin.js index a60a789ae..99fdcfe12 100644 --- a/modules/importer/tpl/js/importer_admin.js +++ b/modules/importer/tpl/js/importer_admin.js @@ -95,8 +95,15 @@ function completeImport(ret_obj) { var fo_obj = xGetElementById('fo_step2'); fo_obj.position.value = position; message = message.replace(/</g,"<").replace(/>/g,">"); - xInnerHtml('step2_position', xInnerHtml('step2_position')+"
"+message); + + var obj = xGetElementById('step2_position'); + var txt = xInnerHtml(obj); + if(txt.length > 1024*256) txt = ''; + xInnerHtml(obj, txt+message); + obj.scrollTop += xHeight(obj); procFilter(fo_obj, import_xml); + + } }