From c9ca182135fb5359eaec5e93a3ab923775ab6f2c Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 23 Nov 2013 12:14:40 +0900 Subject: [PATCH] =?UTF-8?q?#47=20=EC=B6=94=EA=B0=80=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/menu/menu.admin.controller.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index a12225cda..b31f604de 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -1365,13 +1365,13 @@ class menuAdminController extends menu if(!$menu_srl || !$menu_item_srl) { Context::set('error_messge', Context::getLang('msg_invalid_request')); - + } else if(!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)$/i',$target_file['name']) || !checkUploadedFile($target_file['tmp_name'])) { Context::set('error_messge', Context::getLang('msg_invalid_request')); } - + // Move the file to a specific director if the uploaded file meets requirement else { @@ -1565,6 +1565,8 @@ class menuAdminController extends menu continue; } + $htPerm[$grantName] = explode(',', $htPerm[$grantName]); + // users in a particular group if(is_array($htPerm[$grantName])) { @@ -1996,7 +1998,7 @@ class menuAdminController extends menu $ext = $tmp_arr[count($tmp_arr)-1]; $filename = sprintf('%s%d.%s.%s.%s', $path, $args->menu_item_srl, $date, 'menu_hover_btn', $ext); - + if(checkUploadedFile($args->menu_hover_btn['tmp_name'])) { move_uploaded_file($args->menu_hover_btn['tmp_name'], $filename); @@ -2011,13 +2013,13 @@ class menuAdminController extends menu $ext = $tmp_arr[count($tmp_arr)-1]; $filename = sprintf('%s%d.%s.%s.%s', $path, $args->menu_item_srl, $date, 'menu_active_btn', $ext); - + if(checkUploadedFile($args->menu_active_btn['tmp_name'])) { move_uploaded_file($args->menu_active_btn['tmp_name'], $filename); $returnArray['active_btn'] = $filename; } - + } return $returnArray; }