From 937fbcc7430d4a6e8a37211850676346b46d4025 Mon Sep 17 00:00:00 2001
From: misol <misol.kr@gmail.com>
Date: Tue, 17 Mar 2009 15:24:01 +0000
Subject: [PATCH] =?UTF-8?q?#17856472=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5894 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/file/file.controller.php | 5 +++++
 modules/file/file.model.php      | 5 +++++
 modules/file/file.view.php       | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
index c6d328674..7be45098c 100644
--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@@ -290,8 +290,13 @@
                 if($logged_info->is_admin != 'Y') {
                     $oFileModel = &getModel('file');
                     $config = $oFileModel->getFileConfig($module_srl);
+                    $allowed_filesize = $config->allowed_filesize * 1024 * 1024;
                     $allowed_attach_size = $config->allowed_attach_size * 1024 * 1024;
 
+                    // 한 파일당 허용 용량 초과시 오류 출력
+                    if($allowed_filesize > filesize($file_info['tmp_name'])) return new Object(-1, 'msg_exceeds_limit_size');
+
+
                     // 해당 문서에 첨부된 모든 파일의 용량을 가져옴 (DB에서 가져옴)
                     $size_args->upload_target_srl = $upload_target_srl;
                     $output = executeQuery('file.getAttachedFileSize', $size_args);
diff --git a/modules/file/file.model.php b/modules/file/file.model.php
index 81a1780ea..c039679de 100644
--- a/modules/file/file.model.php
+++ b/modules/file/file.model.php
@@ -80,6 +80,11 @@
          * @brief 파일 설정 정보를 구함
          **/
         function getFileConfig($module_srl = null) {
+            // module_srl이 없으면 현재 모듈
+            if(!$module_srl) {
+                $current_module_info = Context::get('current_module_info');
+                $module_srl = $current_module_info->module_srl;
+            }
             // 설정 정보를 받아옴 (module model 객체를 이용)
             $oModuleModel = &getModel('module');
 
diff --git a/modules/file/file.view.php b/modules/file/file.view.php
index a921b0016..a748cd4bb 100644
--- a/modules/file/file.view.php
+++ b/modules/file/file.view.php
@@ -4,7 +4,7 @@
      * @author zero (zero@nzeo.com)
      * @brief  file module의 view class
      *
-     * RSS 2.0형식으로 문서 출력
+     *
      *
      **/