From 081578ef8e4462ba84f42a241b978a442c7b785e Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 13 Sep 2017 00:30:28 +0900
Subject: [PATCH] Clean up file module configuration

---
 modules/file/file.admin.controller.php | 32 +++++++++++++++-----------
 modules/file/file.admin.view.php       |  5 +---
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/modules/file/file.admin.controller.php b/modules/file/file.admin.controller.php
index 942f19492..f6f690c13 100644
--- a/modules/file/file.admin.controller.php
+++ b/modules/file/file.admin.controller.php
@@ -99,6 +99,16 @@ class fileAdminController extends file
 		$config->allow_outlink = Context::get('allow_outlink');
 		$config->allow_outlink_format = Context::get('allow_outlink_format');
 		$config->allow_outlink_site = Context::get('allow_outlink_site');
+		
+		// Check maximum file size
+		if (PHP_INT_SIZE < 8)
+		{
+			if ($config->allowed_filesize > 2047 || $config->allowed_attach_size > 2047)
+			{
+				return new Object(-1, 'msg_32bit_max_2047mb');
+			}
+		}
+		
 		// Create module Controller object
 		$oModuleController = getController('module');
 		$output = $oModuleController->insertModuleConfig('file',$config);
@@ -130,20 +140,16 @@ class fileAdminController extends file
 		$file_config->allowed_attach_size = Context::get('allowed_attach_size');
 		$file_config->allowed_filetypes = str_replace(' ', '', Context::get('allowed_filetypes'));
 
-		if(!is_array($download_grant)) $file_config->download_grant = explode('|@|',$download_grant);
-		else $file_config->download_grant = $download_grant;
+		if(!is_array($download_grant))
+		{
+			$file_config->download_grant = explode('|@|',$download_grant);
+		}
+		else
+		{
+			$file_config->download_grant = array_values($download_grant);
+		}
 
-		//관리자가 허용한 첨부파일의 사이즈가 php.ini의 값보다 큰지 확인하기 - by ovclas
-		/*
-		$userFileAllowSize = FileHandler::returnbytes($file_config->allowed_filesize.'M');
-		$userAttachAllowSize = FileHandler::returnbytes($file_config->allowed_attach_size.'M');
-		$iniPostMaxSize = FileHandler::returnbytes(ini_get('post_max_size'));
-		$iniUploadMaxSize = FileHandler::returnbytes(ini_get('upload_max_filesize'));
-		$iniMinSzie = min($iniPostMaxSize, $iniUploadMaxSize);
-
-		if($userFileAllowSize > $iniMinSzie || $userAttachAllowSize > $iniMinSzie)
-			return new Object(-1, 'input size over than config in php.ini');
-		*/
+		// Check maximum file size
 		if (PHP_INT_SIZE < 8)
 		{
 			if ($file_config->allowed_filesize > 2047 || $file_config->allowed_attach_size > 2047)
diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php
index 0b2ca7bc1..8ae9804b0 100644
--- a/modules/file/file.admin.view.php
+++ b/modules/file/file.admin.view.php
@@ -219,10 +219,7 @@ class fileAdminView extends file
 		$oFileModel = getModel('file');
 		$config = $oFileModel->getFileConfig();
 		Context::set('config',$config);
-		$iniPostMaxSize = FileHandler::returnbytes(ini_get('post_max_size'));
-		$iniUploadMaxSize = FileHandler::returnbytes(ini_get('upload_max_filesize'));
-		$iniMinSize = min($iniPostMaxSize, $iniUploadMaxSize);
-		Context::set('upload_max_filesize', FileHandler::filesize($iniMinSize));
+		
 		// Set a template file
 		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('adminConfig');