diff --git a/adm/admin.js b/adm/admin.js index 5f3999fd9..a56b3904e 100644 --- a/adm/admin.js +++ b/adm/admin.js @@ -9,15 +9,15 @@ function check_all(f) function btn_check(f, act) { if (act == "update") // 선택수정 - { + { f.action = list_update_php; str = "수정"; - } + } else if (act == "delete") // 선택삭제 - { + { f.action = list_delete_php; str = "삭제"; - } + } else return; @@ -30,7 +30,7 @@ function btn_check(f, act) bchk = true; } - if (!bchk) + if (!bchk) { alert(str + "할 자료를 하나 이상 선택하세요."); return; @@ -45,7 +45,7 @@ function btn_check(f, act) f.submit(); } -function is_checked(elements_name) +function is_checked(elements_name) { var checked = false; var chk = document.getElementsByName(elements_name); @@ -56,3 +56,12 @@ function is_checked(elements_name) } return checked; } + + +function delete_confirm() +{ + if(confirm("한번 삭제한 자료는 복구할 방법이 없습니다.\n\n정말 삭제하시겠습니까?")) + return true; + else + return false; +} \ No newline at end of file diff --git a/adm/admin.menu400.shop_1of2.php b/adm/admin.menu400.shop_1of2.php index afbdfc4b8..1af40089b 100644 --- a/adm/admin.menu400.shop_1of2.php +++ b/adm/admin.menu400.shop_1of2.php @@ -1,4 +1,6 @@ 쇼핑몰 설치 후 이용해 주십시오.

'); + include_once(G4_ADMIN_PATH.'/admin.lib.php'); ?> diff --git a/adm/shop_admin/bannerlist.php b/adm/shop_admin/bannerlist.php index ee7b4f7bd..1de32a582 100644 --- a/adm/shop_admin/bannerlist.php +++ b/adm/shop_admin/bannerlist.php @@ -83,7 +83,7 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함 배너수정 - 배너삭제 + 배너삭제 diff --git a/adm/shop_admin/categorylist.php b/adm/shop_admin/categorylist.php index 81ebad9bf..d637df086 100644 --- a/adm/shop_admin/categorylist.php +++ b/adm/shop_admin/categorylist.php @@ -135,7 +135,7 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌 $s_vie = ''.get_text($row['ca_name']).' 이동'; if ($is_admin == 'super') - $s_del = ''.get_text($row['ca_name']).' 삭제'; + $s_del = ''.get_text($row['ca_name']).' 삭제'; // 해당 분류에 속한 상품의 갯수 $sql1 = " select COUNT(*) as cnt from {$g4['shop_item_table']} diff --git a/adm/shop_admin/contentlist.php b/adm/shop_admin/contentlist.php index 86a0be9c7..42e964d95 100644 --- a/adm/shop_admin/contentlist.php +++ b/adm/shop_admin/contentlist.php @@ -48,7 +48,7 @@ $result = sql_query($sql); <?=htmlspecialchars2($row['co_subject'])?> 보기 <?=htmlspecialchars2($row['co_subject'])?> 수정 - <?=htmlspecialchars2($row['co_subject'])?> 삭제 + <?=htmlspecialchars2($row['co_subject'])?> 삭제 <?=stripslashes($row['dl_company'])?> 홈페이지 <?=stripslashes($row['dl_company'])?> 수정 - <?=stripslashes($row['dl_company'])?> 삭제 + <?=stripslashes($row['dl_company'])?> 삭제 <?=stripslashes($row['fm_subject']) ?> 보기 <?=stripslashes($row['fm_subject']) ?> 수정 - <?=stripslashes($row['fm_subject']) ?> 삭제 + <?=stripslashes($row['fm_subject']) ?> 삭제 <?=$row['ev_subject']?> 보기 <?=$row['ev_subject']?> 수정 - <?=$row['ev_subject']?> 삭제 + <?=$row['ev_subject']?> 삭제 @@ -66,7 +66,7 @@ $result = sql_query($sql); } if ($i == 0) { - echo '자료가 없습니다.'; + echo '자료가 없습니다.'; } ?> diff --git a/adm/shop_admin/itemlist.php b/adm/shop_admin/itemlist.php index 20bec003a..d589576ee 100644 --- a/adm/shop_admin/itemlist.php +++ b/adm/shop_admin/itemlist.php @@ -193,7 +193,7 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌 <?=htmlspecialchars2(cut_str($row['it_name'],250, 보기"> <?=htmlspecialchars2(cut_str($row['it_name'],250, 복사"> <?=htmlspecialchars2(cut_str($row['it_name'],250, 수정"> - <?=htmlspecialchars2(cut_str($row['it_name'],250, 삭제"> + <?=htmlspecialchars2(cut_str($row['it_name'],250, 삭제"> diff --git a/adm/shop_admin/itempslist.php b/adm/shop_admin/itempslist.php index e3017db60..c047b621e 100644 --- a/adm/shop_admin/itempslist.php +++ b/adm/shop_admin/itempslist.php @@ -136,7 +136,7 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌 <?=$row['is_subject']?> 수정 - <?=$row['is_subject']?> 삭제 + <?=$row['is_subject']?> 삭제 diff --git a/adm/shop_admin/newwinlist.php b/adm/shop_admin/newwinlist.php index 43bbad44c..215dfc501 100644 --- a/adm/shop_admin/newwinlist.php +++ b/adm/shop_admin/newwinlist.php @@ -53,7 +53,7 @@ $result = sql_query($sql); px <?=$row['nw_subject']?> 수정 - <?=$row['nw_subject']?> 삭제 + <?=$row['nw_subject']?> 삭제 <?=$lines[$i]['od_id']?> 수정 - <?=$lines[$i]['od_id']?> 삭제 + <?=$lines[$i]['od_id']?> 삭제 주문 수정 - 주문 삭제 + 주문 삭제 diff --git a/adm/shop_admin/ordersms.inc.php b/adm/shop_admin/ordersms.inc.php index 827d5a6db..dee83815c 100644 --- a/adm/shop_admin/ordersms.inc.php +++ b/adm/shop_admin/ordersms.inc.php @@ -9,7 +9,7 @@ if ($od_sms_ipgum_check) { if ($od_bank_account && $od_receipt_bank && $od_deposit_name) { - $sms_contents = $default['de_sms_cont3']; + $sms_contents = $default['de_sms_cont4']; $sms_contents = preg_replace("/{이름}/", $od_name, $sms_contents); $sms_contents = preg_replace("/{입금액}/", number_format($od_receipt_bank), $sms_contents); $sms_contents = preg_replace("/{주문번호}/", $od_id, $sms_contents); @@ -19,7 +19,7 @@ if ($od_sms_ipgum_check) { $SMS = new SMS; $SMS->SMS_con($default['de_icode_server_ip'], $default['de_icode_id'], $default['de_icode_pw'], $default['de_icode_server_port']); - $SMS->Add($receive_number, $send_number, $default['de_icode_id'], stripslashes($sms_contents), ""); + $SMS->Add($receive_number, $send_number, $default['de_icode_id'], iconv("utf-8", "euc-kr", stripslashes($sms_contents)), ""); $SMS->Send(); } } @@ -29,7 +29,7 @@ if ($od_sms_baesong_check) { if ($dl_id && $od_invoice) { - $sms_contents = $default['de_sms_cont4']; + $sms_contents = $default['de_sms_cont5']; $sms_contents = preg_replace("/{이름}/", $od_name, $sms_contents); $sql = " select dl_company from $g4[shop_delivery_table] where dl_id = '$dl_id' "; $row = sql_fetch($sql); @@ -42,7 +42,7 @@ if ($od_sms_baesong_check) { $SMS = new SMS; $SMS->SMS_con($default['de_icode_server_ip'], $default['de_icode_id'], $default['de_icode_pw'], $default['de_icode_server_port']); - $SMS->Add($receive_number, $send_number, $default['de_icode_id'], stripslashes($sms_contents), ""); + $SMS->Add($receive_number, $send_number, $default['de_icode_id'], iconv("utf-8", "euc-kr", stripslashes($sms_contents)), ""); $SMS->Send(); } } diff --git a/adm/shop_admin/smssendicode.php b/adm/shop_admin/smssendicode.php index 935bee14e..b92f9a1b3 100644 --- a/adm/shop_admin/smssendicode.php +++ b/adm/shop_admin/smssendicode.php @@ -15,7 +15,7 @@ $recv = explode("\n", $receive_number); $tran_callback = preg_replace("/[^0-9]/", "", $send_number); $sms_id = $default['de_icode_id']; -$tran_msg = $sms_contents; +$tran_msg = iconv("utf-8", "euc-kr", stripslashes($sms_contents)); $tran_date = ""; if ($reserved_flag) // 예약전송 { @@ -30,7 +30,7 @@ for($i=0; $iAdd($tran_phone, $tran_callback, $sms_id, stripslashes($tran_msg), $tran_date); + $result = $SMS->Add($tran_phone, $tran_callback, $sms_id, $tran_msg, $tran_date); } $result = $SMS->Send(); if ($result) diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index 036176500..024a6a6a3 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -296,26 +296,41 @@ include_once(G4_SHOP_PATH.'/ordermail1.inc.php'); include_once(G4_SHOP_PATH.'/ordermail2.inc.php'); // SMS BEGIN -------------------------------------------------------- -// 쇼핑몰 운영자가 수신자가 됨 -$receive_number = preg_replace("/[^0-9]/", "", $default['de_sms_hp']); // 수신자번호 -$send_number = preg_replace("/[^0-9]/", "", $od_hp); // 발신자번호 +// 주문고객과 쇼핑몰관리자에게 SMS 전송 +if($default['de_sms_use2'] || $default['de_sms_use3']) { + $sms_contents = array($default['de_sms_cont2'], $default['de_sms_cont3']); + $recv_numbers = array($od_hp, $default['de_sms_hp']); + $send_numbers = array($default['de_admin_company_tel'], $od_hp); -$sms_contents = $default['de_sms_cont2']; -$sms_contents = preg_replace("/{이름}/", $od_name, $sms_contents); -$sms_contents = preg_replace("/{보낸분}/", $od_name, $sms_contents); -$sms_contents = preg_replace("/{받는분}/", $od_b_name, $sms_contents); -$sms_contents = preg_replace("/{주문번호}/", $od_id, $sms_contents); -$sms_contents = preg_replace("/{주문금액}/", number_format($ttotal_amount), $sms_contents); -$sms_contents = preg_replace("/{회원아이디}/", $member['mb_id'], $sms_contents); -$sms_contents = preg_replace("/{회사명}/", $default['de_admin_company_name'], $sms_contents); - -if ($default['de_sms_use2'] && $receive_number) -{ include_once(G4_LIB_PATH.'/icode.sms.lib.php'); + $SMS = new SMS; // SMS 연결 $SMS->SMS_con($default['de_icode_server_ip'], $default['de_icode_id'], $default['de_icode_pw'], $default['de_icode_server_port']); - $SMS->Add($receive_number, $send_number, $default['de_icode_id'], stripslashes($sms_contents), ""); - $SMS->Send(); + $sms_count = 0; + + for($s=0; $sAdd($recv_number, $send_number, $default['de_icode_id'], iconv("utf-8", "euc-kr", stripslashes($sms_content)), ""); + $sms_count++; + } + } + + if($sms_count > 0) + $SMS->Send(); } // SMS END --------------------------------------------------------