From 0541ec994715e293df61a464ded6a8bc9dc79a90 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 27 Feb 2014 11:03:15 +0900 Subject: [PATCH 1/4] =?UTF-8?q?gitignore=EC=97=90=20ckeditor43=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 --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8b781d5d7..df481935e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ test.php *.key *.sh cheditor5/ +ckeditor43/ From 07176252c821eaf3a064b2a934c94f731cad24ec Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 27 Feb 2014 14:32:51 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EA=B3=B5=EC=A7=80=EA=B0=80=20=EC=9E=88?= =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EA=B8=80?= =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/list.php | 76 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 29 deletions(-) diff --git a/bbs/list.php b/bbs/list.php index 90c946368..c0301b410 100644 --- a/bbs/list.php +++ b/bbs/list.php @@ -61,10 +61,47 @@ if(G5_IS_MOBILE) { $page_rows = $board['bo_page_rows']; } +if ($page < 1) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지) + +// 년도 2자리 +$today2 = G5_TIME_YMD; + +$list = array(); +$i = 0; +$notice_count = 0; +$notice_array = array(); + +// 공지 처리 +if (!$sca && !$stx) { + $arr_notice = explode(',', trim($board['bo_notice'])); + for ($k=0; $k 1 && $notice_count) + $from_record -= $notice_count; + +if($page == 1 && $notice_count) + $page_rows -= $notice_count; + // 관리자라면 CheckBox 보임 $is_checkbox = false; if ($is_member && ($is_admin == 'super' || $group['gr_admin'] == $member['mb_id'] || $board['bo_admin'] == $member['mb_id'])) @@ -85,7 +122,7 @@ if (!$sst) { $sst = $board['bo_sort_field']; } else { $sst = "wr_num, wr_reply"; - $sod = ""; + $sod = ""; } } else { // 게시물 리스트의 정렬 대상 필드가 아니라면 공백으로 (nasca 님 09.06.16) @@ -101,39 +138,17 @@ if ($sst) { if ($sca || $stx) { $sql = " select distinct wr_parent from {$write_table} where {$sql_search} {$sql_order} limit {$from_record}, $page_rows "; } else { - $sql = " select * from {$write_table} where wr_is_comment = 0 {$sql_order} limit {$from_record}, $page_rows "; + $sql = " select * from {$write_table} where wr_is_comment = 0 "; + if($notice_count && !empty($notice_array)) + $sql .= " and wr_id not in (".implode(', ', $notice_array).") "; + $sql .= " {$sql_order} limit {$from_record}, $page_rows "; } $result = sql_query($sql); -// 년도 2자리 -$today2 = G5_TIME_YMD; - -$list = array(); -$i = 0; - -if (!$sca && !$stx) { - $arr_notice = explode(',', trim($board['bo_notice'])); - for ($k=0; $k Date: Fri, 28 Feb 2014 09:41:20 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=B2=B4=ED=81=AC=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/thumbnail.lib.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index fcc9b7cc3..f8db59dd8 100644 --- a/lib/thumbnail.lib.php +++ b/lib/thumbnail.lib.php @@ -29,14 +29,11 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_ { // 이미지 path 구함 $p = parse_url($matches[1][$i]); - if(strpos($p['path'], "/data/") != 0) - $data_path = preg_replace("/^\/.*\/data/", "/data", $p['path']); + if(strpos($p['path'], '/'.G5_DATA_DIR.'/') != 0) + $data_path = preg_replace('/^\/.*\/'.G5_DATA_DIR.'/', '/'.G5_DATA_DIR, $p['path']); else $data_path = $p['path']; - if(!preg_match('/^\/'.G5_DATA_DIR.'/', $data_path)) - continue; - $srcfile = G5_PATH.$data_path; if(preg_match("/\.({$config['cf_image_extension']})$/i", $srcfile) && is_file($srcfile)) { @@ -105,14 +102,11 @@ function get_view_thumbnail($contents, $thumb_width=0) // 이미지 path 구함 $p = parse_url($src); - if(strpos($p['path'], "/data/") != 0) - $data_path = preg_replace("/^\/.*\/data/", "/data", $p['path']); + if(strpos($p['path'], '/'.G5_DATA_DIR.'/') != 0) + $data_path = preg_replace('/^\/.*\/'.G5_DATA_DIR.'/', '/'.G5_DATA_DIR, $p['path']); else $data_path = $p['path']; - if(!preg_match('/^\/'.G5_DATA_DIR.'/', $data_path)) - continue; - $srcfile = G5_PATH.$data_path; if(is_file($srcfile)) { From f6df7c905b108c5e9084adc58444706b6dd8c853 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 28 Feb 2014 16:17:25 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EA=B0=80=EC=9E=85=20=EC=B7=A8=EC=86=8C=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EB=A7=81=ED=81=AC=20=EC=98=A4=EB=A5=98=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 --- mobile/skin/member/basic/register_form.skin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/skin/member/basic/register_form.skin.php b/mobile/skin/member/basic/register_form.skin.php index 9e54d6c8d..06c176d31 100644 --- a/mobile/skin/member/basic/register_form.skin.php +++ b/mobile/skin/member/basic/register_form.skin.php @@ -254,7 +254,7 @@ add_stylesheet('',
- 취소 + 취소