From 2065819ab9ad3df6f77a3548d2a2fb924ed0277a Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 27 Mar 2014 14:05:59 +0900 Subject: [PATCH 01/29] =?UTF-8?q?SMS5=20=EC=BD=94=EB=93=9C=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=20=EB=B0=8F=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/sms_admin/ajax.sms_write_person.php | 4 ++-- adm/sms_admin/form_list.php | 2 +- adm/sms_admin/form_update.php | 2 +- adm/sms_admin/history_list.php | 2 +- adm/sms_admin/history_member.php | 2 +- adm/sms_admin/history_num.php | 2 +- adm/sms_admin/history_send.php | 12 ++++++------ adm/sms_admin/history_view.php | 2 +- adm/sms_admin/install.php | 12 ++++++------ adm/sms_admin/member_update_run.php | 16 ++++++++-------- adm/sms_admin/num_book.php | 2 +- adm/sms_admin/num_book_update.php | 2 +- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/adm/sms_admin/ajax.sms_write_person.php b/adm/sms_admin/ajax.sms_write_person.php index 38c8c0b55..5838e9df3 100644 --- a/adm/sms_admin/ajax.sms_write_person.php +++ b/adm/sms_admin/ajax.sms_write_person.php @@ -8,9 +8,9 @@ auth_check($auth[$sub_menu], "r"); $g5['title'] = "휴대폰번호 관리"; -if (!$page) $page = 1; +if ($page < 1) $page = 1; -if (is_numeric($bg_no)) +if (is_numeric($bg_no)) $sql_group = " and bg_no='$bg_no' "; else $sql_group = ""; diff --git a/adm/sms_admin/form_list.php b/adm/sms_admin/form_list.php index 4e6cae1f5..c62704d98 100644 --- a/adm/sms_admin/form_list.php +++ b/adm/sms_admin/form_list.php @@ -11,7 +11,7 @@ $token = get_token(); $g5['title'] = "이모티콘 관리"; -if (!$page) $page = 1; +if ($page < 1) $page = 1; if (is_numeric($fg_no)) $sql_group = " and fg_no='$fg_no' "; diff --git a/adm/sms_admin/form_update.php b/adm/sms_admin/form_update.php index 5c4046602..9059b91bf 100644 --- a/adm/sms_admin/form_update.php +++ b/adm/sms_admin/form_update.php @@ -28,7 +28,7 @@ if ($w == 'u') // 업데이트 if ($fg_no != $res['fg_no']) { if ($res['fg_no']) - sql_query("update {$g5['sms5_form_group_table']} set fg_count = fg_count - 1 where fg_no='{$res[fg_no]}'"); + sql_query("update {$g5['sms5_form_group_table']} set fg_count = fg_count - 1 where fg_no='{$res['fg_no']}'"); sql_query("update {$g5['sms5_form_group_table']} set fg_count = fg_count + 1 where fg_no='$fg_no'"); } diff --git a/adm/sms_admin/history_list.php b/adm/sms_admin/history_list.php index 82b6d8326..bb2b10292 100644 --- a/adm/sms_admin/history_list.php +++ b/adm/sms_admin/history_list.php @@ -9,7 +9,7 @@ auth_check($auth[$sub_menu], "r"); $g5['title'] = "문자전송 내역"; -if (!$page) $page = 1; +if ($page < 1) $page = 1; if ($st && trim($sv)) $sql_search = " and wr_message like '%$sv%' "; diff --git a/adm/sms_admin/history_member.php b/adm/sms_admin/history_member.php index a3dcec0d2..71cbe5425 100644 --- a/adm/sms_admin/history_member.php +++ b/adm/sms_admin/history_member.php @@ -9,7 +9,7 @@ auth_check($auth[$sub_menu], "r"); $g5['title'] = "문자전송 내역 (회원)"; -if (!$page) $page = 1; +if ($page < 1) $page = 1; if ($st && trim($sv)) $sql_search = " and $st like '%$sv%' "; diff --git a/adm/sms_admin/history_num.php b/adm/sms_admin/history_num.php index 519f88b99..ce1ca1260 100644 --- a/adm/sms_admin/history_num.php +++ b/adm/sms_admin/history_num.php @@ -9,7 +9,7 @@ auth_check($auth[$sub_menu], "r"); $g5['title'] = "문자전송 내역 (번호별)"; -if (!$page) $page = 1; +if ($page < 1) $page = 1; if ($st && trim($sv)) $sql_search = " and $st like '%$sv%' "; diff --git a/adm/sms_admin/history_send.php b/adm/sms_admin/history_send.php index fe961494d..5494c2e00 100644 --- a/adm/sms_admin/history_send.php +++ b/adm/sms_admin/history_send.php @@ -15,7 +15,7 @@ $new_wr_renum = $res['wr_renum'] + 1; if ($w == 'f') $sql_flag = " and hs_flag=0 "; -else +else $sql_flag = ""; if ($wr_renum) @@ -37,9 +37,9 @@ if (!$res['cnt']) { } $sql = sql_query("select * from {$g5['sms5_history_table']} where wr_no='$wr_no' $sql_renum $sql_flag"); -while ($res = sql_fetch_array($sql)) +while ($res = sql_fetch_array($sql)) { - $res'[bk_hp'] = get_hp($res['bk_hp'], 0); + $res['bk_hp'] = get_hp($res['bk_hp'], 0); if ($g5['sms5_demo']) $res['bk_hp'] = '0100000000'; @@ -61,7 +61,7 @@ $reply = str_replace('-', '', trim($write['wr_reply'])); $result = $SMS->Add($list, $reply, '', '', $write['wr_message'], '', $wr_total); -if ($result) +if ($result) { $result = $SMS->Send(); @@ -73,7 +73,7 @@ if ($result) $wr_failure = 0; $count = 0; - foreach ($SMS->Result as $result) + foreach ($SMS->Result as $result) { list($phone, $code) = explode(":", $result); @@ -103,7 +103,7 @@ if ($result) } $wr_failure++; $hs_flag = 0; - } + } else { $hs_code = $code; diff --git a/adm/sms_admin/history_view.php b/adm/sms_admin/history_view.php index 6e29571da..199478d16 100644 --- a/adm/sms_admin/history_view.php +++ b/adm/sms_admin/history_view.php @@ -12,7 +12,7 @@ $g5['title'] = "문자전송 상세내역"; if (!is_numeric($wr_no)) alert('전송 고유 번호가 없습니다.'); -if (!$spage) $spage = 1; +if ($spage < 1) $spage = 1; if ($sst && trim($ssv)) $sql_search = " and $sst like '%$ssv%' "; diff --git a/adm/sms_admin/install.php b/adm/sms_admin/install.php index 0d31874e4..9ea6f2255 100644 --- a/adm/sms_admin/install.php +++ b/adm/sms_admin/install.php @@ -16,8 +16,8 @@ include_once(G5_ADMIN_PATH.'/admin.head.php'); //SMS 설정 정보 테이블이 있는지 검사한다. if( isset($g5['sms5_config_table']) && sql_query(" DESCRIBE {$g5['sms5_config_table']} ", false)) { if(!$setup){ - echo '"; -flush(); usleep(50000); +flush(); usleep(50000); $read_point = -1; $write_point = 5; @@ -70,11 +70,11 @@ $sql = " insert into {$g5['sms5_book_group_table']} set bg_name='미분류'"; mysql_query($sql) or die(mysql_error() . "

