diff --git a/adm/sms_admin/ajax.hp_chk.php b/adm/sms_admin/ajax.hp_chk.php index 8fe487d00..b1c303565 100644 --- a/adm/sms_admin/ajax.hp_chk.php +++ b/adm/sms_admin/ajax.hp_chk.php @@ -10,9 +10,7 @@ if( !function_exists('json_encode') ) { } } -if( $auth_check = ajax_auth_check($auth[$sub_menu], "r") ){ - die("{\"error\":\"$auth_check\"}"); -} +ajax_auth_check($auth[$sub_menu], "r"); $err = ''; $arr_ajax_msg = array(); diff --git a/adm/sms_admin/ajax.sms_write_form.php b/adm/sms_admin/ajax.sms_write_form.php index 740ca3c46..e82a01cef 100644 --- a/adm/sms_admin/ajax.sms_write_form.php +++ b/adm/sms_admin/ajax.sms_write_form.php @@ -10,9 +10,7 @@ if( !function_exists('json_encode') ) { } } -if( $auth_check = ajax_auth_check($auth[$sub_menu], "r") ){ - die("{\"error\":\"$auth_check\"}"); -} +ajax_auth_check($auth[$sub_menu], "r"); $page_size = 6; diff --git a/adm/sms_admin/ajax.sms_write_level.php b/adm/sms_admin/ajax.sms_write_level.php index d5521efcc..90684c5b2 100644 --- a/adm/sms_admin/ajax.sms_write_level.php +++ b/adm/sms_admin/ajax.sms_write_level.php @@ -10,9 +10,7 @@ if( !function_exists('json_encode') ) { } } -if( $auth_check = ajax_auth_check($auth[$sub_menu], "r") ){ - die("{\"error\":\"$auth_check\"}"); -} +ajax_auth_check($auth[$sub_menu], "r"); $lev = array(); diff --git a/adm/sms_admin/ajax.sms_write_person.php b/adm/sms_admin/ajax.sms_write_person.php index 57c76d126..686f4a8fa 100644 --- a/adm/sms_admin/ajax.sms_write_person.php +++ b/adm/sms_admin/ajax.sms_write_person.php @@ -5,9 +5,7 @@ include_once("./_common.php"); $page_size = 10; $colspan = 5; -if( $auth_check = ajax_auth_check($auth[$sub_menu], "r") ){ - die("{\"error\":\"$auth_check\"}"); -} +auth_check($auth[$sub_menu], "r"); $g5['title'] = "휴대폰번호 관리"; diff --git a/adm/sms_admin/member_update_run.php b/adm/sms_admin/member_update_run.php index 8d24ff329..323cbc9e0 100644 --- a/adm/sms_admin/member_update_run.php +++ b/adm/sms_admin/member_update_run.php @@ -10,7 +10,11 @@ if( !function_exists('json_encode') ) { } } -auth_check($auth[$sub_menu], "w"); +if( $mtype == "json" ){ + ajax_auth_check($auth[$sub_menu], "w"); +} else { + auth_check($auth[$sub_menu], "w"); +} $count = 0; $hp_yes = 0; diff --git a/adm/sms_admin/sms_write.php b/adm/sms_admin/sms_write.php index 4123546d9..c43d3d502 100644 --- a/adm/sms_admin/sms_write.php +++ b/adm/sms_admin/sms_write.php @@ -452,7 +452,7 @@ hp_list.options[hp_list.length] = new Option(item, value); @@ -472,7 +472,7 @@ if ($wr_no) echo "var hp_list = document.getElementById('hp_list');\n"; //echo "add(\"$row[wr_message]\");\n"; $wr_message = str_replace('"', '\"', $row['wr_message']); - $wr_message = str_replace("\r\n", "\\n", $wr_message); + $wr_message = str_replace(array("\r\n","\n"), "\\n", $wr_message); echo "add(\"$wr_message\");\n"; echo "document.getElementById('wr_reply').value = '{$row['wr_reply']}';\n"; diff --git a/adm/sms_admin/sms_write_send.php b/adm/sms_admin/sms_write_send.php index 6eb1770e9..d11a5b0fd 100644 --- a/adm/sms_admin/sms_write_send.php +++ b/adm/sms_admin/sms_write_send.php @@ -134,7 +134,7 @@ $SMS = new SMS5; $SMS->SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']); $reply = str_replace('-', '', trim($wr_reply)); -$wr_message = str_replace('\r\n', PHP_EOL, $wr_message); // common.php 에서 mysql_real_escape_string 함수로 인해 수정 +$wr_message = conv_unescape_nl($wr_message); $result = $SMS->Add($list, $reply, '', '', $wr_message, $booking, $wr_total); @@ -200,7 +200,7 @@ if ($result) $log = array_shift($SMS->Log); - sql_query("insert into {$g5['sms5_history_table']} set wr_no='$wr_no', wr_renum=0, bg_no='{$row['bg_no']}', mb_id='{$row['mb_id']}', bk_no='{$row['bk_no']}', hs_name='".addslashes($row['bk_name'])."', hs_hp='{$row['bk_hp']}', hs_datetime='".G5_TIME_YMDHIS."', hs_flag='$hs_flag', hs_code='$hs_code', hs_memo='".addslashes($hs_memo)."', hs_log='".addslashes(stripslashes($log))."'"); + sql_query("insert into {$g5['sms5_history_table']} set wr_no='$wr_no', wr_renum=0, bg_no='{$row['bg_no']}', mb_id='{$row['mb_id']}', bk_no='{$row['bk_no']}', hs_name='".addslashes($row['bk_name'])."', hs_hp='{$row['bk_hp']}', hs_datetime='".G5_TIME_YMDHIS."', hs_flag='$hs_flag', hs_code='$hs_code', hs_memo='".addslashes($hs_memo)."', hs_log='".addslashes($log)."'"); } $SMS->Init(); // 보관하고 있던 결과값을 지웁니다. diff --git a/plugin/sms5/sms5.lib.php b/plugin/sms5/sms5.lib.php index 5185bbb14..ea587384a 100644 --- a/plugin/sms5/sms5.lib.php +++ b/plugin/sms5/sms5.lib.php @@ -68,19 +68,19 @@ function ajax_auth_check($auth, $attr) if ($is_admin == 'super') return; if (!trim($auth)) - return '이 메뉴에는 접근 권한이 없습니다.\\n\\n접근 권한은 최고관리자만 부여할 수 있습니다.'; + die("{\"error\":\"이 메뉴에는 접근 권한이 없습니다.\\n\\n접근 권한은 최고관리자만 부여할 수 있습니다.\"}"); $attr = strtolower($attr); if (!strstr($auth, $attr)) { if ($attr == 'r') - return '읽을 권한이 없습니다.'; + die("{\"error\":\"읽을 권한이 없습니다.\"}"); else if ($attr == 'w') - return '입력, 추가, 생성, 수정 권한이 없습니다.'; + die("{\"error\":\"입력, 추가, 생성, 수정 권한이 없습니다.\"}"); else if ($attr == 'd') - return '삭제 권한이 없습니다.'; + die("{\"error\":\"삭제 권한이 없습니다.\"}"); else - return '속성이 잘못 되었습니다.'; + die("{\"error\":\"속성이 잘못 되었습니다.\"}"); } } diff --git a/plugin/sms5/write_update.php b/plugin/sms5/write_update.php index ec105c3b0..a25e50b7b 100644 --- a/plugin/sms5/write_update.php +++ b/plugin/sms5/write_update.php @@ -91,7 +91,8 @@ if ($mh_by && $mh_bm && $mh_bd && $mh_bh && $mh_bi) { $SMS = new SMS5; $SMS->SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']); -$wr_message = str_replace('\r\n', PHP_EOL, $wr_message); // common.php 에서 mysql_real_escape_string 함수로 인해 수정 +$mh_message = conv_unescape_nl($mh_message); + $result = $SMS->Add($mh_hp, $mh_reply, '', '', $mh_message, $booking, $total); $is_success = null;