firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'g5'

Browse Source
This commit is contained in:
chicpro
2014-03-27 14:06:27 +09:00
parent 485b114629 2065819ab9
commit 007948d6be
12 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/sms_admin/ajax.sms_write_person.php
View File

@ -8,7 +8,7 @@ auth_check($auth[$sub_menu], "r");
$g5['title'] = "휴대폰번호 관리"; $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' "; $sql_group = " and bg_no='$bg_no' ";

2
adm/sms_admin/form_list.php
View File

@ -11,7 +11,7 @@ $token = get_token();
$g5['title'] = "이모티콘 관리"; $g5['title'] = "이모티콘 관리";
if (!$page) $page = 1; if ($page < 1) $page = 1;
if (is_numeric($fg_no)) if (is_numeric($fg_no))
$sql_group = " and fg_no='$fg_no' "; $sql_group = " and fg_no='$fg_no' ";

2
adm/sms_admin/form_update.php
View File

@ -28,7 +28,7 @@ if ($w == 'u') // 업데이트
if ($fg_no != $res['fg_no']) { if ($fg_no != $res['fg_no']) {
if ($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'"); sql_query("update {$g5['sms5_form_group_table']} set fg_count = fg_count + 1 where fg_no='$fg_no'");
} }

2
adm/sms_admin/history_list.php
View File

@ -9,7 +9,7 @@ auth_check($auth[$sub_menu], "r");
$g5['title'] = "문자전송 내역"; $g5['title'] = "문자전송 내역";
if (!$page) $page = 1; if ($page < 1) $page = 1;
if ($st && trim($sv)) if ($st && trim($sv))
$sql_search = " and wr_message like '%$sv%' "; $sql_search = " and wr_message like '%$sv%' ";

2
adm/sms_admin/history_member.php
View File

@ -9,7 +9,7 @@ auth_check($auth[$sub_menu], "r");
$g5['title'] = "문자전송 내역 (회원)"; $g5['title'] = "문자전송 내역 (회원)";
if (!$page) $page = 1; if ($page < 1) $page = 1;
if ($st && trim($sv)) if ($st && trim($sv))
$sql_search = " and $st like '%$sv%' "; $sql_search = " and $st like '%$sv%' ";

2
adm/sms_admin/history_num.php
View File

@ -9,7 +9,7 @@ auth_check($auth[$sub_menu], "r");
$g5['title'] = "문자전송 내역 (번호별)"; $g5['title'] = "문자전송 내역 (번호별)";
if (!$page) $page = 1; if ($page < 1) $page = 1;
if ($st && trim($sv)) if ($st && trim($sv))
$sql_search = " and $st like '%$sv%' "; $sql_search = " and $st like '%$sv%' ";

2
adm/sms_admin/history_send.php
View File

@ -39,7 +39,7 @@ if (!$res['cnt']) {
$sql = sql_query("select * from {$g5['sms5_history_table']} where wr_no='$wr_no' $sql_renum $sql_flag"); $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']) if ($g5['sms5_demo'])
$res['bk_hp'] = '0100000000'; $res['bk_hp'] = '0100000000';

2
adm/sms_admin/history_view.php
View File

@ -12,7 +12,7 @@ $g5['title'] = "문자전송 상세내역";
if (!is_numeric($wr_no)) if (!is_numeric($wr_no))
alert('전송 고유 번호가 없습니다.'); alert('전송 고유 번호가 없습니다.');
if (!$spage) $spage = 1; if ($spage < 1) $spage = 1;
if ($sst && trim($ssv)) if ($sst && trim($ssv))
$sql_search = " and $sst like '%$ssv%' "; $sql_search = " and $sst like '%$ssv%' ";

2
adm/sms_admin/install.php
View File

@ -17,7 +17,7 @@ include_once(G5_ADMIN_PATH.'/admin.head.php');
if( isset($g5['sms5_config_table']) && sql_query(" DESCRIBE {$g5['sms5_config_table']} ", false)) { if( isset($g5['sms5_config_table']) && sql_query(" DESCRIBE {$g5['sms5_config_table']} ", false)) {
if(!$setup){ if(!$setup){
echo '<script> echo '<script>
var answer = confirm("이미 sms5가 설치되어 있습니다.새로 설치 할 경우 db 자료가 망실됩니다. 새로 설치하시겠습니까?"); var answer = confirm("이미 SMS5가 설치되어 있습니다.새로 설치 할 경우 DB 자료가 망실됩니다. 새로 설치하시겠습니까?");
if (answer){ if (answer){
document.hidden_form.setup.value = "1"; document.hidden_form.setup.value = "1";
document.hidden_form.submit(); document.hidden_form.submit();

2
adm/sms_admin/member_update_run.php
View File

@ -71,7 +71,7 @@ while ($res = sql_fetch_array($qry))
if ($bk_receipt) $receipt++; 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'] == '') // 기존에 등록되어 있지 않을 경우 추가 (삭제된 회원이 아닐 경우) else if ($res['mb_leave_date'] == '') // 기존에 등록되어 있지 않을 경우 추가 (삭제된 회원이 아닐 경우)

2
adm/sms_admin/num_book.php
View File

@ -11,7 +11,7 @@ $token = get_token();
$g5['title'] = "휴대폰번호 관리"; $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' "; $sql_group = " and bg_no='$bg_no' ";

2
adm/sms_admin/num_book_update.php
View File

@ -59,7 +59,7 @@ if ($w=='u') // 업데이트
} }
$get_bg_no = $bg_no; $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.'&amp;w='.$w.'&amp;page='.$page;
if( $is_hp_exist ){ //중복된 회원 휴대폰번호가 있다면 if( $is_hp_exist ){ //중복된 회원 휴대폰번호가 있다면
//alert( "중복된 회원 휴대폰번호가 있어서 회원정보에는 반영되지 않았습니다.", $go_url ); //alert( "중복된 회원 휴대폰번호가 있어서 회원정보에는 반영되지 않았습니다.", $go_url );
goto_url($go_url); goto_url($go_url);