" . $sql); echo ""; -flush(); usleep(50000); +flush(); usleep(50000); //------------------------------------------------------------------------------------------------- echo ""; -flush(); usleep(50000); +flush(); usleep(50000); ?> diff --git a/adm/sms_admin/member_update_run.php b/adm/sms_admin/member_update_run.php index 1dba4cbf7..8d24ff329 100644 --- a/adm/sms_admin/member_update_run.php +++ b/adm/sms_admin/member_update_run.php @@ -21,15 +21,15 @@ $receipt = 0; // 회원 데이터 마이그레이션 $qry = sql_query("select mb_id, mb_name, mb_hp, mb_sms, mb_leave_date from ".$g5['member_table']." order by mb_datetime"); -while ($res = sql_fetch_array($qry)) +while ($res = sql_fetch_array($qry)) { - if ($res['mb_leave_date'] != '') + if ($res['mb_leave_date'] != '') $leave++; else if ($res['mb_hp'] == '') $hp_empty++; - else if (is_hp($res['mb_hp'])) + else if (is_hp($res['mb_hp'])) $hp_yes++ ; - else + else $hp_no++; $hp = get_hp($res['mb_hp']); @@ -45,7 +45,7 @@ while ($res = sql_fetch_array($qry)) $mb_count = $res3['cnt']; // 회원이 삭제되었다면 휴대폰번호 DB 에서도 삭제한다. - if ($res['mb_leave_date']) + if ($res['mb_leave_date']) { sql_query("delete from {$g5['sms5_book_table']} where mb_id='{$res2['mb_id']}'"); @@ -63,15 +63,15 @@ while ($res = sql_fetch_array($qry)) if ($bk_receipt != $res2['bk_receipt']) { if ($bk_receipt == 1) $sql_sms = "bg_receipt = bg_receipt + $mb_count, bg_reject = bg_reject - $mb_count"; - else + else $sql_sms = "bg_receipt = bg_receipt - $mb_count, bg_reject = bg_reject + $mb_count"; sql_query("update {$g5['sms5_book_group_table']} set $sql_sms where bg_no='{$res2['bg_no']}'"); } - + if ($bk_receipt) $receipt++; - sql_query("update {$g5['sms5_book_table']} set $field where mb_id='$res[mb_id]'"); + sql_query("update {$g5['sms5_book_table']} set $field where mb_id='{$res['mb_id']}'"); } } else if ($res['mb_leave_date'] == '') // 기존에 등록되어 있지 않을 경우 추가 (삭제된 회원이 아닐 경우) diff --git a/adm/sms_admin/num_book.php b/adm/sms_admin/num_book.php index 8c6e2ee4e..d6aa80d79 100644 --- a/adm/sms_admin/num_book.php +++ b/adm/sms_admin/num_book.php @@ -11,7 +11,7 @@ $token = get_token(); $g5['title'] = "휴대폰번호 관리"; -if (!$page) $page = 1; +if ($page < 1) $page = 1; if (is_numeric($bg_no)) $sql_group = " and bg_no='$bg_no' "; diff --git a/adm/sms_admin/num_book_update.php b/adm/sms_admin/num_book_update.php index edb9dd373..40eec9f4f 100644 --- a/adm/sms_admin/num_book_update.php +++ b/adm/sms_admin/num_book_update.php @@ -59,7 +59,7 @@ if ($w=='u') // 업데이트 } $get_bg_no = $bg_no; - $go_url = './num_book_write.php?bk_no='.$bk_no.'&w='.$w.'&page='.$page; + $go_url = './num_book_write.php?bk_no='.$bk_no.'&w='.$w.'&page='.$page; if( $is_hp_exist ){ //중복된 회원 휴대폰번호가 있다면 //alert( "중복된 회원 휴대폰번호가 있어서 회원정보에는 반영되지 않았습니다.", $go_url ); goto_url($go_url); From 2d769a83cedd5c7e4dd399bf6360ebab3ddf29e7 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 27 Mar 2014 14:43:23 +0900 Subject: [PATCH 02/29] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/session_delete.php | 46 ------------------------------------------ 1 file changed, 46 deletions(-) delete mode 100644 adm/session_delete.php diff --git a/adm/session_delete.php b/adm/session_delete.php deleted file mode 100644 index 35c8b8419..000000000 --- a/adm/session_delete.php +++ /dev/null @@ -1,46 +0,0 @@ -
"; -echo ""; -include_once("./admin.tail.php"); -flush(); - -$session_path = "$g5[path]/data/session"; // 세션이저장된 디렉토리 -if (!$dir=@opendir($session_path)) { - echo "세션 디렉토리를 열지못했습니다."; -} - -$cnt=0; -while($file=readdir($dir)) { - - if (!strstr($file,'sess_')) { - continue; - } - - if (strpos($file,'sess_')!=0) { - continue; - } - - if (!$atime=@fileatime("$session_path/$file")) { - continue; - } - if (time() > $atime + (3600 * 6)) { // 지난시간을 초로 계산해서 적어주시면 됩니다. default : 6시간전 - $cnt++; - $return = unlink("$session_path/$file"); - echo "\n"; - - flush(); - - if ($cnt%10==0) - echo "\n"; - } -} -echo "\n"; -?> \ No newline at end of file From 45bf83a7d1d3ee08943ebe3ba86ddfe6380960bf Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 27 Mar 2014 15:20:08 +0900 Subject: [PATCH 03/29] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?= =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EB=B0=9C=EC=86=A1=EB=90=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=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 --- .../basic/register_form_update.tail.skin.php | 32 +++++++++++++++++++ .../basic/register_form_update.tail.skin.php | 32 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 mobile/skin/member/basic/register_form_update.tail.skin.php create mode 100644 skin/member/basic/register_form_update.tail.skin.php diff --git a/mobile/skin/member/basic/register_form_update.tail.skin.php b/mobile/skin/member/basic/register_form_update.tail.skin.php new file mode 100644 index 000000000..64889697a --- /dev/null +++ b/mobile/skin/member/basic/register_form_update.tail.skin.php @@ -0,0 +1,32 @@ +SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']); + $SMS->Add($receive_number, $send_number, $config['cf_icode_id'], iconv("utf-8", "euc-kr", stripslashes($sms_contents)), ""); + $SMS->Send(); + } +} +//---------------------------------------------------------- +// SMS 문자전송 끝 +//---------------------------------------------------------- +?> diff --git a/skin/member/basic/register_form_update.tail.skin.php b/skin/member/basic/register_form_update.tail.skin.php new file mode 100644 index 000000000..64889697a --- /dev/null +++ b/skin/member/basic/register_form_update.tail.skin.php @@ -0,0 +1,32 @@ +SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']); + $SMS->Add($receive_number, $send_number, $config['cf_icode_id'], iconv("utf-8", "euc-kr", stripslashes($sms_contents)), ""); + $SMS->Send(); + } +} +//---------------------------------------------------------- +// SMS 문자전송 끝 +//---------------------------------------------------------- +?> From e120ed72e52ef17926ed249cfaf6e6505e0f6bc6 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 27 Mar 2014 16:16:52 +0900 Subject: [PATCH 04/29] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20-=20=EA=B9=80?= =?UTF-8?q?=EC=B2=98=EB=A1=9C=EB=8B=98=20=EC=A0=9C=EB=B3=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderlistdelete.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/orderlistdelete.php b/adm/shop_admin/orderlistdelete.php index bbddb16f5..09d2aff75 100644 --- a/adm/shop_admin/orderlistdelete.php +++ b/adm/shop_admin/orderlistdelete.php @@ -15,7 +15,7 @@ for ($i=0; $i Date: Thu, 27 Mar 2014 16:18:17 +0900 Subject: [PATCH 05/29] =?UTF-8?q?$list=20array=20=EC=A4=91=EB=B3=B5=20?= =?UTF-8?q?=EC=84=A0=EC=96=B8=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?-=20=EB=BD=81=EC=8A=A4=EB=8B=98=20=EC=A0=9C=EB=B3=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/scrap.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/bbs/scrap.php b/bbs/scrap.php index dbf53f2f2..af0cf8fd0 100644 --- a/bbs/scrap.php +++ b/bbs/scrap.php @@ -7,8 +7,6 @@ if (!$is_member) $g5['title'] = $member['mb_nick'].'님의 스크랩'; include_once(G5_PATH.'/head.sub.php'); -$list = array(); - $sql_common = " from {$g5['scrap_table']} where mb_id = '{$member['mb_id']}' "; $sql_order = " order by ms_id desc "; From 2bfd1e7469fe2972eb0bf8a2bdc4561563745e7b Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 27 Mar 2014 16:24:15 +0900 Subject: [PATCH 06/29] =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/shop.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/shop.js b/js/shop.js index a7ef07ca8..c5dc37a17 100644 --- a/js/shop.js +++ b/js/shop.js @@ -4,7 +4,7 @@ var isAndroid = (navigator.userAgent.toLowerCase().indexOf("android") > -1); $(function() { // 선택옵션 - /* 가상서커 ctrl keyup 이베트 대응 */ + /* 가상커서 ctrl keyup 이베트 대응 */ $("select.it_option").live("keyup", function(e) { var sel_count = $("select.it_option").size(); var idx = $("select.it_option").index($(this)); @@ -106,7 +106,7 @@ $(function() { }); // 추가옵션 - /* 가상서커 ctrl keyup 이베트 대응 */ + /* 가상커서 ctrl keyup 이베트 대응 */ $("select.it_supply").live("keyup", function(e) { var $el = $(this); var code = e.keyCode; From ae7dba63b2ccf0832ca2c7179adb34923a805ea5 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 27 Mar 2014 17:26:00 +0900 Subject: [PATCH 07/29] =?UTF-8?q?php=205.3=20=EC=9D=B4=EC=A0=84=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EB=B0=9C=EC=83=9D=ED=95=98=EB=8A=94=20=20parse=20e?= =?UTF-8?q?rror=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/view.php | 11 ++++++----- mobile/skin/board/basic/view.skin.php | 2 +- mobile/skin/board/gallery/view.skin.php | 2 +- skin/board/basic/view.skin.php | 2 +- skin/board/gallery/view.skin.php | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/bbs/view.php b/bbs/view.php index 565fdfda5..e570a7763 100644 --- a/bbs/view.php +++ b/bbs/view.php @@ -123,11 +123,12 @@ if (strstr($sfl, 'content')) $view['content'] = search_font($stx, $view['content']); //$view['rich_content'] = preg_replace("/{이미지\:([0-9]+)[:]?([^}]*)}/ie", "view_image(\$view, '\\1', '\\2')", $view['content']); -$view['rich_content'] = preg_replace_callback("/{이미지\:([0-9]+)[:]?([^}]*)}/i", - function ($matches) { - global $view; - return view_image($view, $matches[1], $matches[2]); - }, $view['content']); +function conv_rich_content($matches) +{ + global $view; + return view_image($view, $matches[1], $matches[2]); +} +$view['rich_content'] = preg_replace_callback("/{이미지\:([0-9]+)[:]?([^}]*)}/i", "conv_rich_content", $view['content']); $is_signature = false; $signature = ''; diff --git a/mobile/skin/board/basic/view.skin.php b/mobile/skin/board/basic/view.skin.php index fd6192049..3d3d3a9f6 100644 --- a/mobile/skin/board/basic/view.skin.php +++ b/mobile/skin/board/basic/view.skin.php @@ -141,7 +141,7 @@ add_stylesheet('', 0 ?>

- +

