From ee35ce983917c058ad40c1976012c736210158c1 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 3 May 2016 16:53:52 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=97=85=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20=EA=B0=9C=EC=88=98=20=EC=B2=B4=ED=81=AC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/write.php | 2 ++ bbs/write_update.php | 18 ++++++++++++++++++ mobile/skin/board/basic/write.skin.php | 2 +- mobile/skin/board/gallery/write.skin.php | 2 +- skin/board/basic/write.skin.php | 2 +- skin/board/gallery/write.skin.php | 2 +- .../mobile/skin/board/basic/write.skin.php | 2 +- .../mobile/skin/board/gallery/write.skin.php | 2 +- theme/basic/skin/board/basic/write.skin.php | 2 +- theme/basic/skin/board/gallery/write.skin.php | 2 +- 10 files changed, 28 insertions(+), 8 deletions(-) diff --git a/bbs/write.php b/bbs/write.php index ad0ce86c2..8ca1120c7 100644 --- a/bbs/write.php +++ b/bbs/write.php @@ -304,6 +304,7 @@ $secret_checked = ""; if ($w == '') { $password_required = 'required'; + $file = array('count'=>$file_count); } else if ($w == 'u') { $password_required = ''; @@ -348,6 +349,7 @@ if ($w == '') { for ($i=1; $i<=G5_LINK_COUNT; $i++) { $write['wr_link'.$i] = get_text($write['wr_link'.$i]); } + $file = array('count'=>$file_count); } set_session('ss_bo_table', $_REQUEST['bo_table']); diff --git a/bbs/write_update.php b/bbs/write_update.php index 7b57aa085..878616c3e 100644 --- a/bbs/write_update.php +++ b/bbs/write_update.php @@ -410,6 +410,24 @@ if (!$group['gr_use_access'] && $board['bo_read_level'] < 2 && !$secret) { naver_syndi_ping($bo_table, $wr_id); } +// 파일개수 체크 +$file_count = 0; +$upload_count = count($_FILES['bf_file']['name']); + +for ($i=0; $i<$upload_count; $i++) { + if($_FILES['bf_file']['name'][$i] && is_uploaded_file($_FILES['bf_file']['tmp_name'][$i])) + $file_count++; +} + +if($w == 'u') { + $file = get_file($bo_table, $wr_id); + if($file_count && (int)$file['count'] > $board['bo_upload_count']) + alert('기존 파일을 삭제하신 후 첨부파일을 '.number_format($board['bo_upload_count']).'개 이하로 업로드 해주십시오.'); +} else { + if($file_count > $board['bo_upload_count']) + alert('첨부파일을 '.number_format($board['bo_upload_count']).'개 이하로 업로드 해주십시오.'); +} + // 디렉토리가 없다면 생성합니다. (퍼미션도 변경하구요.) @mkdir(G5_DATA_PATH.'/file/'.$bo_table, G5_DIR_PERMISSION); @chmod(G5_DATA_PATH.'/file/'.$bo_table, G5_DIR_PERMISSION); diff --git a/mobile/skin/board/basic/write.skin.php b/mobile/skin/board/basic/write.skin.php index 8d9076d2f..28c804213 100644 --- a/mobile/skin/board/basic/write.skin.php +++ b/mobile/skin/board/basic/write.skin.php @@ -129,7 +129,7 @@ add_stylesheet('', 0 - + 파일 # diff --git a/mobile/skin/board/gallery/write.skin.php b/mobile/skin/board/gallery/write.skin.php index 4aec1baaf..4ff2536ee 100644 --- a/mobile/skin/board/gallery/write.skin.php +++ b/mobile/skin/board/gallery/write.skin.php @@ -128,7 +128,7 @@ add_stylesheet('', 0 - + 파일 # diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php index 34d190e7e..bf5ab682f 100644 --- a/skin/board/basic/write.skin.php +++ b/skin/board/basic/write.skin.php @@ -146,7 +146,7 @@ add_stylesheet('', 0 - + 파일 # diff --git a/skin/board/gallery/write.skin.php b/skin/board/gallery/write.skin.php index e8bcf7bd6..6f49a1433 100644 --- a/skin/board/gallery/write.skin.php +++ b/skin/board/gallery/write.skin.php @@ -146,7 +146,7 @@ add_stylesheet('', 0 - + 파일 # diff --git a/theme/basic/mobile/skin/board/basic/write.skin.php b/theme/basic/mobile/skin/board/basic/write.skin.php index aa5f5b4ad..1226bd841 100644 --- a/theme/basic/mobile/skin/board/basic/write.skin.php +++ b/theme/basic/mobile/skin/board/basic/write.skin.php @@ -129,7 +129,7 @@ add_stylesheet('', 0 - + 파일 # diff --git a/theme/basic/mobile/skin/board/gallery/write.skin.php b/theme/basic/mobile/skin/board/gallery/write.skin.php index 4aec1baaf..4ff2536ee 100644 --- a/theme/basic/mobile/skin/board/gallery/write.skin.php +++ b/theme/basic/mobile/skin/board/gallery/write.skin.php @@ -128,7 +128,7 @@ add_stylesheet('', 0 - + 파일 # diff --git a/theme/basic/skin/board/basic/write.skin.php b/theme/basic/skin/board/basic/write.skin.php index 34d190e7e..bf5ab682f 100644 --- a/theme/basic/skin/board/basic/write.skin.php +++ b/theme/basic/skin/board/basic/write.skin.php @@ -146,7 +146,7 @@ add_stylesheet('', 0 - + 파일 # diff --git a/theme/basic/skin/board/gallery/write.skin.php b/theme/basic/skin/board/gallery/write.skin.php index e8bcf7bd6..6f49a1433 100644 --- a/theme/basic/skin/board/gallery/write.skin.php +++ b/theme/basic/skin/board/gallery/write.skin.php @@ -146,7 +146,7 @@ add_stylesheet('', 0 - + 파일 # From b4a83c1969d074244375e6b5a5804dd26ec0894b Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 3 May 2016 17:31:10 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EC=B9=B4?= =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=B2=B4=ED=81=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/write_update.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bbs/write_update.php b/bbs/write_update.php index 878616c3e..b6db2e699 100644 --- a/bbs/write_update.php +++ b/bbs/write_update.php @@ -15,7 +15,12 @@ if($board['bo_use_category']) { $categories = array_map('trim', explode("|", $board['bo_category_list'].($is_admin ? '|공지' : ''))); if(!empty($categories) && !in_array($ca_name, $categories)) $msg[] = '분류를 올바르게 입력하세요.'; + + if(empty($categories)) + $ca_name = ''; } +} else { + $ca_name = ''; } $wr_subject = '';