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

g4s merge 충돌수정

Browse Source
This commit is contained in:
chicpro
2013-06-25 16:40:16 +09:00
parent 5cb1c0519e 5bc81f27a9
commit 5ca0975f21
7 changed files with 50 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -12,3 +12,5 @@ rankiss*
thumb.lib.php
test.php
g4s_tree
itzimara*
nemoluv*

5
adm/mail_list.php
View File

@ -19,14 +19,15 @@ $result = sql_query($sql);
$g4['title'] = '회원메일발송';
include_once('./admin.head.php');
$colspan = 6;
$colspan = 7;
?>
<section class="cbox">
<h2>등록된 메일내용 목록</h2>
<p>
<strong>테스트</strong>는 등록된 최고관리자의 이메일로 테스트 메일을 발송합니다.<br>
현재 등록된 메일은 총 <?php echo $total_count ?>건입니다.
현재 등록된 메일은 총 <?php echo $total_count ?>건입니다.<br>
<span class="str_caution">주의) 수신자가 동의하지 않은 대량 메일 발송에는 적합하지 않습니다. 수십건 단위로 발송해 주십시오.</span>
</p>
<div class="btn_add">

79
adm/member_list.php
View File

@ -134,30 +134,30 @@ $colspan = 15;
<table class="tbl_mb_list">
<thead>
<tr>
<th scope="col" rowspan="2">
<th scope="col" rowspan="2" id="mb_list_chk">
<label for="chkall" class="sound_only">회원 전체</label>
<input type="checkbox" name="chkall" value="1" id="chkall" onclick="check_all(this.form)">
</th>
<th scope="col">회원아이디</th>
<th scope="col">이름</th>
<th scope="col">휴대폰</th>
<th scope="col" colspan="6">주소</th>
<th scope="col">최종접속</th>
<th scope="col">포인트</th>
<th scope="col" rowspan="2">관리</th>
<th scope="col" id="mb_list_id">회원아이디</th>
<th scope="col" id="mb_list_name">이름</th>
<th scope="col" id="mb_list_mobile">휴대폰</th>
<th scope="col" colspan="6" id="mb_list_addr">주소</th>
<th scope="col" id="mb_list_lastcall">최종접속</th>
<th scope="col" id="mb_list_point">포인트</th>
<th scope="col" rowspan="2" id="mb_list_mng">관리</th>
</tr>
<tr>
<th scope="col">별명</th>
<th scope="col">상태/권한</th>
<th scope="col">전화번호</th>
<th scope="col">메일<br>인증</th>
<th scope="col">메일<br>수신</th>
<th scope="col">정보<br>공개</th>
<th scope="col">본인<br>확인</th>
<th scope="col">성인<br>인증</th>
<th scope="col">접근<br>차단</th>
<th scope="col">가입일</th>
<th scope="col" title="접근가능한 그룹수">접근그룹</th>
<th scope="col" id="mb_list_nick">별명</th>
<th scope="col" id="mb_list_auth">상태/권한</th>
<th scope="col" id="mb_list_tel">전화번호</th>
<th scope="col" id="mb_list_mailc">메일<br>인증</th>
<th scope="col" id="mb_list_mailr">메일<br>수신</th>
<th scope="col" id="mb_list_open">정보<br>공개</th>
<th scope="col" id="mb_list_selfc">본인<br>확인</th>
<th scope="col" id="mb_list_adultc">성인<br>인증</th>
<th scope="col" id="mb_list_deny">접근<br>차단</th>
<th scope="col" id="mb_list_join">가입일</th>
<th scope="col" id="mb_list_grp">접근그룹</th>
</tr>
</thead>
<tbody>
@ -207,44 +207,41 @@ $colspan = 15;
?>
<tr <?php echo $tr_bg; ?>>
<td class="td_chk" rowspan="2">
<td headers="mb_list_chk" class="td_chk" rowspan="2">
<input type="hidden" name="mb_id[<?php echo $i ?>]" value="<?php echo $row['mb_id'] ?>" id="mb_id_<?php echo $i ?>">
<label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo $row['mb_name']; ?> <?php echo $row['mb_nick']; ?>님</label>
<input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">
</td>
<td class="td_name sv_use"><?php echo $mb_id ?></td>
<td class="td_mbname"><?php echo $row['mb_name']; ?></td>
<td><?php echo $row['mb_hp']; ?></td>
<td colspan="6" class="td_addr"><?php echo $address; ?></td>
<td><?php echo substr($row['mb_today_login'],2,8); ?></td>
<td class="td_bignum"><a href="point_list.php?sfl=mb_id&amp;stx=<?php echo $row['mb_id'] ?>"><?php echo number_format($row['mb_point']) ?></a></td>
<td class="td_smallmng" rowspan="2">
<?php echo $s_mod ?>
<?php echo $s_grp ?>
</td>
<td headers="mb_list_id" class="td_name sv_use"><?php echo $mb_id ?></td>
<td headers="mb_list_name" class="td_mbname"><?php echo $row['mb_name']; ?></td>
<td headers="mb_list_mobile"><?php echo $row['mb_hp']; ?></td>
<td colspan="6" headers="mb_list_addr" class="td_addr"><?php echo $address; ?></td>
<td headers="mb_list_lastcall"><?php echo substr($row['mb_today_login'],2,8); ?></td>
<td headers="mb_list_point" class="td_bignum"><a href="point_list.php?sfl=mb_id&amp;stx=<?php echo $row['mb_id'] ?>"><?php echo number_format($row['mb_point']) ?></a></td>
<td rowspan="2" headers="mb_list_mng"><?php echo $s_mod ?><br><?php echo $s_grp ?></td>
</tr>
<tr <?php echo $tr_bg; ?>>
<td class="td_name sv_use"><div><?php echo $mb_nick ?></div></td>
<td class="">
<td headers="mb_list_nick" class="td_name sv_use"><div><?php echo $mb_nick ?></div></td>
<td headers="mb_list_auth" class="">
<?php
if ($leave_msg || $intercept_msg) echo $leave_msg.' '.$intercept_msg;
else echo "정상";
?>
<?php echo get_member_level_select("mb_level[$i]", 1, $member['mb_level'], $row['mb_level']) ?>
</td>
<td><?php echo $row['mb_tel']; ?></td>
<td class="td_chk"><?php echo preg_match('/[1-9]/', $row['mb_email_certify'])?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>'; ?></td>
<td class="td_chk"><input type="checkbox" name="mb_mailling[<?php echo $i; ?>]" <?php echo $row['mb_mailling']?'checked':''; ?> value="1"></td>
<td class="td_chk"><input type="checkbox" name="mb_open[<?php echo $i; ?>]" <?php echo $row['mb_open']?'checked':''; ?> value="1"></td>
<td class="td_chk"><input type="checkbox" name="mb_hp_certify[<?php echo $i; ?>]" <?php echo $row['mb_hp_certify']?'checked':''; ?> value="1"></td>
<td class="td_chk"><input type="checkbox" name="mb_adult[<?php echo $i; ?>]" <?php echo $row['mb_adult']?'checked':''; ?> value="1"></td>
<td class="td_chk">
<td headers="mb_list_tel"><?php echo $row['mb_tel']; ?></td>
<td headers="mb_list_mailc" class="td_chk"><?php echo preg_match('/[1-9]/', $row['mb_email_certify'])?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>'; ?></td>
<td headers="mb_list_mailr" class="td_chk"><input type="checkbox" name="mb_mailling[<?php echo $i; ?>]" <?php echo $row['mb_mailling']?'checked':''; ?> value="1"></td>
<td headers="mb_list_open" class="td_chk"><input type="checkbox" name="mb_open[<?php echo $i; ?>]" <?php echo $row['mb_open']?'checked':''; ?> value="1"></td>
<td headers="mb_list_selfc" class="td_chk"><input type="checkbox" name="mb_hp_certify[<?php echo $i; ?>]" <?php echo $row['mb_hp_certify']?'checked':''; ?> value="1"></td>
<td headers="mb_list_adultc" class="td_chk"><input type="checkbox" name="mb_adult[<?php echo $i; ?>]" <?php echo $row['mb_adult']?'checked':''; ?> value="1"></td>
<td headers="mb_list_deny" class="td_chk">
<?php if(empty($row['mb_leave_date'])){ ?>
<input type="checkbox" name="mb_intercept_date[<?php echo $i; ?>]" <?php echo $row['mb_intercept_date']?'checked':''; ?> value="<?php echo $intercept_date ?>" id="mb_intercept_date_<?php echo $i ?>" title="<?php echo $intercept_title ?>">
<?php } ?>
</td>
<td><?php echo substr($row['mb_datetime'],2,8); ?></td>
<td class="td_chk"><?php echo $group ?></td>
<td headers="mb_list_join"><?php echo substr($row['mb_datetime'],2,8); ?></td>
<td headers="mb_list_grp" class="td_chk"><?php echo $group ?></td>
</tr>
<?php