diff --git a/mobile/skin/board/gallery/view.skin.php b/mobile/skin/board/gallery/view.skin.php index 6e9d50133..ecb7f4c17 100644 --- a/mobile/skin/board/gallery/view.skin.php +++ b/mobile/skin/board/gallery/view.skin.php @@ -141,7 +141,7 @@ add_stylesheet('', 0 ?>
- +

diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php index 641c54194..910dafe48 100644 --- a/skin/board/basic/view.skin.php +++ b/skin/board/basic/view.skin.php @@ -149,7 +149,7 @@ add_stylesheet('', 0
- +

diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php index 641c54194..910dafe48 100644 --- a/skin/board/gallery/view.skin.php +++ b/skin/board/gallery/view.skin.php @@ -149,7 +149,7 @@ add_stylesheet('', 0
- +

From 46b8e2e035ee70fb51a12b068bf9b16db132ccf7 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 28 Mar 2014 09:27:23 +0900 Subject: [PATCH 08/29] =?UTF-8?q?=EC=83=81=ED=92=88=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EA=B3=A0=EC=8B=9C=EC=97=90=20=EB=94=B0=EC=98=B4=ED=91=9C=20?= =?UTF-8?q?=EC=9E=88=EC=9D=84=20=EB=95=8C=20=EC=98=A4=EB=A5=98=20=EB=8C=80?= =?UTF-8?q?=EC=B2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/itemformupdate.php | 2 +- mobile/skin/shop/basic/iteminfo.info.skin.php | 18 +++++++++++++----- skin/shop/basic/item.info.skin.php | 16 ++++++++++++---- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php index 032a5b565..ef21d0c24 100644 --- a/adm/shop_admin/itemformupdate.php +++ b/adm/shop_admin/itemformupdate.php @@ -253,7 +253,7 @@ for($i=0; $i 99) diff --git a/mobile/skin/shop/basic/iteminfo.info.skin.php b/mobile/skin/shop/basic/iteminfo.info.skin.php index 9b82ca1a8..f5a2bf7ce 100644 --- a/mobile/skin/shop/basic/iteminfo.info.skin.php +++ b/mobile/skin/shop/basic/iteminfo.info.skin.php @@ -22,13 +22,14 @@ add_stylesheet('', -

상품 정보 고시

+

상품 정보 고시

    ',
- + 상품 정보 고시 정보가 올바르게 저장되지 않았습니다.
config.php 파일의 G5_ESCAPE_FUNCTION 설정을 addslashes 로
변경하신 후 관리자 > 상품정보 수정에서 상품 정보를 다시 저장해주세요.

'; + } + } + } //if + ?> \ No newline at end of file diff --git a/skin/shop/basic/item.info.skin.php b/skin/shop/basic/item.info.skin.php index 4843e2e8f..c2e914e95 100644 --- a/skin/shop/basic/item.info.skin.php +++ b/skin/shop/basic/item.info.skin.php @@ -29,9 +29,10 @@ add_stylesheet('', 0

상품 정보 고시

@@ -53,7 +54,14 @@ add_stylesheet('', 0
- + 상품 정보 고시 정보가 올바르게 저장되지 않았습니다.
config.php 파일의 G5_ESCAPE_FUNCTION 설정을 addslashes 로
변경하신 후 관리자 > 상품정보 수정에서 상품 정보를 다시 저장해주세요.

'; + } + } + } //if + ?> From 244fa58964b25bd9df2faf7a7bdfcc572110fc72 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 28 Mar 2014 11:11:21 +0900 Subject: [PATCH 09/29] =?UTF-8?q?=EB=AC=B4=ED=86=B5=EC=9E=A5=20=EC=A3=BC?= =?UTF-8?q?=EB=AC=B8=EB=95=8C=20=EC=9E=85=EA=B8=88=EA=B3=84=EC=A2=8C=20SMS?= =?UTF-8?q?=20=EB=B0=9C=EC=86=A1=20-=20=EC=B0=B8=EC=97=86=EB=8B=A4?= =?UTF-8?q?=EB=8B=98=20=EC=A0=9C=EC=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/orderformupdate.php | 10 ++++++++++ shop/orderformupdate.php | 24 +++++++++++++++++------- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php index f8ee42542..a6a2dc65b 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -567,6 +567,16 @@ if($config['cf_sms_use'] && ($default['de_sms_use2'] || $default['de_sms_use3']) } } + // 무통장 입금 때 고객에게 계좌정보 보냄 + if($od_settle_case == '무통장' && $default['de_sms_use2'] && $od_misu > 0) { + $sms_content = $od_name."님의 입금계좌입니다.\n금액:".number_format($od_misu)."원\n계좌:".$od_bank_account."\n".$default['de_admin_company_name']; + + $recv_number = preg_replace("/[^0-9]/", "", $od_hp); + $send_number = preg_replace("/[^0-9]/", "", $default['de_admin_company_tel']); + $SMS->Add($recv_number, $send_number, $config['cf_icode_id'], iconv("utf-8", "euc-kr", $sms_content), ""); + $sms_count++; + } + if($sms_count > 0) $SMS->Send(); } diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index a983aad11..970c436b6 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -545,13 +545,13 @@ if($config['cf_sms_use'] && ($default['de_sms_use2'] || $default['de_sms_use3']) $recv_number = preg_replace("/[^0-9]/", "", $recv_numbers[$s]); $send_number = preg_replace("/[^0-9]/", "", $send_numbers[$s]); - $sms_content = preg_replace("/{이름}/", $od_name, $sms_content); - $sms_content = preg_replace("/{보낸분}/", $od_name, $sms_content); - $sms_content = preg_replace("/{받는분}/", $od_b_name, $sms_content); - $sms_content = preg_replace("/{주문번호}/", $od_id, $sms_content); - $sms_content = preg_replace("/{주문금액}/", number_format($tot_ct_price + $od_send_cost + $od_send_cost2), $sms_content); - $sms_content = preg_replace("/{회원아이디}/", $member['mb_id'], $sms_content); - $sms_content = preg_replace("/{회사명}/", $default['de_admin_company_name'], $sms_content); + $sms_content = str_replace("{이름}", $od_name, $sms_content); + $sms_content = str_replace("{보낸분}", $od_name, $sms_content); + $sms_content = str_replace("{받는분}", $od_b_name, $sms_content); + $sms_content = str_replace("{주문번호}", $od_id, $sms_content); + $sms_content = str_replace("{주문금액}", number_format($tot_ct_price + $od_send_cost + $od_send_cost2), $sms_content); + $sms_content = str_replace("{회원아이디}", $member['mb_id'], $sms_content); + $sms_content = str_replace("{회사명}", $default['de_admin_company_name'], $sms_content); $idx = 'de_sms_use'.($s + 2); @@ -561,6 +561,16 @@ if($config['cf_sms_use'] && ($default['de_sms_use2'] || $default['de_sms_use3']) } } + // 무통장 입금 때 고객에게 계좌정보 보냄 + if($od_settle_case == '무통장' && $default['de_sms_use2'] && $od_misu > 0) { + $sms_content = $od_name."님의 입금계좌입니다.\n금액:".number_format($od_misu)."원\n계좌:".$od_bank_account."\n".$default['de_admin_company_name']; + + $recv_number = preg_replace("/[^0-9]/", "", $od_hp); + $send_number = preg_replace("/[^0-9]/", "", $default['de_admin_company_tel']); + $SMS->Add($recv_number, $send_number, $config['cf_icode_id'], iconv("utf-8", "euc-kr", $sms_content), ""); + $sms_count++; + } + if($sms_count > 0) $SMS->Send(); } From 55799985e9346f21786ae1d92b8466c0157de41f Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 28 Mar 2014 11:13:54 +0900 Subject: [PATCH 10/29] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=85=8B=20=EB=B3=80=ED=99=98=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/icode.sms.lib.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/icode.sms.lib.php b/lib/icode.sms.lib.php index e41ab5d8e..0ce3e6643 100644 --- a/lib/icode.sms.lib.php +++ b/lib/icode.sms.lib.php @@ -69,14 +69,7 @@ class SMS { //if ( eregi("[^0-9]",$callBack) ) return "회신 전화번호가 잘못되었습니다"; if ( preg_match("/[^0-9]/i",$callBack) ) return "회신 전화번호가 잘못되었습니다"; - // 아이코드에서는 문자에 utf-8 인코딩 형식을 아직 지원하지 않는다. - if (strtolower($g5['charset'])=='utf-8') { - if (function_exists("iconv")) { - $msg = iconv("utf-8", "euc-kr", $msg); - } - } - - $msg=cut_char($msg,80); // 80자 제한 + $msg=cut_char($msg,80); // 80자 제한 // 보낼 내용을 배열에 집어넣기 $dest = spacing($dest,11); $callBack = spacing($callBack,11); From e377355ef15f0d4f71bdc2b2ec7534827680b28c Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 28 Mar 2014 11:15:32 +0900 Subject: [PATCH 11/29] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20cheditor5.?= =?UTF-8?q?1=20=EC=A0=84=EC=B2=B4=ED=99=94=EB=A9=B4=20=EB=AA=A8=EB=93=9C?= =?UTF-8?q?=20=EB=8C=80=EC=9D=91=EC=9D=84=20=EC=9C=84=ED=95=9C=20hd=20z-in?= =?UTF-8?q?dex=20css/js=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 | 3 ++- js/jquery.menu.js | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index 48f8a0fcb..36942d8a3 100644 --- a/css/default.css +++ b/css/default.css @@ -31,7 +31,8 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} .hd_pops_footer button {margin-right:5px;padding:5px 10px;border:0;background:#393939;color:#fff} /* 상단 레이아웃 */ -#hd {z-index:10;position:relative;min-width:970px;background:#fff} +#hd {z-index:4;position:relative;min-width:970px;background:#fff} +.hd_zindex {z-index:10 !important} #hd_h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} #hd_wrapper {position:relative;margin:0 auto;padding:26px 0;width:970px;zoom:1} #hd_wrapper:after {display:block;visibility:hidden;clear:both;content:""} diff --git a/js/jquery.menu.js b/js/jquery.menu.js index 7969c4a25..a05b03de6 100644 --- a/js/jquery.menu.js +++ b/js/jquery.menu.js @@ -18,6 +18,7 @@ $(function(){ var $gnb = $(".gnb_1dli > a"); $gnb.mouseover(function() { if(mouse_event) { + $("#hd").addClass("hd_zindex"); $(".gnb_1dli").removeClass("gnb_1dli_over gnb_1dli_over2 gnb_1dli_on"); $(this).parent().addClass("gnb_1dli_over gnb_1dli_on"); menu_rearrange($(this).parent()); @@ -38,6 +39,7 @@ $(function(){ }); $gnb.focusin(function() { + $("#hd").addClass("hd_zindex"); $(".gnb_1dli").removeClass("gnb_1dli_over gnb_1dli_over2 gnb_1dli_on"); $(this).parent().addClass("gnb_1dli_over gnb_1dli_on"); menu_rearrange($(this).parent()); @@ -71,6 +73,7 @@ $(function(){ }); function submenu_hide() { + $("#hd").removeClass("hd_zindex"); $(".gnb_1dli").removeClass("gnb_1dli_over gnb_1dli_over2 gnb_1dli_on"); } From 0e313d792a00d6d917896ed0dbd9a4c598352fb2 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 28 Mar 2014 11:18:38 +0900 Subject: [PATCH 12/29] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20cheditor5.?= =?UTF-8?q?1=20=EA=B8=B0=EB=B3=B8=20=EB=84=88=EB=B9=84=20=EB=8C=80?= =?UTF-8?q?=EC=9D=91=20tbl=5Ffrm01=20th=20=EB=84=88=EB=B9=84=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 36942d8a3..c06d8bdab 100644 --- a/css/default.css +++ b/css/default.css @@ -205,7 +205,7 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} /* 폼 테이블 */ .tbl_frm01 {margin:0 0 20px} .tbl_frm01 table {width:100%;border-collapse:collapse;border-spacing:0} -.tbl_frm01 th {width:100px;padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#f5f8f9;text-align:left} +.tbl_frm01 th {width:70px;padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#f5f8f9;text-align:left} .tbl_frm01 td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent} .tbl_frm01 textarea, .frm_input {border:1px solid #e4eaec;background:#f7f7f7;color:#000;vertical-align:middle;line-height:2em} .tbl_frm01 textarea {padding:2px 2px 3px} From 9593cf952d1f694f83844c0f37f7b010ffe1ad51 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 28 Mar 2014 14:19:33 +0900 Subject: [PATCH 13/29] =?UTF-8?q?=EB=B3=B8=EC=9D=B8=ED=99=95=EC=9D=B8=20?= =?UTF-8?q?=EC=A4=91=EB=B3=B5=20=EA=B0=80=EC=9E=85=20=EC=B2=B4=ED=81=AC=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/member_form.php | 5 +++++ bbs/register_form_update.php | 9 +++++---- install/gnuboard5.sql | 1 + plugin/kcpcert/kcpcert_result.php | 6 ++++-- plugin/okname/hpcert2.php | 10 ++++++---- plugin/okname/ipin2.php | 9 +++++++++ 6 files changed, 30 insertions(+), 10 deletions(-) diff --git a/adm/member_form.php b/adm/member_form.php index bd7032072..adf4708c1 100644 --- a/adm/member_form.php +++ b/adm/member_form.php @@ -122,6 +122,11 @@ if(!isset($mb['mb_addr3'])) { sql_query(" ALTER TABLE {$g5['member_table']} ADD `mb_addr3` varchar(255) NOT NULL DEFAULT '' AFTER `mb_addr2` ", false); } +// 중복가입 확인필드 추가 +if(!isset($mb['mb_dupinfo'])) { + sql_query(" ALTER TABLE {$g5['member_table']} ADD `mb_dupinfo` varchar(255) NOT NULL DEFAULT '' AFTER `mb_adult` ", false); +} + if ($mb['mb_intercept_date']) $g5['title'] = "차단된 "; else $g5['title'] .= ""; $g5['title'] .= '회원 '.$html_title; diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php index b593792cc..4d57c6d76 100644 --- a/bbs/register_form_update.php +++ b/bbs/register_form_update.php @@ -148,12 +148,12 @@ if (isset($_FILES['mb_icon']) && is_uploaded_file($_FILES['mb_icon']['tmp_name'] // 본인확인 //--------------------------------------------------------------- $mb_hp = hyphen_hp_number($mb_hp); -if($_SESSION['ss_cert_type'] != 'hp' && $mb_hp) { - // 휴대폰번호 중복체크 - $sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_hp = '{$mb_hp}' "; +if($config['cf_cert_use'] && $_SESSION['ss_cert_type'] && $_SESSION['ss_cert_dupinfo']) { + // 중복체크 + $sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_dupinfo = '{$_SESSION['ss_cert_dupinfo']}' "; $row = sql_fetch($sql); if ($row['mb_id']) { - alert("이미 가입되어 있는 휴대폰번호 입니다.\\n회원아이디 : ".$row['mb_id']); + alert("입력하신 본인확인 정보로 가입된 내역이 존재합니다.\\n회원아이디 : ".$row['mb_id']); } } @@ -168,6 +168,7 @@ if ($config['cf_cert_use'] && $cert_type && $md5_cert_no) { $sql_certify .= " , mb_adult = '{$_SESSION['ss_cert_adult']}' "; $sql_certify .= " , mb_birth = '{$_SESSION['ss_cert_birth']}' "; $sql_certify .= " , mb_sex = '{$_SESSION['ss_cert_sex']}' "; + $sql_certify .= " , mb_dupinfo = '{$_SESSION['ss_cert_dupinfo']}' "; } else { $sql_certify .= " , mb_hp = '{$mb_hp}' "; $sql_certify .= " , mb_certify = '' "; diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql index 580696a2b..bc0f35f17 100644 --- a/install/gnuboard5.sql +++ b/install/gnuboard5.sql @@ -452,6 +452,7 @@ CREATE TABLE IF NOT EXISTS `g5_member` ( `mb_hp` varchar(255) NOT NULL default '', `mb_certify` varchar(20) NOT NULL default '', `mb_adult` tinyint(4) NOT NULL default '0', + `mb_dupinfo` varchar(255) NOT NULL default '', `mb_zip1` char(3) NOT NULL default '', `mb_zip2` char(3) NOT NULL default '', `mb_addr1` varchar(255) NOT NULL default '', diff --git a/plugin/kcpcert/kcpcert_result.php b/plugin/kcpcert/kcpcert_result.php index fb642a557..a7e06a03f 100644 --- a/plugin/kcpcert/kcpcert_result.php +++ b/plugin/kcpcert/kcpcert_result.php @@ -134,11 +134,12 @@ if( $cert_enc_use == "Y" ) alert_close("정상적인 인증이 아닙니다. 올바른 방법으로 이용해 주세요."); $phone_no = hyphen_hp_number($phone_no); + $mb_dupinfo = $di; - $sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_hp = '{$phone_no}' "; + $sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_dupinfo = '{$mb_dupinfo}' "; $row = sql_fetch($sql); if ($row['mb_id']) { - alert_close("이미 가입되어 있는 휴대폰번호 입니다.\\n회원아이디 : ".$row['mb_id']); + alert_close("입력하신 본인학인 정보로 가입된 내역이 존재합니다.\\n회원아이디 : ".$row['mb_id']); } // hash 데이터 @@ -156,6 +157,7 @@ if( $cert_enc_use == "Y" ) set_session("ss_cert_adult", $adult); set_session("ss_cert_birth", $birth_day); set_session("ss_cert_sex", ($sex_code=="01"?"M":"F")); + set_session('ss_cert_dupinfo', $mb_dupinfo); } else if( $res_cd != "0000" ) { diff --git a/plugin/okname/hpcert2.php b/plugin/okname/hpcert2.php index 3f5ed6d72..5a53777f6 100644 --- a/plugin/okname/hpcert2.php +++ b/plugin/okname/hpcert2.php @@ -95,13 +95,14 @@ echo "리턴메시지 :$field[16]
"; $mb_name = $field[7]; $req_num = $field[12]; $mb_birth = $field[8]; - -// 휴대폰번호 중복체크 +$mb_dupinfo = $field[4]; $phone_no = hyphen_hp_number($req_num); -$sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_hp = '{$phone_no}' "; + +// 중복정보 체크 +$sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_dupinfo = '{$mb_dupinfo}' "; $row = sql_fetch($sql); if ($row['mb_id']) { - alert_close("이미 가입되어 있는 휴대폰번호 입니다.\\n회원아이디 : ".$row['mb_id']); + alert_close("입력하신 본인학인 정보로 가입된 내역이 존재합니다.\\n회원아이디 : ".$row['mb_id']); } // hash 데이터 @@ -119,6 +120,7 @@ set_session('ss_cert_hash', $hash_data); set_session('ss_cert_adult', $adult); set_session('ss_cert_birth', $mb_birth); set_session('ss_cert_sex', ($field[9] == 1 ? 'M' : 'F')); +set_session('ss_cert_dupinfo', $mb_dupinfo); $g5['title'] = 'KCB 휴대폰 본인확인'; include_once(G5_PATH.'/head.sub.php'); diff --git a/plugin/okname/ipin2.php b/plugin/okname/ipin2.php index 43dc61e02..dda65f104 100644 --- a/plugin/okname/ipin2.php +++ b/plugin/okname/ipin2.php @@ -67,6 +67,14 @@ $field_name_IPIN_DEC = array( $mb_name = $field[6]; $req_num = $field[7]; $mb_birth = $field[11]; +$mb_dupinfo = $field[0]; + +// 중복정보 체크 +$sql = " select mb_id from {$g5['member_table']} where mb_id <> '{$member['mb_id']}' and mb_dupinfo = '{$mb_dupinfo}' "; +$row = sql_fetch($sql); +if ($row['mb_id']) { + alert_close("입력하신 본인확인 정보로 가입된 내역이 존재합니다.\\n회원아이디 : ".$row['mb_id']); +} // hash 데이터 $cert_type = 'ipin'; @@ -82,6 +90,7 @@ set_session('ss_cert_hash', $hash_data); set_session('ss_cert_adult', $adult); set_session('ss_cert_birth', $mb_birth); set_session('ss_cert_sex', ($field[9] == 1 ? 'M' : 'F')); +set_session('ss_cert_dupinfo', $mb_dupinfo); $g5['title'] = 'KCB 아이핀 본인확인'; include_once(G5_PATH.'/head.sub.php'); From 5ce0ad1221201f8dbd046f6c163d230aad387f2a Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 28 Mar 2014 14:38:12 +0900 Subject: [PATCH 14/29] =?UTF-8?q?=ED=9C=B4=EB=8C=80=ED=8F=B0=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EC=A4=91=EB=B3=B5=20=EC=B2=B4=ED=81=AC=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A3=BC=EC=84=9D=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/ajax.mb_hp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbs/ajax.mb_hp.php b/bbs/ajax.mb_hp.php index 5f4c9ffb6..eeeef8816 100644 --- a/bbs/ajax.mb_hp.php +++ b/bbs/ajax.mb_hp.php @@ -6,5 +6,5 @@ $mb_hp = trim($_POST['reg_mb_hp']); $mb_id = trim($_POST['reg_mb_id']); if ($msg = valid_mb_hp($mb_hp)) die($msg); -if ($msg = exist_mb_hp($mb_hp, $mb_id)) die($msg); +//if ($msg = exist_mb_hp($mb_hp, $mb_id)) die($msg); ?> \ No newline at end of file From fa5b5d9713d967c664a4f7d3cd419dcd06e68c90 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 28 Mar 2014 15:00:41 +0900 Subject: [PATCH 15/29] =?UTF-8?q?sms=20=EB=AC=B8=EC=9E=90=EC=97=B4=20?= =?UTF-8?q?=EC=B9=98=ED=99=98=ED=95=A8=EC=88=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/orderformupdate.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php index a6a2dc65b..d55831f72 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -551,13 +551,13 @@ if($config['cf_sms_use'] && ($default['de_sms_use2'] || $default['de_sms_use3']) $recv_number = preg_replace("/[^0-9]/", "", $recv_numbers[$s]); $send_number = preg_replace("/[^0-9]/", "", $send_numbers[$s]); - $sms_content = preg_replace("/{이름}/", $od_name, $sms_content); - $sms_content = preg_replace("/{보낸분}/", $od_name, $sms_content); - $sms_content = preg_replace("/{받는분}/", $od_b_name, $sms_content); - $sms_content = preg_replace("/{주문번호}/", $od_id, $sms_content); - $sms_content = preg_replace("/{주문금액}/", number_format($tot_ct_price + $od_send_cost + $od_send_cost2), $sms_content); - $sms_content = preg_replace("/{회원아이디}/", $member['mb_id'], $sms_content); - $sms_content = preg_replace("/{회사명}/", $default['de_admin_company_name'], $sms_content); + $sms_content = str_replace("{이름}", $od_name, $sms_content); + $sms_content = str_replace("{보낸분}", $od_name, $sms_content); + $sms_content = str_replace("{받는분}", $od_b_name, $sms_content); + $sms_content = str_replace("{주문번호}", $od_id, $sms_content); + $sms_content = str_replace("{주문금액}", number_format($tot_ct_price + $od_send_cost + $od_send_cost2), $sms_content); + $sms_content = str_replace("{회원아이디}", $member['mb_id'], $sms_content); + $sms_content = str_replace("{회사명}", $default['de_admin_company_name'], $sms_content); $idx = 'de_sms_use'.($s + 2); From a7f3688ef88d4143c8dfd001e86e93fc9758dee0 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 28 Mar 2014 15:07:06 +0900 Subject: [PATCH 16/29] =?UTF-8?q?sms=20=EB=AC=B8=EC=9E=90=EC=97=B4=20?= =?UTF-8?q?=EC=B9=98=ED=99=98=ED=95=A8=EC=88=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/admin.shop.lib.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/adm/shop_admin/admin.shop.lib.php b/adm/shop_admin/admin.shop.lib.php index fa9563f9f..8d48213aa 100644 --- a/adm/shop_admin/admin.shop.lib.php +++ b/adm/shop_admin/admin.shop.lib.php @@ -109,12 +109,12 @@ function conv_sms_contents($od_id, $contents) $od = sql_fetch($sql); $sms_contents = $contents; - $sms_contents = preg_replace("/{이름}/", $od['od_name'], $sms_contents); - $sms_contents = preg_replace("/{입금액}/", number_format($od['od_receipt_price']), $sms_contents); - $sms_contents = preg_replace("/{택배회사}/", $od['od_delivery_company'], $sms_contents); - $sms_contents = preg_replace("/{운송장번호}/", $od['od_invoice'], $sms_contents); - $sms_contents = preg_replace("/{주문번호}/", $od['od_id'], $sms_contents); - $sms_contents = preg_replace("/{회사명}/", $default['de_admin_company_name'], $sms_contents); + $sms_contents = str_replace("{이름}", $od['od_name'], $sms_contents); + $sms_contents = str_replace("{입금액}", number_format($od['od_receipt_price']), $sms_contents); + $sms_contents = str_replace("{택배회사}", $od['od_delivery_company'], $sms_contents); + $sms_contents = str_replace("{운송장번호}", $od['od_invoice'], $sms_contents); + $sms_contents = str_replace("{주문번호}", $od['od_id'], $sms_contents); + $sms_contents = str_replace("{회사명}", $default['de_admin_company_name'], $sms_contents); } return iconv("utf-8", "euc-kr", stripslashes($sms_contents)); From 2b23e4c90cb57c2082a7a7449467d966a1477ef3 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 28 Mar 2014 15:15:22 +0900 Subject: [PATCH 17/29] =?UTF-8?q?sms=20=EB=AC=B8=EC=9E=90=EC=97=B4=20?= =?UTF-8?q?=EC=B9=98=ED=99=98=ED=95=A8=EC=88=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/ordersms.inc.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/adm/shop_admin/ordersms.inc.php b/adm/shop_admin/ordersms.inc.php index eb4168a73..fcd20973f 100644 --- a/adm/shop_admin/ordersms.inc.php +++ b/adm/shop_admin/ordersms.inc.php @@ -11,10 +11,10 @@ if ($config['cf_sms_use']) { if ($od_bank_account && $od_receipt_price && $od_deposit_name) { $sms_contents = $default['de_sms_cont4']; - $sms_contents = preg_replace("/{이름}/", $od_name, $sms_contents); - $sms_contents = preg_replace("/{입금액}/", number_format($od_receipt_price), $sms_contents); - $sms_contents = preg_replace("/{주문번호}/", $od_id, $sms_contents); - $sms_contents = preg_replace("/{회사명}/", $default['de_admin_company_name'], $sms_contents); + $sms_contents = str_replace("{이름}", $od_name, $sms_contents); + $sms_contents = str_replace("{입금액}", number_format($od_receipt_price), $sms_contents); + $sms_contents = str_replace("{주문번호}", $od_id, $sms_contents); + $sms_contents = str_replace("{회사명}", $default['de_admin_company_name'], $sms_contents); $SMS = new SMS; $SMS->SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']); @@ -28,11 +28,11 @@ if ($config['cf_sms_use']) { if ($od_delivery_company && $od_invoice) { $sms_contents = $default['de_sms_cont5']; - $sms_contents = preg_replace("/{이름}/", $od_name, $sms_contents); - $sms_contents = preg_replace("/{택배회사}/", $od_delivery_company, $sms_contents); - $sms_contents = preg_replace("/{운송장번호}/", $od_invoice, $sms_contents); - $sms_contents = preg_replace("/{주문번호}/", $od_id, $sms_contents); - $sms_contents = preg_replace("/{회사명}/", $default['de_admin_company_name'], $sms_contents); + $sms_contents = str_replace("{이름}", $od_name, $sms_contents); + $sms_contents = str_replace("{택배회사}", $od_delivery_company, $sms_contents); + $sms_contents = str_replace("{운송장번호}", $od_invoice, $sms_contents); + $sms_contents = str_replace("{주문번호}", $od_id, $sms_contents); + $sms_contents = str_replace("{회사명}", $default['de_admin_company_name'], $sms_contents); $SMS = new SMS; $SMS->SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']); From 83fe14288aec5baacd6a0a18b5b9c0b30c5b6651 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 28 Mar 2014 16:11:41 +0900 Subject: [PATCH 18/29] =?UTF-8?q?=EB=82=B4=EC=9A=A9=EA=B4=80=EB=A6=AC=20ht?= =?UTF-8?q?ml=5Fpurifier=20=EC=82=AC=EC=9A=A9=20=EC=84=A0=ED=83=9D?= =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8A=94=20=EC=84=A4=EC=A0=95?= =?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 --- adm/contentform.php | 25 +++++++++++++-- adm/contentformupdate.php | 11 ++++--- bbs/content.php | 7 ++++- install/gnuboard5.sql | 1 + lib/common.lib.php | 6 ++-- mobile/content.php | 64 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 103 insertions(+), 11 deletions(-) create mode 100644 mobile/content.php diff --git a/adm/contentform.php b/adm/contentform.php index 8419ebdeb..de2c6315d 100644 --- a/adm/contentform.php +++ b/adm/contentform.php @@ -6,9 +6,18 @@ include_once(G5_EDITOR_LIB); auth_check($auth[$sub_menu], "w"); // 상단, 하단 파일경로 필드 추가 -$sql = " ALTER TABLE `{$g5['content_table']}` ADD `co_include_head` VARCHAR( 255 ) NOT NULL , - ADD `co_include_tail` VARCHAR( 255 ) NOT NULL "; -sql_query($sql, false); +if(!sql_query(" select co_include_head from {$g5['content_table']} limit 1 ", false)) { + $sql = " ALTER TABLE `{$g5['content_table']}` ADD `co_include_head` VARCHAR( 255 ) NOT NULL , + ADD `co_include_tail` VARCHAR( 255 ) NOT NULL "; + sql_query($sql, false); +} + +// html purifier 사용여부 필드 +if(!sql_query(" select co_tag_filter_use from {$g5['content_table']} limit 1 ", false)) { + sql_query(" ALTER TABLE `{$g5['content_table']}` + ADD `co_tag_filter_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `co_content` ", true); + sql_query(" update {$g5['content_table']} set co_tag_filter_use = '1' "); +} $html_title = "내용"; $g5['title'] = $html_title.' 관리'; @@ -60,6 +69,16 @@ include_once (G5_ADMIN_PATH.'/admin.head.php'); 내용 + + + + + + + diff --git a/adm/contentformupdate.php b/adm/contentformupdate.php index a3313bcb1..4f9786ffd 100644 --- a/adm/contentformupdate.php +++ b/adm/contentformupdate.php @@ -16,11 +16,12 @@ else if ($co_himg_del) @unlink(G5_DATA_PATH."/content/{$co_id}_h"); if ($co_timg_del) @unlink(G5_DATA_PATH."/content/{$co_id}_t"); -$sql_common = " co_include_head = '$co_include_head', - co_include_tail = '$co_include_tail', - co_html = '$co_html', - co_subject = '$co_subject', - co_content = '$co_content' "; +$sql_common = " co_include_head = '$co_include_head', + co_include_tail = '$co_include_tail', + co_html = '$co_html', + co_tag_filter_use = '$co_tag_filter_use', + co_subject = '$co_subject', + co_content = '$co_content' "; if ($w == "") { diff --git a/bbs/content.php b/bbs/content.php index 76082013c..a8ba46f2a 100644 --- a/bbs/content.php +++ b/bbs/content.php @@ -6,6 +6,11 @@ if( !isset($g5['content_table']) ){ die('관리자 모드에서 게시판관리->내용 관리를 먼저 확인해 주세요.'); } +if (G5_IS_MOBILE) { + include_once(G5_MOBILE_PATH.'/content.php'); + return; +} + // 내용 $sql = " select * from {$g5['content_table']} where co_id = '$co_id' "; $co = sql_fetch($sql); @@ -19,7 +24,7 @@ if ($co['co_include_head']) else include_once('./_head.php'); -$str = conv_content($co['co_content'], $co['co_html']); +$str = conv_content($co['co_content'], $co['co_html'], $co['co_tag_filter_use']); // $src 를 $dst 로 변환 unset($src); diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql index bc0f35f17..6df6f7538 100644 --- a/install/gnuboard5.sql +++ b/install/gnuboard5.sql @@ -801,6 +801,7 @@ CREATE TABLE IF NOT EXISTS `g5_content` ( `co_html` tinyint(4) NOT NULL DEFAULT '0', `co_subject` varchar(255) NOT NULL DEFAULT '', `co_content` longtext NOT NULL, + `co_tag_filter_use` tinyint(4) NOT NULL DEFAULT '0', `co_hit` int(11) NOT NULL DEFAULT '0', `co_include_head` varchar(255) NOT NULL, `co_include_tail` varchar(255) NOT NULL, diff --git a/lib/common.lib.php b/lib/common.lib.php index e2a52a832..80180937c 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -510,7 +510,7 @@ function conv_subject($subject, $len, $suffix='') } // 내용을 변환 -function conv_content($content, $html) +function conv_content($content, $html, $filter=true) { global $config, $board; @@ -536,7 +536,9 @@ function conv_content($content, $html) } $content = preg_replace($source, $target, $content); - $content = html_purifier($content); + + if($filter) + $content = html_purifier($content); } else // text 이면 { diff --git a/mobile/content.php b/mobile/content.php new file mode 100644 index 000000000..4ca181961 --- /dev/null +++ b/mobile/content.php @@ -0,0 +1,64 @@ + + + +
+
+

+
+ +
+ +
+ +
+ + + From 3383ffbcd03096773391b394d2ccd05e0409d4ab Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 31 Mar 2014 13:02:07 +0900 Subject: [PATCH 19/29] =?UTF-8?q?=EC=83=81=ED=92=88=EB=B0=B0=EC=86=A1?= =?UTF-8?q?=EB=B9=84=20=EA=B4=80=EB=A0=A8=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20-=20TopSchooL=EB=8B=98=20=EC=A0=9C=EB=B3=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/itemdelete.inc.php | 2 +- adm/shop_admin/orderform.php | 10 ++++++ adm/shop_admin/orderformreceiptupdate.php | 8 +++-- install/gnuboard5shop.sql | 5 +++ lib/shop.lib.php | 41 +++++++++++++---------- shop/cartupdate.php | 4 +-- 6 files changed, 47 insertions(+), 23 deletions(-) diff --git a/adm/shop_admin/itemdelete.inc.php b/adm/shop_admin/itemdelete.inc.php index c06101225..04072564e 100644 --- a/adm/shop_admin/itemdelete.inc.php +++ b/adm/shop_admin/itemdelete.inc.php @@ -41,7 +41,7 @@ if (!function_exists("itemdelete")) { @unlink(G5_DATA_PATH."/item/$it_id"."_t"); // 장바구니 삭제 - $sql = " delete from {$g5['g5_shop_cart_table']} where it_id = '$it_id' "; + $sql = " delete from {$g5['g5_shop_cart_table']} where it_id = '$it_id' and ct_status = '쇼핑' "; sql_query($sql); // 이벤트삭제 diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index a17b63b2b..57be8d64a 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -77,6 +77,16 @@ if(!sql_query(" select ad_addr3 from {$g5['g5_shop_order_address_table']} limit sql_query(" ALTER TABLE `{$g5['g5_shop_order_address_table']}` ADD `ad_addr3` varchar(255) NOT NULL DEFAULT '' AFTER `ad_addr2` ", true); } + +// 배송비정보 필드 cart 테이블에 추가 +if(!sql_query(" select it_sc_type from {$g5['g5_shop_cart_table']} limit 1 ", false)) { + sql_query(" ALTER TABLE `{$g5['g5_shop_cart_table']}` + ADD `it_sc_type` tinyint(4) NOT NULL DEFAULT '0' AFTER `it_name`, + ADD `it_sc_method` tinyint(4) NOT NULL DEFAULT '0' AFTER `it_sc_type`, + ADD `it_sc_price` int(11) NOT NULL DEFAULT '0' AFTER `it_sc_method`, + ADD `it_sc_minimum` int(11) NOT NULL DEFAULT '0' AFTER `it_sc_price`, + ADD `it_sc_qty` int(11) NOT NULL DEFAULT '0' AFTER `it_sc_minimum` ", true); +} ?>
diff --git a/adm/shop_admin/orderformreceiptupdate.php b/adm/shop_admin/orderformreceiptupdate.php index be16ac70d..d7af08281 100644 --- a/adm/shop_admin/orderformreceiptupdate.php +++ b/adm/shop_admin/orderformreceiptupdate.php @@ -56,13 +56,17 @@ if($_POST['od_delivery_company'] && $_POST['od_invoice'] && in_array($od['od_sta $cart_status = true; } +// 미수금액 +$od_misu = ( $od['od_cart_price'] - $od['od_cancel_price'] + $od_send_cost + $od_send_cost2 ) + - ( $od['od_cart_coupon'] + $od['od_coupon'] + $od['od_send_coupon'] ) + - ( $od['od_receipt_price'] + $od['od_receipt_point'] - $od['od_refund_price'] ); + // 미수금 정보 등 반영 $sql = " update {$g5['g5_shop_order_table']} - set od_misu = '{$info['od_misu']}', + set od_misu = '$od_misu', od_tax_mny = '{$info['od_tax_mny']}', od_vat_mny = '{$info['od_vat_mny']}', od_free_mny = '{$info['od_free_mny']}', - od_send_cost = '{$info['od_send_cost']}', od_status = '$od_status' where od_id = '$od_id' "; sql_query($sql); diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql index 4b51620ca..aea52a3e7 100644 --- a/install/gnuboard5shop.sql +++ b/install/gnuboard5shop.sql @@ -33,6 +33,11 @@ CREATE TABLE IF NOT EXISTS `g5_shop_cart` ( `mb_id` varchar(255) NOT NULL DEFAULT '', `it_id` varchar(20) NOT NULL DEFAULT '', `it_name` varchar(255) NOT NULL DEFAULT '', + `it_sc_type` tinyint(4) NOT NULL DEFAULT '0', + `it_sc_method` tinyint(4) NOT NULL DEFAULT '0', + `it_sc_price` int(11) NOT NULL DEFAULT '0', + `it_sc_minimum` int(11) NOT NULL DEFAULT '0', + `it_sc_qty` int(11) NOT NULL DEFAULT '0', `ct_status` varchar(255) NOT NULL DEFAULT '', `ct_history` text NOT NULL, `ct_price` int(11) NOT NULL DEFAULT '0', diff --git a/lib/shop.lib.php b/lib/shop.lib.php index 714e0ca80..dc5c300f7 100644 --- a/lib/shop.lib.php +++ b/lib/shop.lib.php @@ -1695,10 +1695,12 @@ function get_sendcost($cart_id, $selected=1) SUM(ct_qty) as qty from {$g5['g5_shop_cart_table']} where it_id = '{$sc['it_id']}' - and od_id = '$cart_id' "; + and od_id = '$cart_id' + and ct_status IN ( '쇼핑', '주문', '입금', '준비', '배송', '완료' ) + and ct_select = '$selected'"; $sum = sql_fetch($sql); - $send_cost = get_item_sendcost($sc['it_id'], $sum['price'], $sum['qty']); + $send_cost = get_item_sendcost($sc['it_id'], $sum['price'], $sum['qty'], $cart_id); if($send_cost > 0) $total_send_cost += $send_cost; @@ -1727,33 +1729,36 @@ function get_sendcost($cart_id, $selected=1) // 상품별 배송비 -function get_item_sendcost($it_id, $price, $qty) +function get_item_sendcost($it_id, $price, $qty, $cart_id) { global $g5, $default; $sql = " select it_id, it_sc_type, it_sc_method, it_sc_price, it_sc_minimum, it_sc_qty - from {$g5['g5_shop_item_table']} - where it_id = '$it_id' "; - $it = sql_fetch($sql); - if(!$it['it_id']) + from {$g5['g5_shop_cart_table']} + where it_id = '$it_id' + and od_id = '$cart_id' + order by ct_id + limit 1 "; + $ct = sql_fetch($sql); + if(!$ct['it_id']) return 0; - if($it['it_sc_type'] > 1) { - if($it['it_sc_type'] == 2) { // 조건부무료 - if($price >= $it['it_sc_minimum']) + if($ct['it_sc_type'] > 1) { + if($ct['it_sc_type'] == 2) { // 조건부무료 + if($price >= $ct['it_sc_minimum']) $sendcost = 0; else - $sendcost = $it['it_sc_price']; - } else if($it['it_sc_type'] == 3) { // 유료배송 - $sendcost = $it['it_sc_price']; + $sendcost = $ct['it_sc_price']; + } else if($ct['it_sc_type'] == 3) { // 유료배송 + $sendcost = $ct['it_sc_price']; } else { // 수량별 부과 - if(!$it['it_sc_qty']) - $it['it_sc_qty'] = 1; + if(!$ct['it_sc_qty']) + $ct['it_sc_qty'] = 1; - $q = ceil((int)$qty / (int)$it['it_sc_qty']); - $sendcost = (int)$it['it_sc_price'] * $q; + $q = ceil((int)$qty / (int)$ct['it_sc_qty']); + $sendcost = (int)$ct['it_sc_price'] * $q; } - } else if($it['it_sc_type'] == 1) { // 무료배송 + } else if($ct['it_sc_type'] == 1) { // 무료배송 $sendcost = 0; } else { $sendcost = -1; diff --git a/shop/cartupdate.php b/shop/cartupdate.php index dccf51b8d..a923b0bec 100644 --- a/shop/cartupdate.php +++ b/shop/cartupdate.php @@ -191,7 +191,7 @@ else // 장바구니에 담기 // 장바구니에 Insert $comma = ''; $sql = " INSERT INTO {$g5['g5_shop_cart_table']} - ( od_id, mb_id, it_id, it_name, ct_status, ct_price, ct_point, ct_point_use, ct_stock_use, ct_option, ct_qty, ct_notax, io_id, io_type, io_price, ct_time, ct_ip, ct_send_cost, ct_direct, ct_select ) + ( od_id, mb_id, it_id, it_name, it_sc_type, it_sc_method, it_sc_price, it_sc_minimum, it_sc_qty, ct_status, ct_price, ct_point, ct_point_use, ct_stock_use, ct_option, ct_qty, ct_notax, io_id, io_type, io_price, ct_time, ct_ip, ct_send_cost, ct_direct, ct_select ) VALUES "; for($k=0; $k<$opt_count; $k++) { @@ -254,7 +254,7 @@ else // 장바구니에 담기 else if($it['it_sc_type'] > 1 && $it['it_sc_method'] == 1) $ct_send_cost = 1; // 착불 - $sql .= $comma."( '$tmp_cart_id', '{$member['mb_id']}', '{$it['it_id']}', '".addslashes($it['it_name'])."', '쇼핑', '{$it['it_price']}', '$point', '0', '0', '$io_value', '$ct_qty', '{$it['it_notax']}', '$io_id', '$io_type', '$io_price', '".G5_TIME_YMDHIS."', '$REMOTE_ADDR', '$ct_send_cost', '$sw_direct', '$ct_select' )"; + $sql .= $comma."( '$tmp_cart_id', '{$member['mb_id']}', '{$it['it_id']}', '".addslashes($it['it_name'])."', '{$it['it_sc_type']}', '{$it['it_sc_method']}', '{$it['it_sc_price']}', '{$it['it_sc_minimum']}', '{$it['it_sc_qty']}', '쇼핑', '{$it['it_price']}', '$point', '0', '0', '$io_value', '$ct_qty', '{$it['it_notax']}', '$io_id', '$io_type', '$io_price', '".G5_TIME_YMDHIS."', '$REMOTE_ADDR', '$ct_send_cost', '$sw_direct', '$ct_select' )"; $comma = ' , '; $ct_count++; } From 3889e0235160b190be4f46c5b7e9b0aa0ab6ebb9 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 31 Mar 2014 13:27:30 +0900 Subject: [PATCH 20/29] =?UTF-8?q?=EC=9E=A5=EB=B0=94=EA=B5=AC=EB=8B=88=20?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=ED=95=84=EB=93=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=ED=94=84=EB=A1=9C=EA=B7=B8=EB=9E=A8=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/shop_admin/orderform.php | 10 --------- orderupgrade.php | 39 ++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 orderupgrade.php diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 57be8d64a..a17b63b2b 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -77,16 +77,6 @@ if(!sql_query(" select ad_addr3 from {$g5['g5_shop_order_address_table']} limit sql_query(" ALTER TABLE `{$g5['g5_shop_order_address_table']}` ADD `ad_addr3` varchar(255) NOT NULL DEFAULT '' AFTER `ad_addr2` ", true); } - -// 배송비정보 필드 cart 테이블에 추가 -if(!sql_query(" select it_sc_type from {$g5['g5_shop_cart_table']} limit 1 ", false)) { - sql_query(" ALTER TABLE `{$g5['g5_shop_cart_table']}` - ADD `it_sc_type` tinyint(4) NOT NULL DEFAULT '0' AFTER `it_name`, - ADD `it_sc_method` tinyint(4) NOT NULL DEFAULT '0' AFTER `it_sc_type`, - ADD `it_sc_price` int(11) NOT NULL DEFAULT '0' AFTER `it_sc_method`, - ADD `it_sc_minimum` int(11) NOT NULL DEFAULT '0' AFTER `it_sc_price`, - ADD `it_sc_qty` int(11) NOT NULL DEFAULT '0' AFTER `it_sc_minimum` ", true); -} ?>
diff --git a/orderupgrade.php b/orderupgrade.php new file mode 100644 index 000000000..14a84ceca --- /dev/null +++ b/orderupgrade.php @@ -0,0 +1,39 @@ + \ No newline at end of file From 4ae1d1a34596782ca21e6188e1c6bcf4945a07f7 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 31 Mar 2014 13:33:10 +0900 Subject: [PATCH 21/29] =?UTF-8?q?=EC=9E=A5=EB=B0=94=EA=B5=AC=EB=8B=88=20?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=EB=B3=80=EA=B2=BD=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EB=9E=A8=20=EC=99=84=EB=A3=8C=20=EB=AC=B8?= =?UTF-8?q?=EA=B5=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- orderupgrade.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/orderupgrade.php b/orderupgrade.php index 14a84ceca..3c5914002 100644 --- a/orderupgrade.php +++ b/orderupgrade.php @@ -4,6 +4,9 @@ include_once('./_common.php'); if($is_admin != 'super') alert('최고관리자로 로그인 후 실행해 주십시오.', G5_URL); +$g5['title'] = '장바구니 테이블 업그레이드'; +include_once(G5_PATH.'/head.sub.php'); + // 배송비정보 필드 cart 테이블에 추가 if(!sql_query(" select it_sc_type from {$g5['g5_shop_cart_table']} limit 1 ", false)) { sql_query(" ALTER TABLE `{$g5['g5_shop_cart_table']}` @@ -29,11 +32,15 @@ if(!sql_query(" select it_sc_type from {$g5['g5_shop_cart_table']} limit 1 ", fa $sql = " update {$g5['g5_shop_cart_table']} set it_sc_type = '{$it['it_sc_type']}', it_sc_method = '{$it['it_sc_method']}', - it_sc_price = '{$it['it_sc_price']}, + it_sc_price = '{$it['it_sc_price']}', it_sc_minimum = '{$it['it_sc_minimum']}', it_sc_qty = '{$it['it_sc_qty']}' where ct_id = '{$row['ct_id']}' "; sql_query($sql); } + + echo '

장바구니 테이블 업그레이드 완료!

'; } + +include_once(G5_PATH.'/tail.sub.php'); ?> \ No newline at end of file From afc4e4536f287d48b454fc1e2bbe3eb767d3b991 Mon Sep 17 00:00:00 2001 From: SIR Date: Mon, 31 Mar 2014 13:47:30 +0900 Subject: [PATCH 22/29] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EB=AC=BC=20=EC=9E=90?= =?UTF-8?q?=EB=8F=99=EC=A0=80=EC=9E=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/autosave.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/autosave.js b/js/autosave.js index e1f1815fc..7c867e1a1 100644 --- a/js/autosave.js +++ b/js/autosave.js @@ -7,9 +7,9 @@ var save_wr_content = null; function autosave() { $("form#fwrite").each(function() { - if (g5_editor=="ckeditor4" && typeof(CKEDITOR.instances.wr_content)!="undefined") { + if (g5_editor.indexOf("ckeditor4") != -1 && typeof(CKEDITOR.instances.wr_content)!="undefined") { this.wr_content.value = CKEDITOR.instances.wr_content.getData(); - } else if (g5_editor=="cheditor5" && typeof(ed_wr_content)!="undefined") { + } else if (g5_editor.indexOf("cheditor5") != -1 && typeof(ed_wr_content)!="undefined") { this.wr_content.value = ed_wr_content.outputBodyHTML(); } // 변수에 저장해 놓은 값과 다를 경우에만 임시 저장함 @@ -75,9 +75,9 @@ $(function(){ var subject = $(data).find("item").find("subject").text(); var content = $(data).find("item").find("content").text(); $("#wr_subject").val(subject); - if (g5_editor=="ckeditor4" && typeof(CKEDITOR.instances.wr_content)!="undefined") { + if (g5_editor.indexOf("ckeditor4") != -1 && typeof(CKEDITOR.instances.wr_content)!="undefined") { CKEDITOR.instances.wr_content.setData(content); - } else if (g5_editor=="cheditor5" && typeof(ed_wr_content)!="undefined") { + } else if (g5_editor.indexOf("cheditor5") != -1 && typeof(ed_wr_content)!="undefined") { ed_wr_content.putContents(content); } else { $("#fwrite #wr_content").val(content); From d0391b5f298453a6517884f3fa8ad1c53e62b499 Mon Sep 17 00:00:00 2001 From: SIR Date: Mon, 31 Mar 2014 13:47:56 +0900 Subject: [PATCH 23/29] =?UTF-8?q?cheditor=20=EB=B2=84=EC=A0=84=EC=97=90=20?= =?UTF-8?q?=EA=B4=80=EA=B3=84=EC=97=86=EC=9D=B4=20=ED=8F=AC=ED=95=A8?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=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 --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index df481935e..4183301b2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,5 @@ sirgle/ test.php *.key *.sh -cheditor5/ +cheditor*/ ckeditor43/ From b03949626e036a72e29d69581bc6011e41d3bc86 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 1 Apr 2014 09:54:08 +0900 Subject: [PATCH 24/29] =?UTF-8?q?1:1=EB=AC=B8=EC=9D=98=20=EB=A9=94?= =?UTF-8?q?=EC=9D=BC=20=EB=B0=9C=EC=86=A1=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 --- bbs/qawrite_update.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bbs/qawrite_update.php b/bbs/qawrite_update.php index c7fa45225..d6819dc8c 100644 --- a/bbs/qawrite_update.php +++ b/bbs/qawrite_update.php @@ -323,7 +323,7 @@ if($w == 'a' && $write['qa_email_recv'] && trim($write['qa_email'])) { include_once(G5_LIB_PATH.'/mailer.lib.php'); $subject = $config['cf_title'].' '.$qaconfig['qa_title'].' 답변 알림 메일'; - $content = conv_content($qa_content, $qa_html); + $content = nl2br(conv_unescape_nl($qa_content)); mailer($config['cf_title'], $admin['mb_email'], $write['qa_email'], $subject, $content, 1); } @@ -333,9 +333,9 @@ if(($w == '' || $w == 'r') && trim($qaconfig['qa_admin_email'])) { include_once(G5_LIB_PATH.'/mailer.lib.php'); $subject = $config['cf_title'].' '.$qaconfig['qa_title'].' 질문 알림 메일'; - $content = conv_content($qa_content, $qa_html); + $content = nl2br(conv_unescape_nl($qa_content)); - mailer($config['cf_title'], $write['qa_email'], $qaconfig['qa_admin_email'], $subject, $content, 1); + mailer($config['cf_title'], $qa_email, $qaconfig['qa_admin_email'], $subject, $content, 1); } if($w == 'a') From 6818e9f66127e994e7ce611c8f2d0b8802d5f0be Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 1 Apr 2014 14:53:07 +0900 Subject: [PATCH 25/29] =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=9A=94=EA=B8=88=EC=A0=9C=20=ED=91=9C=EC=8B=9C=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/sms_admin/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/sms_admin/config.php b/adm/sms_admin/config.php index 0bd8be13d..2c4ddc277 100644 --- a/adm/sms_admin/config.php +++ b/adm/sms_admin/config.php @@ -11,7 +11,7 @@ if (!$config['cf_icode_server_port']) $config['cf_icode_server_port'] = '7295'; if ($config['cf_icode_id'] && $config['cf_icode_pw']) { - $res = get_sock("http://www.icodekorea.com/res/userinfo.php?userid=".$config['cf_icode_id']."&userpw=".$config['cf_icode_pw']); + $res = get_sock('http://www.icodekorea.com/res/userinfo.php?userid='.$config['cf_icode_id'].'&userpw='.$config['cf_icode_pw']); $res = explode(';', $res); $userinfo = array( 'code' => $res[0], // 결과코드 From 23fb25fc17fb1866b385faae56e9d800e2b4a443 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 1 Apr 2014 18:02:44 +0900 Subject: [PATCH 26/29] =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=9A=94=EA=B8=88=EC=A0=95=EB=B3=B4=20=ED=91=9C=EC=8B=9C=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/sms_admin/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/sms_admin/config.php b/adm/sms_admin/config.php index 0bd8be13d..2c4ddc277 100644 --- a/adm/sms_admin/config.php +++ b/adm/sms_admin/config.php @@ -11,7 +11,7 @@ if (!$config['cf_icode_server_port']) $config['cf_icode_server_port'] = '7295'; if ($config['cf_icode_id'] && $config['cf_icode_pw']) { - $res = get_sock("http://www.icodekorea.com/res/userinfo.php?userid=".$config['cf_icode_id']."&userpw=".$config['cf_icode_pw']); + $res = get_sock('http://www.icodekorea.com/res/userinfo.php?userid='.$config['cf_icode_id'].'&userpw='.$config['cf_icode_pw']); $res = explode(';', $res); $userinfo = array( 'code' => $res[0], // 결과코드 From 53636a34538b2147b97c3dbd280a36a918278a8c Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 1 Apr 2014 18:18:04 +0900 Subject: [PATCH 27/29] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20input=20se?= =?UTF-8?q?lect=20label=20=EC=A4=91=EC=8B=AC=20=EB=A7=88=ED=81=AC=EC=97=85?= =?UTF-8?q?=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/move.php | 2 +- bbs/new.php | 2 +- install/install_config.php | 18 +++++++++--------- skin/board/basic/list.skin.php | 2 +- skin/board/basic/view_comment.skin.php | 8 ++++---- skin/board/basic/write.skin.php | 2 +- skin/board/gallery/view_comment.skin.php | 4 ++-- skin/board/gallery/write.skin.php | 4 ++-- skin/new/basic/new.skin.php | 2 +- skin/qa/basic/list.skin.php | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/bbs/move.php b/bbs/move.php index 7dcd73164..8756ced7b 100644 --- a/bbs/move.php +++ b/bbs/move.php @@ -61,7 +61,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) - + 게시판 diff --git a/bbs/new.php b/bbs/new.php index 66a10188b..5c9919e1e 100644 --- a/bbs/new.php +++ b/bbs/new.php @@ -33,7 +33,7 @@ $total_page = ceil($total_count / $rows); // 전체 페이지 계산 if (!$page) $page = 1; // 페이지가 없으면 첫 페이지 (1 페이지) $from_record = ($page - 1) * $rows; // 시작 열을 구함 -$group_select = ' - + diff --git a/skin/board/basic/view_comment.skin.php b/skin/board/basic/view_comment.skin.php index ffe660b87..89991ee1e 100644 --- a/skin/board/basic/view_comment.skin.php +++ b/skin/board/basic/view_comment.skin.php @@ -106,12 +106,12 @@ var char_max = parseInt(); // 최대 - - "> + + " id="wr_name" required class="frm_input required" size="5" maxLength="20"> - - + + diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php index 837133208..f0e7e91e8 100644 --- a/skin/board/basic/write.skin.php +++ b/skin/board/basic/write.skin.php @@ -149,7 +149,7 @@ add_stylesheet('', 0 파일 # - + diff --git a/skin/board/gallery/view_comment.skin.php b/skin/board/gallery/view_comment.skin.php index ffe660b87..894b74a13 100644 --- a/skin/board/gallery/view_comment.skin.php +++ b/skin/board/gallery/view_comment.skin.php @@ -107,11 +107,11 @@ var char_max = parseInt(); // 최대 - "> + "> - + diff --git a/skin/board/gallery/write.skin.php b/skin/board/gallery/write.skin.php index 837133208..898489957 100644 --- a/skin/board/gallery/write.skin.php +++ b/skin/board/gallery/write.skin.php @@ -59,14 +59,14 @@ add_stylesheet('', 0 - + - + class="frm_input " maxlength="20"> diff --git a/skin/new/basic/new.skin.php b/skin/new/basic/new.skin.php index da1e31a75..ac4dea303 100644 --- a/skin/new/basic/new.skin.php +++ b/skin/new/basic/new.skin.php @@ -75,7 +75,7 @@ add_stylesheet('', 0); - + diff --git a/skin/qa/basic/list.skin.php b/skin/qa/basic/list.skin.php index cd1a6dbb4..a06532b6b 100644 --- a/skin/qa/basic/list.skin.php +++ b/skin/qa/basic/list.skin.php @@ -125,7 +125,7 @@ add_stylesheet('', 0);
- +
From b85a7959164ceb20786cf4381712d3261ef91405 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 2 Apr 2014 09:16:55 +0900 Subject: [PATCH 28/29] =?UTF-8?q?=EC=83=81=ED=92=88=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=EC=88=98=20=EA=B4=80=EB=A0=A8=20=EC=BF=A0=ED=82=A4=20=EC=BD=94?= =?UTF-8?q?=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 --- mobile/shop/item.php | 2 +- shop/item.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/shop/item.php b/mobile/shop/item.php index 7ed5b2b78..f905d1d77 100644 --- a/mobile/shop/item.php +++ b/mobile/shop/item.php @@ -54,7 +54,7 @@ if (!$saved) { // 오늘 본 상품 저장 끝 // 조회수 증가 -if ($_COOKIE['ck_it_id'] != $it_id) { +if (get_cookie('ck_it_id') != $it_id) { sql_query(" update {$g5['g5_shop_item_table']} set it_hit = it_hit + 1 where it_id = '$it_id' "); // 1증가 set_cookie("ck_it_id", $it_id, time() + 3600); // 1시간동안 저장 } diff --git a/shop/item.php b/shop/item.php index 266b66e0f..137b8648f 100644 --- a/shop/item.php +++ b/shop/item.php @@ -52,7 +52,7 @@ if (!$saved) { // 오늘 본 상품 저장 끝 // 조회수 증가 -if ($_COOKIE['ck_it_id'] != $it_id) { +if (get_cookie('ck_it_id') != $it_id) { sql_query(" update {$g5['g5_shop_item_table']} set it_hit = it_hit + 1 where it_id = '$it_id' "); // 1증가 set_cookie("ck_it_id", $it_id, time() + 3600); // 1시간동안 저장 } From 13cdf776f5da0d27d502796b50886d4a5dad4543 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 2 Apr 2014 10:54:19 +0900 Subject: [PATCH 29/29] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20input=20se?= =?UTF-8?q?lect=20label=20=EC=A4=91=EC=8B=AC=20=EB=A7=88=ED=81=AC=EC=97=85?= =?UTF-8?q?=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/auth_list.php | 6 +++--- adm/board_list.php | 4 ++-- adm/boardgroup_form.php | 4 ++-- adm/boardgroup_list.php | 18 +++++++++--------- adm/boardgroupmember_form.php | 5 ++++- adm/boardgroupmember_list.php | 16 +++++++--------- adm/config_form.php | 8 ++++---- adm/css/admin.css | 1 + adm/mail_list.php | 3 ++- adm/mail_select_form.php | 12 +++++++----- adm/member_form.php | 25 +++++++++++++++---------- adm/member_list.php | 9 +++++---- adm/menu_form.php | 6 +++--- adm/menu_form_search.php | 4 ++-- adm/menu_list.php | 4 ++-- adm/newwinform.php | 18 +++++++++--------- adm/point_list.php | 5 +++-- adm/poll_list.php | 8 ++++++-- adm/popular_list.php | 8 ++++++-- adm/qa_config.php | 12 ++++++------ adm/sendmail_test.php | 2 +- adm/sms_admin/ajax.sms_write_person.php | 2 +- adm/sms_admin/config.php | 6 +++--- adm/sms_admin/form_group.php | 2 +- adm/sms_admin/form_write.php | 6 +++--- adm/sms_admin/history_view.php | 2 +- adm/sms_admin/num_book.php | 4 ++-- adm/sms_admin/num_book_file.php | 4 ++-- adm/sms_admin/num_book_write.php | 8 ++++---- adm/sms_admin/num_group.php | 4 ++-- adm/sms_admin/sms_write.php | 3 +-- adm/visit_delete.php | 4 ++-- 32 files changed, 121 insertions(+), 102 deletions(-) diff --git a/adm/auth_list.php b/adm/auth_list.php index c0b3269ef..0ec71cc8e 100644 --- a/adm/auth_list.php +++ b/adm/auth_list.php @@ -81,7 +81,7 @@ $colspan = 5; - + 회원아이디 @@ -179,13 +179,13 @@ echo $pagelist; - + - $value) diff --git a/adm/board_list.php b/adm/board_list.php index ea8fd0c94..47be2d2a3 100644 --- a/adm/board_list.php +++ b/adm/board_list.php @@ -62,7 +62,7 @@ $colspan = 15;
- @@ -146,7 +146,7 @@ $colspan = 15; - + diff --git a/adm/boardgroup_form.php b/adm/boardgroup_form.php index 755c26c3c..c27e27178 100644 --- a/adm/boardgroup_form.php +++ b/adm/boardgroup_form.php @@ -59,7 +59,7 @@ include_once('./admin.head.php'); - + - + - - - - - + + + + +
diff --git a/adm/boardgroupmember_form.php b/adm/boardgroupmember_form.php index 9e63df5d6..01df7dcfa 100644 --- a/adm/boardgroupmember_form.php +++ b/adm/boardgroupmember_form.php @@ -79,7 +79,10 @@ $colspan = 4; $s_del = '삭제'; ?> - + + + + diff --git a/adm/boardgroupmember_list.php b/adm/boardgroupmember_list.php index 2c2653631..9c3852ccf 100644 --- a/adm/boardgroupmember_list.php +++ b/adm/boardgroupmember_list.php @@ -57,15 +57,13 @@ $colspan = 7;
- - - - - - - + + + + +
diff --git a/adm/config_form.php b/adm/config_form.php index 5f9ff4d5b..bc37c8cfa 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -505,7 +505,7 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) { - @@ -650,14 +650,14 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) { 점 - + 일 후 자동 삭제 -