From 473feb1c3feb16440d57691ea2f6247e6c38792e Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 16 May 2007 06:24:36 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1420
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 classes/file/FileHandler.class.php       | 14 ++++++-------
 modules/importer/importer.controller.php | 18 ++++++++---------
 modules/importer/tpl/index.html          |  4 +++-
 modules/module/module.model.php          | 25 +++++++++++++-----------
 4 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php
index 3f5b6f030..01f8fe5b8 100644
--- a/classes/file/FileHandler.class.php
+++ b/classes/file/FileHandler.class.php
@@ -132,7 +132,7 @@
             if(!file_exists($source_file)) return;
 
             // 이미지 정보를 구함
-            list($width, $height, $type, $attrs) = getimagesize($source_file);
+            list($width, $height, $type, $attrs) = @getimagesize($source_file);
             switch($type) {
                 case '1' :
                         $type = 'gif';
@@ -161,26 +161,26 @@
             if($resize_height>0 && $new_height > $resize_height) $new_height = $resize_height;
 
             // 업로드한 파일을 옮기지 않고 gd를 이용해서 gif 이미지를 만듬 (gif, jpg, png, bmp가 아니면 역시 무시) 
-            if(function_exists('imagecreatetruecolor')) $thumb = imagecreatetruecolor($new_width, $new_height);
-            else $thumb = imagecreate($new_width, $new_height);
+            if(function_exists('imagecreatetruecolor')) $thumb = @imagecreatetruecolor($new_width, $new_height);
+            else $thumb = @imagecreate($new_width, $new_height);
 
             switch($type) {
                 case 'gif' : 
-                        $source = imagecreatefromgif($source_file);
+                        $source = @imagecreatefromgif($source_file);
                     break;
                 // jpg
                 case 'jpeg' : 
                 case 'jpg' : 
-                        $source = imagecreatefromjpeg($source_file);
+                        $source = @imagecreatefromjpeg($source_file);
                     break;
                 // png
                 case 'png' : 
-                        $source = imagecreatefrompng($source_file);
+                        $source = @imagecreatefrompng($source_file);
                     break;
                 // bmp
                 case 'wbmp' : 
                 case 'bmp' : 
-                        $source = imagecreatefromwbmp($source_file);
+                        $source = @imagecreatefromwbmp($source_file);
                     break;
                 default :
                     return;
diff --git a/modules/importer/importer.controller.php b/modules/importer/importer.controller.php
index 779c89f72..ab82b21f9 100644
--- a/modules/importer/importer.controller.php
+++ b/modules/importer/importer.controller.php
@@ -121,7 +121,7 @@
                 $buff = '';
                 while(!feof($fp)) {
                     $str = fgets($fp,1024);
-                    $buff .= $str;
+                    $buff .= trim($str);
                     $buff = preg_replace_callback("!<member user_id=\"([^\"]*)\">(.*?)<\/member>!is", array($this, '_importMember'), $buff);
                 }
                 fclose($fp);
@@ -147,22 +147,22 @@
                 $member_srl = $output->get('member_srl');
                 if($xml_doc->member->image_nickname->body) {
                     $image_nickname = base64_decode($xml_doc->member->image_nickname->body);
-                    FileHandler::writeFile('./files/cache/tmp_imagefile', $image_nickname);
-                    $this->oMemberController->insertImageName($member_srl, './files/cache/tmp_imagefile');
-                    @unlink('./files/cache/tmp_imagefile');
+                    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');
                 }
                 if($xml_doc->member->image_mark->body) {
                     $image_mark = base64_decode($xml_doc->member->image_mark->body);
-                    FileHandler::writeFile('./files/cache/tmp_imagefile', $image_mark);
-                    $this->oMemberController->insertImageMark($member_srl, './files/cache/tmp_imagefile');
-                    @unlink('./files/cache/tmp_imagefile');
+                    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');
                 }
                 if($xml_doc->member->signature->body) {
-                    $oMemberController->putSignature($member_srl, $xml_doc->member->signature->body);
+                    $this->oMemberController->putSignature($member_srl, base64_decode($xml_doc->member->signature->body));
                 }
 
                 $this->imported_count ++;
-                if(!$this->imported_count%500) usleep(200);
+                if(!$this->imported_count%50) usleep(100);
             }
             return '';
         }
diff --git a/modules/importer/tpl/index.html b/modules/importer/tpl/index.html
index 6b46b49c0..69661db38 100644
--- a/modules/importer/tpl/index.html
+++ b/modules/importer/tpl/index.html
@@ -80,7 +80,9 @@
 
 <!-- step 2. XML 파일 지정 -->
 <div id="step2" style="display:none">
-    <form action="./" method="get" onsubmit="return doStep2(this)">
+    <form action="./" method="get" >
+        <input type="hidden" name="module" value="importer" />
+        <input type="hidden" name="act" value="procImporterAdminImport" />
         <input type="hidden" name="module_srl" value="" />
         <input type="hidden" name="category_srl" value="" />
         <div style="font-weight:bold">{$lang->import_step_title[2]}</div>
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index 5050c979e..d62e36c63 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -374,22 +374,25 @@
          * 캐시된 설정 정보가 없으면 만들 후 캐시하고 return
          **/
         function getModuleConfig($module) {
-            $cache_file = sprintf('./files/cache/module_info/%s.config.php',$module);
+            if($GLOBALS['__ModuleConfig__'][$module]) {
+                $cache_file = sprintf('./files/cache/module_info/%s.config.php',$module);
 
-            if(!file_exists($cache_file)) {
-                $args->module = $module;
-                $output = executeQuery('module.getModuleConfig', $args);
+                if(!file_exists($cache_file)) {
+                    $args->module = $module;
+                    $output = executeQuery('module.getModuleConfig', $args);
 
-                $config = base64_encode($output->data->config);
+                    $config = base64_encode($output->data->config);
 
-                $buff = sprintf('<?php if(!defined("__ZBXE__")) exit(); $config = "%s"; ?>', $config);
+                    $buff = sprintf('<?php if(!defined("__ZBXE__")) exit(); $config = "%s"; ?>', $config);
 
-                FileHandler::writeFile($cache_file, $buff);
+                    FileHandler::writeFile($cache_file, $buff);
+                }
+
+                if(!$config && file_exists($cache_file)) @include($cache_file);
+
+                $GLOBALS['__ModuleConfig__'][$module] = unserialize(base64_decode($config));
             }
-
-            if(!$config && file_exists($cache_file)) @include($cache_file);
-
-            return unserialize(base64_decode($config));
+            return $GLOBALS['__ModuleConfig__'][$module];
         }