From 77122a32b244ebf7d8ad14d001bd05a4a6a83f91 Mon Sep 17 00:00:00 2001
From: conory <conorycom@gmail.com>
Date: Wed, 9 Oct 2019 23:28:23 +0900
Subject: [PATCH] =?UTF-8?q?is=5Fcommand()=20=EB=8C=80=EC=B2=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/framework/storage.php     | 12 ++++++++++++
 common/functions.php             | 19 -------------------
 modules/file/file.admin.view.php |  2 +-
 modules/file/file.controller.php |  4 ++--
 modules/file/file.model.php      |  4 ++--
 modules/file/file.view.php       |  2 +-
 6 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/common/framework/storage.php b/common/framework/storage.php
index 2d4a97fbd..5ececc063 100644
--- a/common/framework/storage.php
+++ b/common/framework/storage.php
@@ -143,6 +143,18 @@ class Storage
 		return @self::exists($path) && @is_writable($path);
 	}
 	
+	/**
+	 * Check if the given path is executable.
+	 * 
+	 * @param string $path
+	 * @return bool
+	 */
+	public static function isExecutable($path)
+	{
+		$path = rtrim($path, '/\\');
+		return @self::exists($path) && @is_executable($path);
+	}
+	
 	/**
 	 * Get the size of a file.
 	 * 
diff --git a/common/functions.php b/common/functions.php
index 36e4754c3..0e14e729d 100644
--- a/common/functions.php
+++ b/common/functions.php
@@ -691,23 +691,4 @@ function is_empty_html_content($str)
 	$str = strip_tags($str, '<img><audio><video><iframe><object><embed>');
 	$str = utf8_trim(utf8_clean(html_entity_decode($str, ENT_QUOTES, 'UTF-8')));
 	return $str === '';
-}
-
-/**
- * Check if a external program can be executed.
- * 
- * @param string $command
- * @return bool
- */
-function is_command($command)
-{
-	if ($command && function_exists('exec'))
-	{
-		@exec('ls ' . escapeshellarg($command), $output, $return_var);
-		return $return_var === 0;
-	}
-	else
-	{
-		return false;
-	}
 }
\ No newline at end of file
diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php
index ba9719684..818dbf3cf 100644
--- a/modules/file/file.admin.view.php
+++ b/modules/file/file.admin.view.php
@@ -219,7 +219,7 @@ class fileAdminView extends file
 		$oFileModel = getModel('file');
 		$config = $oFileModel->getFileConfig();
 		Context::set('config', $config);
-		Context::set('is_ffmpeg', is_command($config->ffmpeg_command) && is_command($config->ffprobe_command));
+		Context::set('is_ffmpeg', function_exists('exec') && Rhymix\Framework\Storage::isExecutable($config->ffmpeg_command) && Rhymix\Framework\Storage::isExecutable($config->ffprobe_command));
 		
 		// Set a template file
 		$this->setTemplatePath($this->module_path.'tpl');
diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
index bddffb497..80e803a2b 100644
--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@@ -1102,7 +1102,7 @@ class fileController extends file
 		$is_animated = Rhymix\Framework\Image::isAnimatedGIF($file_info['tmp_name']);
 		
 		// Adjust image type
-		if ($config->image_autoconv['gif2mp4'] && $is_animated && is_command($config->ffmpeg_command))
+		if ($config->image_autoconv['gif2mp4'] && $is_animated && function_exists('exec') && Rhymix\Framework\Storage::isExecutable($config->ffmpeg_command))
 		{
 			$adjusted['type'] = 'mp4';
 		}
@@ -1267,7 +1267,7 @@ class fileController extends file
 	 */
 	public function adjustUploadedVideo($file_info, $config)
 	{
-		if (!is_command($config->ffmpeg_command) || !is_command($config->ffprobe_command))
+		if (!function_exists('exec') || !Rhymix\Framework\Storage::isExecutable($config->ffmpeg_command) || !Rhymix\Framework\Storage::isExecutable($config->ffprobe_command))
 		{
 			return $file_info;
 		}
diff --git a/modules/file/file.model.php b/modules/file/file.model.php
index a214626a9..d5c5c6455 100644
--- a/modules/file/file.model.php
+++ b/modules/file/file.model.php
@@ -83,10 +83,10 @@ class fileModel extends file
 				$obj->file_srl = $file_info->file_srl;
 				$obj->source_filename = $file_info->source_filename;
 				$obj->thumbnail_filename = $file_info->thumbnail_filename;
-				$obj->type = $file_info->type;
-				$obj->original_type = $file_info->original_type;
 				$obj->file_size = $file_info->file_size;
 				$obj->disp_file_size = FileHandler::filesize($file_info->file_size);
+				$obj->mime_type = $file_info->mime_type;
+				$obj->original_type = $file_info->original_type;
 				$obj->direct_download = $file_info->direct_download;
 				$obj->cover_image = ($file_info->cover_image === 'Y') ? true : false;
 				$obj->download_url = $file_info->download_url;
diff --git a/modules/file/file.view.php b/modules/file/file.view.php
index cc2d66703..3a6a9873c 100644
--- a/modules/file/file.view.php
+++ b/modules/file/file.view.php
@@ -38,7 +38,7 @@ class fileView extends file
 		$oFileModel = getModel('file');
 		$config = $oFileModel->getFileConfig($current_module_srl);
 		Context::set('config', $config);
-		Context::set('is_ffmpeg', is_command($config->ffmpeg_command) && is_command($config->ffprobe_command));
+		Context::set('is_ffmpeg', function_exists('exec') && Rhymix\Framework\Storage::isExecutable($config->ffmpeg_command) && Rhymix\Framework\Storage::isExecutable($config->ffprobe_command));
 		
 		// Get a permission for group setting
 		$oMemberModel = getModel('member');