From 9d8feacbf0fb7d3e984e2ce8588d8a0838b51923 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 13 Jul 2007 01:19:09 +0000
Subject: [PATCH] =?UTF-8?q?=EC=A0=9C=EB=A1=9C=EB=B3=B4=EB=93=9C4,=20zb5bet?=
 =?UTF-8?q?a=20xml=EB=8D=B0=EC=9D=B4=ED=84=B0=EB=A5=BC=20import=EC=8B=9C?=
 =?UTF-8?q?=EC=97=90=20log=EB=B3=B4=EC=9D=B4=EB=8A=94=20=EB=B6=80=EB=B6=84?=
 =?UTF-8?q?=20=EC=A0=95=EB=A6=AC=20=EB=B0=8F=20=EC=B2=A8=EB=B6=80=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20=EB=B0=9B=EB=8A=94=20=EB=B6=80=EB=B6=84=EC=9D=98=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20(url=EC=97=90=20?=
 =?UTF-8?q?=EA=B3=B5=EB=B0=B1=EC=9D=B4=20=EC=9E=88=EC=9D=84=20=EA=B2=BD?=
 =?UTF-8?q?=EC=9A=B0=20=EB=B0=9B=EC=A7=80=20=EB=AA=BB=ED=96=88=EC=9D=8C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/trunk@1915 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/file/FileHandler.class.php             | 1 +
 modules/importer/importer.admin.controller.php | 1 +
 modules/importer/tpl/css/importer.css          | 3 +++
 modules/importer/tpl/index.html                | 1 +
 modules/importer/tpl/js/importer_admin.js      | 9 ++++++++-
 5 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 modules/importer/tpl/css/importer.css

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 .= "<br />".$this->msg;
+                $message .= "<br />";
                 $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 @@
 <!--%import("js/importer_admin.js")-->
+<!--%import("css/importer.js")-->
 <!--%import("filter/step1.xml")-->
 <!--%import("filter/step12.xml")-->
 <!--%import("filter/import_xml.xml")-->
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(/&lt;/g,"<").replace(/&gt;/g,">");
-        xInnerHtml('step2_position', xInnerHtml('step2_position')+"<br />"+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);
+
+
     }
 }