From bc414542bfbbb7573f249b2e668f9af4b8274c47 Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Mon, 26 Apr 2010 14:26:25 +0000
Subject: [PATCH] =?UTF-8?q?#18754919=20:=20specify=20error=20message=20for?=
 =?UTF-8?q?=20file=20download=20-=20thanks=20to=20=ED=8C=8C=EC=9D=B4?=
 =?UTF-8?q?=EB=8D=B8?=
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@7396 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/file/file.controller.php | 4 ++--
 modules/file/lang/en.lang.php    | 1 +
 modules/file/lang/es.lang.php    | 1 +
 modules/file/lang/fr.lang.php    | 1 +
 modules/file/lang/jp.lang.php    | 1 +
 modules/file/lang/ko.lang.php    | 1 +
 modules/file/lang/ru.lang.php    | 1 +
 modules/file/lang/vi.lang.php    | 1 +
 modules/file/lang/zh-CN.lang.php | 1 +
 modules/file/lang/zh-TW.lang.php | 1 +
 10 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
index 7cf96bd11..e5472fbcc 100644
--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@@ -174,7 +174,7 @@
                     }
                     else $file_module_config->allow_outlink = 'Y';
                 }
-                if($file_module_config->allow_outlink != 'Y') return $this->stop('msg_not_permitted_download');
+                if($file_module_config->allow_outlink != 'Y') return $this->stop('msg_not_allowed_outlink');
             }
 
             // 파일 다운로드 권한이 있는지 확인
@@ -206,7 +206,7 @@
 
             // trigger 호출 (before)
             $output = ModuleHandler::triggerCall('file.downloadFile', 'before', $file_obj);
-            if(!$output->toBool()) return $this->stop('msg_not_permitted_download');
+            if(!$output->toBool()) return $this->stop(($output->message)?$output->message:'msg_not_permitted_download');
 
             // 파일 출력
             if(strstr($_SERVER['HTTP_USER_AGENT'], "MSIE")) {
diff --git a/modules/file/lang/en.lang.php b/modules/file/lang/en.lang.php
index bb9036ad8..cdcb3a6f3 100644
--- a/modules/file/lang/en.lang.php
+++ b/modules/file/lang/en.lang.php
@@ -52,4 +52,5 @@
         'nick_name' => 'Nickname',
         'ipaddress' => 'IP Address',
     );
+	$lang->msg_not_allowed_outlink = 'It is not allowed to download files not from this site.'; 
 ?>
diff --git a/modules/file/lang/es.lang.php b/modules/file/lang/es.lang.php
index d2074cc96..b378ba4fd 100644
--- a/modules/file/lang/es.lang.php
+++ b/modules/file/lang/es.lang.php
@@ -49,4 +49,5 @@
         'regdate' => 'La fecha registrada',
         'ipaddress' => 'Dirección IP',
     );
+	$lang->msg_not_allowed_outlink = 'It is not allowed to download files not from this site.'; 
 ?>
diff --git a/modules/file/lang/fr.lang.php b/modules/file/lang/fr.lang.php
index 913ec3a3b..695177b2c 100644
--- a/modules/file/lang/fr.lang.php
+++ b/modules/file/lang/fr.lang.php
@@ -49,4 +49,5 @@
         'regdate' => 'Enrgistre',
         'ipaddress' => 'Adresse IP',
     );
+	$lang->msg_not_allowed_outlink = 'It is not allowed to download files not from this site.'; 
 ?>
diff --git a/modules/file/lang/jp.lang.php b/modules/file/lang/jp.lang.php
index a451947a5..dc733fc92 100644
--- a/modules/file/lang/jp.lang.php
+++ b/modules/file/lang/jp.lang.php
@@ -51,4 +51,5 @@
         'regdate' => '登録日',
         'ipaddress' => 'IPアドレス',
     );
+	$lang->msg_not_allowed_outlink = 'It is not allowed to download files not from this site.'; 
 ?>
diff --git a/modules/file/lang/ko.lang.php b/modules/file/lang/ko.lang.php
index 3d55f1a38..14746eb17 100644
--- a/modules/file/lang/ko.lang.php
+++ b/modules/file/lang/ko.lang.php
@@ -51,4 +51,5 @@
         'regdate' => '등록일',
         'ipaddress' => 'IP 주소',
     );
+	$lang->msg_not_allowed_outlink = '외부링크에서 다운로드 할 수 없습니다.'; 
 ?>
diff --git a/modules/file/lang/ru.lang.php b/modules/file/lang/ru.lang.php
index 63cae3dd5..5fba0b748 100644
--- a/modules/file/lang/ru.lang.php
+++ b/modules/file/lang/ru.lang.php
@@ -51,4 +51,5 @@
         'regdate' => 'Дата регистрации',
         'ipaddress' => 'IP-Адрес',
     );
+	$lang->msg_not_allowed_outlink = 'It is not allowed to download files not from this site.'; 
 ?>
diff --git a/modules/file/lang/vi.lang.php b/modules/file/lang/vi.lang.php
index 3e32357b3..6f66c09aa 100644
--- a/modules/file/lang/vi.lang.php
+++ b/modules/file/lang/vi.lang.php
@@ -54,4 +54,5 @@
         'nick_name' => 'Nickname',
         'ipaddress' => 'IP',
     );
+	$lang->msg_not_allowed_outlink = 'It is not allowed to download files not from this site.'; 
 ?>
diff --git a/modules/file/lang/zh-CN.lang.php b/modules/file/lang/zh-CN.lang.php
index 7f2fa43ab..ccbfa9d41 100644
--- a/modules/file/lang/zh-CN.lang.php
+++ b/modules/file/lang/zh-CN.lang.php
@@ -49,4 +49,5 @@
         'regdate' => '登录日期',
         'ipaddress' => 'IP地址',
     );
+	$lang->msg_not_allowed_outlink = 'It is not allowed to download files not from this site.'; 
 ?>
diff --git a/modules/file/lang/zh-TW.lang.php b/modules/file/lang/zh-TW.lang.php
index 3ee55c732..70c54c28d 100644
--- a/modules/file/lang/zh-TW.lang.php
+++ b/modules/file/lang/zh-TW.lang.php
@@ -51,4 +51,5 @@
         'regdate' => '登錄日期',
         'ipaddress' => 'IP位址',
     );
+	$lang->msg_not_allowed_outlink = 'It is not allowed to download files not from this site.'; 
 ?>