From 473326d2d9a5033f238c0b0f105cfe0ded2521fe Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 20 Mar 2013 14:33:14 +0900 Subject: [PATCH 1/3] =?UTF-8?q?get=5Feditor=5Fimage=20=ED=95=A8=EC=88=98?= =?UTF-8?q?=20=EC=A0=95=EA=B7=9C=EC=8B=9D=20=ED=8C=A8=ED=84=B4=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index 2ed73f8f3..9b7fdae8a 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1763,7 +1763,7 @@ function get_editor_image($contents) return false; // $contents 중 img 태그 추출 - $pattern = "/]*src=[\'\"]?([^>\'\"]+".str_replace(".", "\.", $_SERVER['HTTP_HOST'])."[^>\'\"]+)[\'\"]?[^>]*>/"; + $pattern = "/]*src=[\'\"]?([^>\'\"]+[^>\'\"]+)[\'\"]?[^>]*>/"; preg_match_all($pattern, $contents, $matchs); return $matchs; From ae37d9aa3124f056951a00c1b1f44ce7ec876740 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 20 Mar 2013 14:33:55 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=8D=B8=EB=84=A4=EC=9D=BC=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EC=BD=94=EB=93=9C=EC=97=90=EC=84=9C=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=20=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=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 --- lib/thumbnail.lib.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index d56497c6d..7fe5f7185 100644 --- a/lib/thumbnail.lib.php +++ b/lib/thumbnail.lib.php @@ -34,9 +34,11 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_ for($i=0; $i'.$thumb_tag.''; + $imgurl = str_replace(G4_URL, "", $matchs[1][$i]); + $thumb_tag = ''.$thumb_tag.''; } $contents = str_replace($img_tag, $thumb_tag, $contents); From b7ed5f489e6b70fcc528d101b96a695fd6e52c40 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 20 Mar 2013 15:09:08 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=EA=B6=8C=ED=95=9C=EC=97=86=EC=9D=84=20=EB=95=8C=20referer=20?= =?UTF-8?q?=EA=B0=92=EC=9D=B4=20=EC=97=86=EB=8A=94=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/download.php | 6 +++--- mobile/skin/board/basic/view.skin.php | 22 +++++++++++++++++----- mobile/skin/board/gallery/view.skin.php | 22 +++++++++++++++++----- skin/board/basic/view.skin.php | 21 +++++++++++++++++---- skin/board/gallery/view.skin.php | 22 +++++++++++++++++----- 5 files changed, 71 insertions(+), 22 deletions(-) diff --git a/bbs/download.php b/bbs/download.php index 6b59c5726..2fc09500f 100644 --- a/bbs/download.php +++ b/bbs/download.php @@ -16,9 +16,9 @@ if (!$file['bf_file']) alert_close('파일 정보가 존재하지 않습니다.'); // JavaScript 불가일 때 -if($confirm != 'yes' && $board['bo_download_point'] < 0) { +if($js != 'on' && $board['bo_download_point'] < 0) { $msg = $file['bf_source'].' 파일을 다운로드 하시면 포인트가 차감('.number_format($board['bo_download_point']).'점)됩니다.\\n포인트는 게시물당 한번만 차감되며 다음에 다시 다운로드 하셔도 중복하여 차감하지 않습니다.\\n그래도 다운로드 하시겠습니까?'; - $url1 = './download.php?'.$_SERVER['QUERY_STRING'].'&confirm=yes'; + $url1 = G4_BBS_URL.'/download.php?'.$_SERVER['QUERY_STRING'].'&js=on'; $url2 = $_SERVER['HTTP_REFERER']; //$url1 = 확인link, $url2=취소link @@ -54,7 +54,7 @@ if (!get_session($ss_name)) { // 다운로드 포인트가 음수이고 회원의 포인트가 0 이거나 작다면 if ($member['mb_point'] + $board['bo_download_point'] < 0) - alert('보유하신 포인트('.number_format($member['mb_point']).')가 없거나 모자라서 다운로드('.number_format($board['bo_download_point']).')가 불가합니다.'."\n\n".'포인트를 적립하신 후 다시 다운로드 해 주십시오.'); + alert('보유하신 포인트('.number_format($member['mb_point']).')가 없거나 모자라서 다운로드('.number_format($board['bo_download_point']).')가 불가합니다.\\n\\n포인트를 적립하신 후 다시 다운로드 해 주십시오.'); // 게시물당 한번만 차감하도록 수정 insert_point($member['mb_id'], $board['bo_download_point'], "{$board['bo_subject']} $wr_id 파일 다운로드", $bo_table, $wr_id, "다운로드"); diff --git a/mobile/skin/board/basic/view.skin.php b/mobile/skin/board/basic/view.skin.php index 2b70d4351..b44f08c6c 100644 --- a/mobile/skin/board/basic/view.skin.php +++ b/mobile/skin/board/basic/view.skin.php @@ -40,7 +40,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view']) { ?>
  • - + 첨부파일 () @@ -183,10 +183,22 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');