3
css/admin.css
View File

@ -387,6 +387,9 @@ fieldset .btn_submit:focus {height:21px;background:#555;line-height:1.7em}
/* 외부서비스 사이트코드 */
.sitecode {display:inline-block;font:bold 15px 'Verdana';vertical-align:middle}
/* 주의문구 */
.str_caution {color:#ff3061}
/* 폼 */
label {vertical-align:middle}
textarea, .frm_input {padding:2px;border:1px solid #ced9de;background:#f6f9fa;vertical-align:middle}

5
css/default.css
View File

@ -158,6 +158,7 @@ button.btn_frmline {font-size:1em}
.basic_tbl thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
.basic_tbl tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff}
.basic_tbl tfoot td {border-color:#666;background:#484848;color:#fff;font-weight:bold;text-align:center}
.basic_tbl tbody th {}
.basic_tbl td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;line-height:1.5em;word-break:break-all}
.basic_tbl a {}
.bo_sideview td {padding:6px 4px} /* 사이드뷰 사용하는 테이블 셀 패딩값 */
@ -171,8 +172,8 @@ td.empty_table {padding:85px 0;text-align:center}
/* 폼 테이블 */
.frm_tbl {margin-bottom:20px;width:100%;border-collapse:collapse;border-spacing:0}
.frm_tbl caption {padding:10px 0;font-weight:bold;text-align:left}
.frm_tbl th {width:100px;padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#f7f7f7;vertical-align:top;text-align:left}
.frm_tbl td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent;vertical-align:top}
.frm_tbl th {width:100px;padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#f7f7f7;text-align:left}
.frm_tbl td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent}
.frm_tbl textarea, .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle}
.frm_input:focus, input.required:focus {padding:3px 3px 4px;border:0;background:#21272e !important;color:#fff}
.frm_tbl textarea {width:98%;height:100px}

1
css/mobile.css
View File

@ -132,6 +132,7 @@ a:active {color:#000;text-decoration:underline}
.basic_tbl thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
.basic_tbl tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff}
.basic_tbl tfoot td {border-color:#666;background:#484848;color:#fff;font-weight:bold;text-align:center}
.basic_tbl tbody th {}
.basic_tbl td {padding:0.5em;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;line-height:1.5em;word-break:break-all}
.basic_tbl a {display:block;padding:0.5em;color:#000;text-decoration:none}
.bo_sideview td {} /* 사이드뷰 사용하는 테이블 셀 패딩값 */

1
plugin/syndi/func/site.func.php
View File

@ -110,7 +110,6 @@ function _Syndi_getNextChannelId($channel_id=null)
$sql .= " order by b.gr_id,b.bo_table limit 1";
$row = sql_fetch($sql);
sql_free_result($result);
return $row['bo_table'];
}