From f13edd77c96bfd50a9333fa37e11bcf32fcfc82b Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 14 Mar 2014 17:46:59 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EA=B2=80=EC=83=89?= =?UTF-8?q?=EB=95=8C=20=EC=A0=9C=EB=AA=A9=20=EC=B6=94=EA=B0=80=EB=90=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=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 --- adm/menu_form_search.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adm/menu_form_search.php b/adm/menu_form_search.php index b982fcdc4..faa4786bf 100644 --- a/adm/menu_form_search.php +++ b/adm/menu_form_search.php @@ -56,7 +56,7 @@ if($sql) { $link = G5_BBS_URL.'/content.php?co_id='.$row['id']; break; default: - $link = ''; + $link = ''; break; } ?> @@ -64,7 +64,7 @@ if($sql) { - "> + "> From 038ebeb0f8ee28f58703b4bad3dfbde02390a6c7 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 14 Mar 2014 17:57:17 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=EB=A9=94=EB=89=B4=EC=B6=94=EA=B0=80?= =?UTF-8?q?=EC=8B=9C=20=EC=84=9C=EB=B8=8C=EB=A9=94=EB=89=B4=20class=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20?= =?UTF-8?q?=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 --- adm/menu_form.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/adm/menu_form.php b/adm/menu_form.php index 1318146e0..444bc3833 100644 --- a/adm/menu_form.php +++ b/adm/menu_form.php @@ -71,7 +71,12 @@ function add_menu_list(name, link, code) { var $menulist = $("#menulist", opener.document); var ms = new Date().getTime(); - var sub_menu_class = ""; + var sub_menu_class; + + sub_menu_class = " class=\"td_category\""; + + sub_menu_class = " class=\"td_category sub_menu_class\""; + var list = "\">\n"; list += "\n"; From e9d3de18591cc63d8d17d5dd1f668acf708cf0d2 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 14 Mar 2014 18:12:35 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=EC=84=9C=EB=B8=8C=EB=A9=94=EB=89=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EC=BD=94=EB=93=9C=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 --- adm/menu_form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/menu_form.php b/adm/menu_form.php index 444bc3833..4f8c8dc06 100644 --- a/adm/menu_form.php +++ b/adm/menu_form.php @@ -9,7 +9,7 @@ $g5['title'] = '메뉴 추가'; include_once(G5_PATH.'/head.sub.php'); // 코드 -if($new == 'new' || $code == 0) { +if($new == 'new' || !$code) { $code = base_convert(substr($code,0, 2), 36, 10); $code += 36; $code = base_convert($code, 10, 36); From 95267cb88bd96460ea3ebcef221225ffb51d06a7 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 14 Mar 2014 21:29:20 +0900 Subject: [PATCH 4/6] =?UTF-8?q?conv=5Funescape=5Fnl=20=ED=95=A8=EC=88=98?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/common.lib.php b/lib/common.lib.php index 4b8e0d4cc..3b4cb1362 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2615,4 +2615,13 @@ function conv_date_format($format, $date, $add='') return date($format, $timestamp); } + +// unescape nl 얻기 +function conv_unescape_nl($str) +{ + $search = array('\\r', '\\n', '\r'); + $replace = array('', '\n', ''); + + return str_replace($search, $replace, $str); +} ?> \ No newline at end of file From 384e4243bc4c59d909ae0534d6d94f68073f91e4 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 14 Mar 2014 21:52:57 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=ED=9A=8C=EC=9A=B4=20=EB=A9=94=EC=9D=BC?= =?UTF-8?q?=EB=B0=9C=EC=86=A1=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/mail_select_list.php | 2 +- adm/mail_select_update.php | 2 +- lib/common.lib.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/adm/mail_select_list.php b/adm/mail_select_list.php index d43d6c200..67689863b 100644 --- a/adm/mail_select_list.php +++ b/adm/mail_select_list.php @@ -94,7 +94,7 @@ include_once('./admin.head.php'); while ($row=sql_fetch_array($result)) { $i++; $ma_list .= $cr . $row['mb_email'] . "||" . $row['mb_id'] . "||" . $row['mb_name'] . "||" . $row['mb_nick'] . "||" . $row['mb_datetime']; - $cr = chr(30); + $cr = '\n'; $bg = 'bg'.($i%2); ?> diff --git a/adm/mail_select_update.php b/adm/mail_select_update.php index 5b0f5874e..90f720e40 100644 --- a/adm/mail_select_update.php +++ b/adm/mail_select_update.php @@ -36,7 +36,7 @@ $ma_id = trim($_POST['ma_id']); $select_member_list = trim($_POST['ma_list']); //print_r2($_POST); EXIT; -$member_list = explode(chr(30), $select_member_list); +$member_list = explode('\n', conv_unescape_nl($select_member_list)); // 메일내용 가져오기 $sql = "select ma_subject, ma_content from {$g5['mail_table']} where ma_id = '$ma_id' "; diff --git a/lib/common.lib.php b/lib/common.lib.php index 3b4cb1362..2d59c429f 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2619,8 +2619,8 @@ function conv_date_format($format, $date, $add='') // unescape nl 얻기 function conv_unescape_nl($str) { - $search = array('\\r', '\\n', '\r'); - $replace = array('', '\n', ''); + $search = array('\\r', '\\\n', '\\n', '\r'); + $replace = array('', '\n', '\n', ''); return str_replace($search, $replace, $str); } From 6927401c1d87970fbd8342bf8da4580a180f71f7 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 17 Mar 2014 11:10:42 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EB=B0=9C=EC=86=A1=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/mail_select_list.php | 2 +- adm/mail_select_update.php | 2 +- lib/common.lib.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/adm/mail_select_list.php b/adm/mail_select_list.php index 67689863b..db05cca50 100644 --- a/adm/mail_select_list.php +++ b/adm/mail_select_list.php @@ -94,7 +94,7 @@ include_once('./admin.head.php'); while ($row=sql_fetch_array($result)) { $i++; $ma_list .= $cr . $row['mb_email'] . "||" . $row['mb_id'] . "||" . $row['mb_name'] . "||" . $row['mb_nick'] . "||" . $row['mb_datetime']; - $cr = '\n'; + $cr = "\n"; $bg = 'bg'.($i%2); ?> diff --git a/adm/mail_select_update.php b/adm/mail_select_update.php index 90f720e40..c87adc123 100644 --- a/adm/mail_select_update.php +++ b/adm/mail_select_update.php @@ -36,7 +36,7 @@ $ma_id = trim($_POST['ma_id']); $select_member_list = trim($_POST['ma_list']); //print_r2($_POST); EXIT; -$member_list = explode('\n', conv_unescape_nl($select_member_list)); +$member_list = explode("\n", conv_unescape_nl($select_member_list)); // 메일내용 가져오기 $sql = "select ma_subject, ma_content from {$g5['mail_table']} where ma_id = '$ma_id' "; diff --git a/lib/common.lib.php b/lib/common.lib.php index 2d59c429f..978f38e09 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2619,8 +2619,8 @@ function conv_date_format($format, $date, $add='') // unescape nl 얻기 function conv_unescape_nl($str) { - $search = array('\\r', '\\\n', '\\n', '\r'); - $replace = array('', '\n', '\n', ''); + $search = array('\\r', '\r', '\\n', '\n'); + $replace = array('', '', "\n", "\n"); return str_replace($search, $replace, $str); }