From 9237f2a45c8d691e182c0bc38c484214cd17d07a Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Sat, 11 Aug 2007 04:04:44 +0000
Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=A0=95=EB=B3=B4=20?=
 =?UTF-8?q?=EC=9D=B4=EC=A0=84=EC=8B=9C=20=EC=9D=B4=EB=AF=B8=EC=A7=80?=
 =?UTF-8?q?=EC=9D=B4=EB=A6=84/=EB=A7=88=ED=81=AC/=EC=84=9C=EB=AA=85?=
 =?UTF-8?q?=EC=9D=84=20=EB=B0=94=EB=A1=9C=20=EC=A0=80=EC=9E=A5=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD.=20=EB=8F=99=EA=B8=B0?=
 =?UTF-8?q?=ED=99=94=EC=8B=9C=EC=97=90=20=EB=AA=A8=EB=93=A0=20=ED=9A=8C?=
 =?UTF-8?q?=EC=9B=90=20=EB=8C=80=EC=83=81=20=EB=B3=80=EA=B2=BD?=
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@2302 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 .../importer/importer.admin.controller.php    | 20 +++++++++++--------
 .../importer/queries/updateCommentSync.xml    |  3 +--
 .../importer/queries/updateDocumentSync.xml   |  3 +--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php
index 2aebe8288..25084bcc6 100644
--- a/modules/importer/importer.admin.controller.php
+++ b/modules/importer/importer.admin.controller.php
@@ -198,6 +198,7 @@
             $args->birthday = $xml_doc->member->birthday->body;
             $args->email_address = $xml_doc->member->email_address->body;
             list($args->email_id, $args->email_host) = explode('@', $args->email_address);
+            if(!$args->email_host) $args->email_host = $args->email_id;
             $args->password = $xml_doc->member->password->body;
             $args->regdate = $xml_doc->member->regdate->body;
             $args->allow_mailing = $xml_doc->member->allow_mailing->body;
@@ -227,22 +228,25 @@
                 // 이미지네임
                 if($xml_doc->member->image_nickname->body) {
                     $image_nickname = base64_decode($xml_doc->member->image_nickname->body);
-                    FileHandler::writeFile('./files/cache/tmp_imagefile.gif', $image_nickname);
-                    $this->oMemberController->insertImageName($member_srl, './files/cache/tmp_imagefile.gif');
-                    @unlink('./files/cache/tmp_imagefile.gif');
+                    $target_filename = sprintf('files/member_extra_info/image_name/%s%d.gif', getNumberingPath($args->member_srl), $args->member_srl);
+                    FileHandler::writeFile($target_filename, $image_nickname);
                 }
 
                 // 이미지 마크
                 if($xml_doc->member->image_mark->body) {
                     $image_mark = base64_decode($xml_doc->member->image_mark->body);
-                    FileHandler::writeFile('./files/cache/tmp_imagefile.gif', $image_mark);
-                    $this->oMemberController->insertImageMark($member_srl, './files/cache/tmp_imagefile.gif');
-                    @unlink('./files/cache/tmp_imagefile.gif');
+                    $target_filename = sprintf('files/member_extra_info/image_mark/%s%d.gif', getNumberingPath($args->member_srl), $args->member_srl);
+                    FileHandler::writeFile($target_filename, $image_mark);
                 }
 
                 // 서명
-                if($xml_doc->member->signature->body) {
-                    $this->oMemberController->putSignature($member_srl, base64_decode($xml_doc->member->signature->body));
+                if(trim($xml_doc->member->signature->body)) {
+                    $signature = removeHackTag(base64_decode($xml_doc->member->signature->body));
+                    $target_path = sprintf('files/member_extra_info/signature/%s/', getNumberingPath($args->member_srl));
+                    $target_filename = sprintf('%s%d.signature.php', $target_path, $args->member_srl);
+                    $signature_buff = sprintf('<?php if(!defined("__ZBXE__")) exit();?>%s', $signature);
+                    FileHandler::makeDir($target_path);
+                    FileHandler::writeFile($target_filename, $signature_buff);
                 }
             } else {
                 $this->msg .= $args->user_id." : ".$output->getMessage()."<br />";
diff --git a/modules/importer/queries/updateCommentSync.xml b/modules/importer/queries/updateCommentSync.xml
index 2543ec58a..6303d624d 100644
--- a/modules/importer/queries/updateCommentSync.xml
+++ b/modules/importer/queries/updateCommentSync.xml
@@ -7,7 +7,6 @@
         <column name="comments.member_srl" default="member.member_srl" filter="number" />
     </columns>
     <conditions>
-        <condition operation="equal" column="comments.member_srl" default="-1" notnull="notnull" />
-        <condition operation="equal" column="comments.user_id" default="member.user_id" pipe="and" />
+        <condition operation="equal" column="comments.user_id" default="member.user_id" />
     </conditions>
 </query>
diff --git a/modules/importer/queries/updateDocumentSync.xml b/modules/importer/queries/updateDocumentSync.xml
index fab7263cc..d46ec197e 100644
--- a/modules/importer/queries/updateDocumentSync.xml
+++ b/modules/importer/queries/updateDocumentSync.xml
@@ -7,7 +7,6 @@
         <column name="documents.member_srl" default="member.member_srl" filter="number" />
     </columns>
     <conditions>
-        <condition operation="equal" column="documents.member_srl" default="-1" notnull="notnull" />
-        <condition operation="equal" column="documents.user_id" default="member.user_id" pipe="and" />
+        <condition operation="equal" column="documents.user_id" default="member.user_id" />
     </conditions>
 </query>