From 765889f67fc462592c1e2960c265951f41b4fa00 Mon Sep 17 00:00:00 2001 From: thisgun Date: Thu, 19 Nov 2020 11:42:55 +0900 Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=95=84=EC=9D=B4=EC=BD=98?= =?UTF-8?q?=20url=EC=97=90=20=ED=8C=8C=EC=9D=BC=EC=88=98=EC=A0=95=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=20=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=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 --- adm/member_form.php | 6 +++--- bbs/register_form.php | 6 ++++-- extend/default.config.php | 2 ++ lib/common.lib.php | 6 +++++- skin/member/basic/register_form.skin.php | 4 ++-- skin/member/basic/style.css | 1 + theme/basic/skin/member/basic/register_form.skin.php | 4 ++-- theme/basic/skin/member/basic/style.css | 1 + 8 files changed, 20 insertions(+), 10 deletions(-) diff --git a/adm/member_form.php b/adm/member_form.php index 2b95e6581..a5b249d35 100644 --- a/adm/member_form.php +++ b/adm/member_form.php @@ -243,7 +243,8 @@ add_javascript(G5_POSTCODE_JS, 0); //다음 주소 js $icon_file = G5_DATA_PATH.'/member/'.$mb_dir.'/'.get_mb_icon_name($mb['mb_id']).'.gif'; if (file_exists($icon_file)) { $icon_url = str_replace(G5_DATA_PATH, G5_DATA_URL, $icon_file); - echo ''; + $icon_filemtile = (defined('G5_USE_MEMBER_IMAGE_FILETIME') && G5_USE_MEMBER_IMAGE_FILETIME) ? '?'.filemtime($icon_file) : ''; + echo ''; echo '삭제'; } ?> @@ -258,8 +259,7 @@ add_javascript(G5_POSTCODE_JS, 0); //다음 주소 js $mb_dir = substr($mb['mb_id'],0,2); $icon_file = G5_DATA_PATH.'/member_image/'.$mb_dir.'/'.get_mb_icon_name($mb['mb_id']).'.gif'; if (file_exists($icon_file)) { - $icon_url = str_replace(G5_DATA_PATH, G5_DATA_URL, $icon_file); - echo ''; + echo get_member_profile_img($mb['mb_id']); echo '삭제'; } ?> diff --git a/bbs/register_form.php b/bbs/register_form.php index d72804dd2..321e4dea8 100644 --- a/bbs/register_form.php +++ b/bbs/register_form.php @@ -131,11 +131,13 @@ include_once('./_head.php'); // 회원아이콘 경로 $mb_icon_path = G5_DATA_PATH.'/member/'.substr($member['mb_id'],0,2).'/'.get_mb_icon_name($member['mb_id']).'.gif'; -$mb_icon_url = G5_DATA_URL.'/member/'.substr($member['mb_id'],0,2).'/'.get_mb_icon_name($member['mb_id']).'.gif'; +$mb_icon_filemtile = (defined('G5_USE_MEMBER_IMAGE_FILETIME') && G5_USE_MEMBER_IMAGE_FILETIME && file_exists($mb_icon_path)) ? '?'.filemtime($mb_icon_path) : ''; +$mb_icon_url = G5_DATA_URL.'/member/'.substr($member['mb_id'],0,2).'/'.get_mb_icon_name($member['mb_id']).'.gif'.$mb_icon_filemtile; // 회원이미지 경로 $mb_img_path = G5_DATA_PATH.'/member_image/'.substr($member['mb_id'],0,2).'/'.get_mb_icon_name($member['mb_id']).'.gif'; -$mb_img_url = G5_DATA_URL.'/member_image/'.substr($member['mb_id'],0,2).'/'.get_mb_icon_name($member['mb_id']).'.gif'; +$mb_img_filemtile = (defined('G5_USE_MEMBER_IMAGE_FILETIME') && G5_USE_MEMBER_IMAGE_FILETIME && file_exists($mb_img_path)) ? '?'.filemtime($mb_img_path) : ''; +$mb_img_url = G5_DATA_URL.'/member_image/'.substr($member['mb_id'],0,2).'/'.get_mb_icon_name($member['mb_id']).'.gif'.$mb_img_filemtile; $register_action_url = G5_HTTPS_BBS_URL.'/register_form_update.php'; $req_nick = !isset($member['mb_nick_date']) || (isset($member['mb_nick_date']) && $member['mb_nick_date'] <= date("Y-m-d", G5_SERVER_TIME - ($config['cf_nick_modify'] * 86400))); diff --git a/extend/default.config.php b/extend/default.config.php index 4a134a7a8..d655b148a 100644 --- a/extend/default.config.php +++ b/extend/default.config.php @@ -4,6 +4,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 // 유저 사이드뷰에서 아이콘 지정 안했을시 기본 no 프로필 이미지 define('G5_NO_PROFILE_IMG', 'no_profile'); +define('G5_USE_MEMBER_IMAGE_FILETIME', TRUE); + // 썸네일 처리 방식, 비율유지 하지 않고 썸네일을 생성하려면 주석을 풀고 값은 false 입력합니다. ( true 또는 주석으로 된 경우에는 비율 유지합니다. ) //define('G5_USE_THUMB_RATIO', false); ?> \ No newline at end of file diff --git a/lib/common.lib.php b/lib/common.lib.php index 77a4fa45f..5a6629d61 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1313,9 +1313,10 @@ function get_sideview($mb_id, $name='', $email='', $homepage='') $icon_file = G5_DATA_PATH.'/member/'.$mb_dir.'/'.get_mb_icon_name($mb_id).'.gif'; if (file_exists($icon_file)) { + $icon_filemtile = (defined('G5_USE_MEMBER_IMAGE_FILETIME') && G5_USE_MEMBER_IMAGE_FILETIME) ? '?'.filemtime($icon_file) : ''; $width = $config['cf_member_icon_width']; $height = $config['cf_member_icon_height']; - $icon_file_url = G5_DATA_URL.'/member/'.$mb_dir.'/'.get_mb_icon_name($mb_id).'.gif'; + $icon_file_url = G5_DATA_URL.'/member/'.$mb_dir.'/'.get_mb_icon_name($mb_id).'.gif'.$icon_filemtile; $tmp_name .= ''; if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름 @@ -3611,6 +3612,9 @@ function get_member_profile_img($mb_id='', $width='', $height='', $alt='profile_ } else { $member_img = G5_DATA_PATH.'/member_image/'.substr($mb_id,0,2).'/'.get_mb_icon_name($mb_id).'.gif'; if (is_file($member_img)) { + if(defined('G5_USE_MEMBER_IMAGE_FILETIME') && G5_USE_MEMBER_IMAGE_FILETIME) { + $member_img .= '?'.filemtime($member_img); + } $member_cache[$mb_id] = $src = str_replace(G5_DATA_PATH, G5_DATA_URL, $member_img); } } diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php index 72b2596e6..e2dc5fd5b 100644 --- a/skin/member/basic/register_form.skin.php +++ b/skin/member/basic/register_form.skin.php @@ -189,7 +189,7 @@ gif, jpg, png파일만 가능하며 용량 회원아이콘 - + @@ -208,7 +208,7 @@ gif, jpg, png파일만 가능하며 용량 회원이미지 - + diff --git a/skin/member/basic/style.css b/skin/member/basic/style.css index efc404d34..97c3ff395 100644 --- a/skin/member/basic/style.css +++ b/skin/member/basic/style.css @@ -131,6 +131,7 @@ .register_form_inner {background:#f7f7f7;border:1px solid #dde7e9;border-radius:3px} .register_form_inner ul {padding:20px} .register_form_inner label {display:block;margin-bottom:10px;line-height:24px} +.register_form_inner label.inline {display:inline} #fregisterform #msg_certify {margin:5px 0 0;padding:5px;border:1px solid #dbecff;background:#eaf4ff;text-align:center} #fregisterform .frm_address {margin:5px 0 0} diff --git a/theme/basic/skin/member/basic/register_form.skin.php b/theme/basic/skin/member/basic/register_form.skin.php index cbd17aed0..d60d8c8f7 100644 --- a/theme/basic/skin/member/basic/register_form.skin.php +++ b/theme/basic/skin/member/basic/register_form.skin.php @@ -188,7 +188,7 @@ gif, jpg, png파일만 가능하며 용량 회원아이콘 - + @@ -207,7 +207,7 @@ gif, jpg, png파일만 가능하며 용량 회원이미지 - + diff --git a/theme/basic/skin/member/basic/style.css b/theme/basic/skin/member/basic/style.css index e297c9b96..3574d7009 100644 --- a/theme/basic/skin/member/basic/style.css +++ b/theme/basic/skin/member/basic/style.css @@ -131,6 +131,7 @@ .register_form_inner {background:#f7f7f7;border:1px solid #dde7e9;border-radius:3px} .register_form_inner ul {padding:20px} .register_form_inner label {display:block;margin-bottom:10px;line-height:24px} +.register_form_inner label.inline {display:inline} #fregisterform #msg_certify {margin:5px 0 0;padding:5px;border:1px solid #dbecff;background:#eaf4ff;text-align:center} #fregisterform .frm_address {margin:5px 0 0}