From 22ef43f51313b8a013c418add3eb2b5cdafa4fe9 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 18 Jan 2013 12:59:45 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=EA=B2=80=EC=83=89=EA=B2=B0=EA=B3=BC=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 8 ++++---- lib/common.lib.php | 2 +- skin/search/neo/search.skin.php | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/css/default.css b/css/default.css index e979e8bfc..e0d8a4369 100644 --- a/css/default.css +++ b/css/default.css @@ -294,10 +294,10 @@ a {color:#000;text-decoration:none} #sch_result_bo .cnt_cmt {color:#000} #sch_result_atc dt a {display:inline-block;margin-bottom:15px;font-size:1.2em;font-weight:bold} #sch_result_atc dd {margin:0 0 30px;border-bottom:1px solid #ddd} -#sch_result_atc li {padding:10px 0} -#sch_result_atc p {margin-top:10px} -#sch_result_atc b {display:inline-block;margin:0 10px 0 0} -#sch_result_atc b span {display:inline-block;margin:0 10px 0 0} +#sch_result_atc li {padding:13px 0;border-bottom:1px solid #f0f0f0} +#sch_result_atc p {padding:5px 0} +#sch_result_atc a {display:inline-block;margin:0 10px 0 0} +#sch_result_atc .cmt_def {display:inline-block;margin:0 10px 0 0} .sch_more {padding:10px 0 15px;text-align:right} .sch_more a {color:#818385} .sch_sideview {display:inline-block} diff --git a/lib/common.lib.php b/lib/common.lib.php index 561e54d38..45c6f9dc5 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -453,7 +453,7 @@ function search_font($stx, $str) } // 지정된 검색 폰트의 색상, 배경색상으로 대체 - $replace = "\\1"; + $replace = "\\1"; return preg_replace("/($pattern)/i", $replace, $str); } diff --git a/skin/search/neo/search.skin.php b/skin/search/neo/search.skin.php index 6e2668049..125e96140 100644 --- a/skin/search/neo/search.skin.php +++ b/skin/search/neo/search.skin.php @@ -109,12 +109,12 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 for ($i=0; $i댓글"; $comment_href = "#c_".$list[$idx][$i][wr_id]; } ?>
  • - + 새창

    From 8585d7a90ea70eb9539c5e6827efd16c52cb517d Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 18 Jan 2013 14:31:57 +0900 Subject: [PATCH 2/6] =?UTF-8?q?cut=5Fstr=20=ED=95=A8=EC=88=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 --- lib/common.lib.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index 625813969..f41fdcd00 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1071,6 +1071,7 @@ function cut_str($str, $len, $suffix="…") global $g4; if (strtoupper($g4['charset']) == 'UTF-8') { + /* if (strlen($str) >= $len) { //echo $str,', ',strlen($str),', ',$len; $c = substr(str_pad(decbin(ord($str[$len-1])),8,'0',STR_PAD_LEFT),0,2); @@ -1080,6 +1081,17 @@ function cut_str($str, $len, $suffix="…") } else { return $str; } + */ + if (strlen($str) >= $len) { + $length = floor($len / 3); + + $arr_str = array_slice(preg_split("//u", $str, -1, PREG_SPLIT_NO_EMPTY), 0, $length); + $string = join("", $arr_str); + + return $string . (strlen($str)-strlen($suffix) >= $len ? $suffix : ''); + } else { + return $str; + } } else { $s = substr($str, 0, $len); $cnt = 0; @@ -1671,7 +1683,7 @@ function skin_path() } -function is_mobile() +function is_mobile() { return preg_match('/'.G4_MOBILE_AGENT.'/i', $_SERVER['HTTP_USER_AGENT']); } From d70ef99f04418f824c0f259169210131e5b26fd0 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 18 Jan 2013 15:04:17 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20#152=20?= =?UTF-8?q?=EC=9D=98=20=EC=98=A8=EB=9D=BC=EC=9D=B8=EC=84=9C=EC=8B=9D?= =?UTF-8?q?=ED=95=84=EC=88=98=EC=9E=85=EB=A0=A5=EC=B2=98=EB=A6=AC=201,2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/member/neo/memo_form.skin.php | 2 +- skin/member/neo/register_form.skin.php | 25 ++++++++++++++----------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/skin/member/neo/memo_form.skin.php b/skin/member/neo/memo_form.skin.php index 8005addcd..3d76e8bf3 100644 --- a/skin/member/neo/memo_form.skin.php +++ b/skin/member/neo/memo_form.skin.php @@ -16,7 +16,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 쪽지쓰기 - + 여러 회원에게 보낼때는 컴마(,)로 구분하세요. diff --git a/skin/member/neo/register_form.skin.php b/skin/member/neo/register_form.skin.php index 23ff99088..fde11461a 100644 --- a/skin/member/neo/register_form.skin.php +++ b/skin/member/neo/register_form.skin.php @@ -19,7 +19,7 @@ var member_skin_path = ""; - + - + - +
    사이트 이용정보 입력
    title="회원아이디"> @@ -27,11 +27,11 @@ var member_skin_path = "";
    title="패스워드">
    title="패스워드 확인">
    @@ -39,7 +39,7 @@ var member_skin_path = ""; - + - + - + - + - + - + @@ -100,7 +100,10 @@ var member_skin_path = ""; $zip_href = './zip.php?frm_name=fregisterform&frm_zip1=mb_zip1&frm_zip2=mb_zip2&frm_addr1=mb_addr1&frm_addr2=mb_addr2'; ?> - + - + From 3e84a3d1f11ef6149f281c3708bdc31db720de04 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 18 Jan 2013 15:07:12 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EC=9E=90=EA=B8=B0=EC=86=8C=EA=B0=9C=EC=8A=A4=ED=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index e0d8a4369..0786cf564 100644 --- a/css/default.css +++ b/css/default.css @@ -488,7 +488,8 @@ a {color:#000;text-decoration:none} /* 자기소개 */ #profile table {margin-bottom:15px} #profile section {margin:0 auto 20px;width:90%;border-bottom:1px solid #d9d9d9} -#profile h2 {margin:0;font-family:"gulim"} +#profile h2 {margin:0;padding-left:10px;font-family:"gulim"} +#profile p {padding-left:10px} /* 쪽지 읽기 */ #memo_view section {margin:0 auto 20px;width:90%;border-bottom:1px solid #d9d9d9} From d8f2a32ad143a0ea5417d1c56a526cc7aea24ae6 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 18 Jan 2013 15:11:12 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=EB=93=9C=EB=B7=B0=20=EC=9C=84=EC=B9=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 --- css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index 0786cf564..40386acbd 100644 --- a/css/default.css +++ b/css/default.css @@ -263,7 +263,7 @@ a {color:#000;text-decoration:none} .td_nick {width:120px;text-align:center} .td_name {width:120px;text-align:left} .td_name div {position:relative} -#sideview {z-index:1000;position:absolute;top:15px;left:0;border:1px solid #999;background:#f9f9f9} +#sideview {z-index:1000;position:absolute;top:15px;left:20px;border:1px solid #999;background:#f9f9f9} #sideview ul {list-style:none} #sideview a {display:inline-block;padding:5px 10px 4px;width:100px;border-bottom:1px solid #ddd} .td_date {width:60px;text-align:center} From 955ba6c464a568e533c3ca8d7c062282e83e535f Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 18 Jan 2013 15:14:04 +0900 Subject: [PATCH 6/6] =?UTF-8?q?cut=5Fstr=20=ED=95=A8=EC=88=98=20utf-8=20?= =?UTF-8?q?=EC=A0=84=EC=9A=A9=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index f41fdcd00..58b6657b4 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1064,44 +1064,17 @@ function view_link($view, $number, $attribute) */ -// 한글 한글자(2byte, 유니코드 3byte)는 길이 2, 공란.영숫자.특수문자는 길이 1 -// 유니코드는 http://g4uni.winnwe.net/bbs/board.php?bo_table=g4uni_faq&wr_id=7 의 Mr.Learn님의 글을 참고하였습니다. function cut_str($str, $len, $suffix="…") { - global $g4; + if (strlen($str) >= $len) { + $length = floor($len / 3); - if (strtoupper($g4['charset']) == 'UTF-8') { - /* - if (strlen($str) >= $len) { - //echo $str,', ',strlen($str),', ',$len; - $c = substr(str_pad(decbin(ord($str[$len-1])),8,'0',STR_PAD_LEFT),0,2); - if ($c == '10') - for (;$c != '11' && $c{0} == 1;$c = substr(str_pad(decbin(ord($str{--$len})),8,'0',STR_PAD_LEFT),0,2)); - return substr($str,0,$len) . (strlen($str)-strlen($suffix) >= $len ? $suffix : ''); - } else { - return $str; - } - */ - if (strlen($str) >= $len) { - $length = floor($len / 3); + $arr_str = array_slice(preg_split("//u", $str, -1, PREG_SPLIT_NO_EMPTY), 0, $length); + $string = join("", $arr_str); - $arr_str = array_slice(preg_split("//u", $str, -1, PREG_SPLIT_NO_EMPTY), 0, $length); - $string = join("", $arr_str); - - return $string . (strlen($str)-strlen($suffix) >= $len ? $suffix : ''); - } else { - return $str; - } + return $string . (strlen($str)-strlen($suffix) >= $len ? $suffix : ''); } else { - $s = substr($str, 0, $len); - $cnt = 0; - for ($i=0; $i 127) - $cnt++; - $s = substr($s, 0, $len - ($cnt % 2)); - if (strlen($s) >= strlen($str)) - $suffix = ""; - return $s . $suffix; + return $str; } }
    개인정보 입력
    title="이름"> 공백없이 한글만 입력하세요."; } ?> @@ -47,7 +47,7 @@ var member_skin_path = "";
    @@ -61,7 +61,7 @@ var member_skin_path = "";
    " maxlength="100" size="50" value='' title="E-mail"> @@ -77,21 +77,21 @@ var member_skin_path = "";
    " maxlength="255" value="">
    " maxlength="20" value="">
    " maxlength="20" value="">
    주소 + 주소 + 필수 + " size="2" maxlength="3" value="" title="우편번호 앞자리"> - @@ -117,7 +120,7 @@ var member_skin_path = "";
    기타 개인설정