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

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

@ -8,9 +8,9 @@ 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' ";
else else
$sql_group = ""; $sql_group = "";

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%' ";

12
adm/sms_admin/history_send.php
View File

@ -15,7 +15,7 @@ $new_wr_renum = $res['wr_renum'] + 1;
if ($w == 'f') if ($w == 'f')
$sql_flag = " and hs_flag=0 "; $sql_flag = " and hs_flag=0 ";
else else
$sql_flag = ""; $sql_flag = "";
if ($wr_renum) 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"); $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';
@ -61,7 +61,7 @@ $reply = str_replace('-', '', trim($write['wr_reply']));
$result = $SMS->Add($list, $reply, '', '', $write['wr_message'], '', $wr_total); $result = $SMS->Add($list, $reply, '', '', $write['wr_message'], '', $wr_total);
if ($result) if ($result)
{ {
$result = $SMS->Send(); $result = $SMS->Send();
@ -73,7 +73,7 @@ if ($result)
$wr_failure = 0; $wr_failure = 0;
$count = 0; $count = 0;
foreach ($SMS->Result as $result) foreach ($SMS->Result as $result)
{ {
list($phone, $code) = explode(":", $result); list($phone, $code) = explode(":", $result);
@ -103,7 +103,7 @@ if ($result)
} }
$wr_failure++; $wr_failure++;
$hs_flag = 0; $hs_flag = 0;
} }
else else
{ {
$hs_code = $code; $hs_code = $code;

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%' ";

12
adm/sms_admin/install.php
View File

@ -16,8 +16,8 @@ include_once(G5_ADMIN_PATH.'/admin.head.php');
//SMS 설정 정보 테이블이 있는지 검사한다. //SMS 설정 정보 테이블이 있는지 검사한다.
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();
@ -43,7 +43,7 @@ if( isset($g5['sms5_config_table']) && sql_query(" DESCRIBE {$g5['sms5_config_ta
</div> </div>
<?php <?php
flush(); usleep(50000); flush(); usleep(50000);
// 테이블 생성 ------------------------------------ // 테이블 생성 ------------------------------------
$file = implode("", file("./sms5.sql")); $file = implode("", file("./sms5.sql"));
@ -57,7 +57,7 @@ for ($i=0; $i<count($f); $i++) {
// 테이블 생성 ------------------------------------ // 테이블 생성 ------------------------------------
echo "<script>document.getElementById('sms5_job_01').innerHTML='전체 테이블 생성 완료';</script>"; echo "<script>document.getElementById('sms5_job_01').innerHTML='전체 테이블 생성 완료';</script>";
flush(); usleep(50000); flush(); usleep(50000);
$read_point = -1; $read_point = -1;
$write_point = 5; $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() . "<p>" . $sql); mysql_query($sql) or die(mysql_error() . "<p>" . $sql);
echo "<script>document.getElementById('sms5_job_02').innerHTML='DB설정 완료';</script>"; echo "<script>document.getElementById('sms5_job_02').innerHTML='DB설정 완료';</script>";
flush(); usleep(50000); flush(); usleep(50000);
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
echo "<script>document.getElementById('sms5_job_03').innerHTML='SMS 기본 설정 변경 후 사용하세요.';</script>"; echo "<script>document.getElementById('sms5_job_03').innerHTML='SMS 기본 설정 변경 후 사용하세요.';</script>";
flush(); usleep(50000); flush(); usleep(50000);
?> ?>
<script>document.getElementById('sms5_btn_next').disabled = false;</script> <script>document.getElementById('sms5_btn_next').disabled = false;</script>

16
adm/sms_admin/member_update_run.php
View File

@ -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"); $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++; $leave++;
else if ($res['mb_hp'] == '') else if ($res['mb_hp'] == '')
$hp_empty++; $hp_empty++;
else if (is_hp($res['mb_hp'])) else if (is_hp($res['mb_hp']))
$hp_yes++ ; $hp_yes++ ;
else else
$hp_no++; $hp_no++;
$hp = get_hp($res['mb_hp']); $hp = get_hp($res['mb_hp']);
@ -45,7 +45,7 @@ while ($res = sql_fetch_array($qry))
$mb_count = $res3['cnt']; $mb_count = $res3['cnt'];
// 회원이 삭제되었다면 휴대폰번호 DB 에서도 삭제한다. // 회원이 삭제되었다면 휴대폰번호 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']}'"); 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 != $res2['bk_receipt']) {
if ($bk_receipt == 1) if ($bk_receipt == 1)
$sql_sms = "bg_receipt = bg_receipt + $mb_count, bg_reject = bg_reject - $mb_count"; $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_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']}'"); sql_query("update {$g5['sms5_book_group_table']} set $sql_sms where bg_no='{$res2['bg_no']}'");
} }
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);