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

merge 충돌 처리

Browse Source
This commit is contained in:
whitedot
2013-06-13 11:31:56 +09:00
parent c0d2b4ca7d
commit 80c20cc73f
36 changed files with 399 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
adm/admin.head.php
View File

@ -118,26 +118,26 @@ function imageview(id, w, h)
<ul id="qnb">
<?php if(defined('G4_USE_SHOP')) { ?>
<li>
<a href="<?=G4_ADMIN_URL?>/shop_admin/orderlist.php">
<img src="<?=G4_ADMIN_URL?>/shop_admin/img/qnb_sodr.jpg" alt="" width="40" height="40">
<a href="<?php echo G4_ADMIN_URL; ?>/shop_admin/orderlist.php">
<img src="<?php echo G4_ADMIN_URL; ?>/shop_admin/img/qnb_sodr.jpg" alt="" width="40" height="40">
주문관리
</a>
</li>
<li>
<a href="<?=G4_ADMIN_URL?>/shop_admin/itemlist.php">
<img src="<?=G4_ADMIN_URL?>/shop_admin/img/qnb_sit.jpg" alt="" width="40" height="40">
<a href="<?php echo G4_ADMIN_URL; ?>/shop_admin/itemlist.php">
<img src="<?php echo G4_ADMIN_URL; ?>/shop_admin/img/qnb_sit.jpg" alt="" width="40" height="40">
상품관리
</a>
</li>
<li>
<a href="<?=G4_ADMIN_URL?>/shop_admin/itemqalist.php">
<img src="<?=G4_ADMIN_URL?>/shop_admin/img/qnb_sqna.jpg" alt="" width="40" height="40">
<a href="<?php echo G4_ADMIN_URL; ?>/shop_admin/itemqalist.php">
<img src="<?php echo G4_ADMIN_URL; ?>/shop_admin/img/qnb_sqna.jpg" alt="" width="40" height="40">
상품문의
</a>
</li>
<li>
<a href="<?=G4_ADMIN_URL?>/shop_admin/itempslist.php">
<img src="<?=G4_ADMIN_URL?>/shop_admin/img/qnb_sps.jpg" alt="" width="40" height="40">
<a href="<?php echo G4_ADMIN_URL; ?>/shop_admin/itempslist.php">
<img src="<?php echo G4_ADMIN_URL; ?>/shop_admin/img/qnb_sps.jpg" alt="" width="40" height="40">
사용후기
</a>
</li>

2
adm/admin.menu400.shop_1of2.php
View File

@ -1,4 +1,4 @@
<?
<?php
if (!defined('G4_USE_SHOP') || !G4_USE_SHOP) return;
$menu['menu400'] = array (

2
adm/admin.menu500.shop_2of2.php
View File

@ -1,4 +1,4 @@
<?
<?php
if (!defined('G4_USE_SHOP') || !G4_USE_SHOP) return;
$menu['menu500'] = array (

17
adm/auth_list.php
View File

@ -73,6 +73,11 @@ $colspan = 5;
<h2>설정된 관리권한 내역</h2>
<p>권한 <strong>r</strong>은 읽기권한, <strong>w</strong>는 쓰기권한, <strong>d</strong>는 삭제권한입니다.</p>
<ul class="sort_odr">
<li><?php echo subject_sort_link('a.mb_id') ?>회원아이디<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('mb_nick') ?>별명<span class="sound_only"> 순 정렬</span></a></li>
</ul>
<form name="fauthlist" id="fauthlist" method="post" action="./auth_list_delete.php" onsubmit="return fauthlist_submit(this);">
<input type="hidden" name="sst" value="<?php echo $sst ?>">
<input type="hidden" name="sod" value="<?php echo $sod ?>">
@ -83,9 +88,12 @@ $colspan = 5;
<table>
<thead>
<tr>
<th scope="col"><input type="checkbox" name="chkall" value="1" id="chkall" title="현재 페이지 권한설정 내역 전체선택" onclick="check_all(this.form)"></th>
<th scope="col"><?php echo subject_sort_link('a.mb_id') ?>회원아이디</a></th>
<th scope="col"><?php echo subject_sort_link('mb_nick') ?>별명</a></th>
<th scope="col">
<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">권한</th>
</tr>
@ -109,7 +117,8 @@ $colspan = 5;
<td class="td_chk">
<input type="hidden" name="au_menu[<?php echo $i ?>]" value="<?php echo $row['au_menu'] ?>">
<input type="hidden" name="mb_id[<?php echo $i ?>]" value="<?php echo $row['mb_id'] ?>">
<input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>" title="<?php echo $row['mb_nick'] ?>님의 권한체크">
<label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo $row['mb_nick'] ?>님 권한</label>
<input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">
</td>
<td class="td_mbid"><a href="?sfl=a.mb_id&amp;stx=<?php echo $row['mb_id'] ?>"><?php echo $row['mb_id'] ?></a></td>
<td class="td_auth_mbnick"><?php echo $mb_nick ?></td>

40
adm/board_list.php
View File

@ -79,11 +79,23 @@ $colspan = 15;
<p>여러개의 게시판 설정을 한번에 바꾸실 때는 게시판 체크기능을 이용하세요.</p>
<?php if ($is_admin == 'super') { ?>
<div id="btn_add">
<div class="btn_add sort_with">
<a href="./board_form.php" id="bo_add">게시판 추가</a>
</div>
<?php } ?>
<ul class="sort_odr">
<li><?php echo subject_sort_link('a.gr_id') ?>그룹<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('bo_table') ?>TABLE<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('bo_skin', '', 'desc') ?>스킨<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('bo_mobile_skin', '', 'desc') ?>모바일<span class="sound_only"> 스킨 순 정렬</span></a></li>
<li><?php echo subject_sort_link('bo_subject') ?>제목<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('bo_use_sns') ?>SNS<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('bo_use_search') ?>검색사용<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('bo_show_menu') ?>메뉴보임<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('bo_order') ?>출력순서<span class="sound_only"> 순 정렬</span></a></li>
</ul>
<form name="fboardlist" id="fboardlist" action="./board_list_update.php" onsubmit="return fboardlist_submit(this);" method="post">
<input type="hidden" name="sst" value="<?php echo $sst ?>">
<input type="hidden" name="sod" value="<?php echo $sod ?>">
@ -94,20 +106,23 @@ $colspan = 15;
<table class="tbl_bo_list">
<thead>
<tr>
<th scope="col"><input type="checkbox" name="chkall" value="1" id="chkall" title="현재 페이지 게시판 전체선택" onclick="check_all(this.form)"></th>
<th scope="col"><?php echo subject_sort_link('a.gr_id') ?>그룹</a></th>
<th scope="col"><?php echo subject_sort_link('bo_table') ?>TABLE</a></th>
<th scope="col"><?php echo subject_sort_link('bo_skin', '', 'desc') ?>스킨</a></th>
<th scope="col"><?php echo subject_sort_link('bo_mobile_skin', '', 'desc') ?>모바일<br>스킨</a></th>
<th scope="col"><?php echo subject_sort_link('bo_subject') ?>제목</a></th>
<th scope="col">
<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">TABLE</th>
<th scope="col">스킨</th>
<th scope="col">모바일<br>스킨</th>
<th scope="col">제목</th>
<th scope="col">읽기P<span class="sound_only">포인트</span></th>
<th scope="col">쓰기P<span class="sound_only">포인트</span></th>
<th scope="col">댓글P<span class="sound_only">포인트</span></th>
<th scope="col">다운P<span class="sound_only">포인트</span></th>
<th scope="col"><?php echo subject_sort_link('bo_use_sns') ?>SNS<br>사용</a></th>
<th scope="col"><?php echo subject_sort_link('bo_use_search') ?>검색<br>사용</a></th>
<th scope="col"><?php echo subject_sort_link('bo_show_menu') ?>메뉴<br>보임</a></th>
<th scope="col"><?php echo subject_sort_link('bo_order') ?>출력<br>순서</a></th>
<th scope="col">SNS<br>사용</th>
<th scope="col">검색<br>사용</th>
<th scope="col">메뉴<br>보임</th>
<th scope="col">출력<br>순서</th>
<th scope="col">접속기기</th>
<th scope="col">관리</th>
</tr>
@ -121,7 +136,8 @@ $colspan = 15;
<tr>
<td>
<input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>" title="<?php echo get_text($row['bo_subject']) ?> 게시판선택">
<label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo get_text($row['bo_subject']) ?></label>
<input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">
</td>
<td>
<?php if ($is_admin == 'super'){ ?>

25
adm/boardgroup_list.php
View File

@ -86,11 +86,18 @@ $colspan = 8;
</p>
<?php if ($is_admin == 'super') { ?>
<div id="btn_add">
<div class="btn_add sort_with">
<a href="./boardgroup_form.php" id="bo_gr_add">게시판그룹 추가</a>
</div>
<?php } ?>
<ul class="sort_odr">
<li><?php echo subject_sort_link('gr_id') ?>그룹아이디<span class="sound_only"> 순 정렬</span></a></th>
<li><?php echo subject_sort_link('gr_subject') ?>제목<span class="sound_only"> 순 정렬</span></a></th>
<?php if ($is_admin == 'super'){ ?><li><?php echo subject_sort_link('gr_admin') ?>그룹관리자<span class="sound_only"> 순 정렬</span></a></th><?php } ?>
<li><?php echo subject_sort_link('gr_order') ?>출력순서<span class="sound_only"> 순 정렬</span></a></th>
</ul>
<form name="fboardgrouplist" id="fboardgrouplist" action="./boardgroup_list_update.php" onsubmit="return fboardgrouplist_submit(this);" method="post">
<input type="hidden" name="sst" value="<?php echo $sst ?>">
<input type="hidden" name="sod" value="<?php echo $sod ?>">
@ -102,15 +109,18 @@ $colspan = 8;
<table class="tbl_gr_list">
<thead>
<tr>
<th scope="col"><input type="checkbox" name="chkall" value="1" id="chkall" title="현재 페이지 그룹 전체선택" onclick="check_all(this.form)"></th>
<th scope="col"><?php echo subject_sort_link('gr_id') ?>그룹아이디</a></th>
<th scope="col"><?php echo subject_sort_link('gr_subject') ?>제목</a></th>
<?php if ($is_admin == 'super'){ ?><th scope="col"><?php echo subject_sort_link('gr_admin') ?>그룹관리자</a></th><?php } ?>
<th scope="col">
<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>
<?php if ($is_admin == 'super'){ ?><th scope="col">그룹관리자</th><?php } ?>
<th scope="col">게시판<br>갯수</th>
<th scope="col">접근<br>사용</th>
<th scope="col">접근<br>회원수</th>
<th scope="col">메뉴<br>보임</th>
<th scope="col"><?php echo subject_sort_link('gr_order') ?>출력<br>순서</a></th>
<th scope="col">출력<br>순서</th>
<th scope="col">접속기기</th>
<th scope="col">관리</th>
</tr>
@ -132,8 +142,9 @@ $colspan = 8;
<tr>
<td class="td_chk">
<input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>" title="<?php echo $row['gr_subject'] ?> 그룹선택">
<input type="hidden" name="group_id[<?php echo $i ?>]" value="<?php echo $row['gr_id'] ?>">
<label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo $row['gr_subject'] ?> 그룹</label>
<input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">
</td>
<td class="td_grid"><a href="<?php echo G4_BBS_URL ?>/group.php?gr_id=<?php echo $row['gr_id'] ?>"><?php echo $row['gr_id'] ?></a></td>
<td>

31
adm/boardgroupmember_list.php
View File

@ -70,7 +70,16 @@ $colspan = 7;
</form>
<section class="cbox">
<h2><?php echo $gr['gr_subject'] ?> 그룹에 접근가능한 회원 목록 (그룹아이디:<?php echo $gr['gr_id'] ?>)</h2>
<h2><?php echo $gr['gr_subject'] ?> 그룹 접근가능 회원 목록 (그룹아이디:<?php echo $gr['gr_id'] ?>)</h2>
<ul class="sort_odr">
<li><?php echo subject_sort_link('b.mb_id', 'gr_id='.$gr_id) ?>회원아이디<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('b.mb_name', 'gr_id='.$gr_id) ?>이름<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('b.mb_nick', 'gr_id='.$gr_id) ?>별명<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('b.mb_today_login', 'gr_id='.$gr_id) ?>최종접속<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('a.gm_datetime', 'gr_id='.$gr_id) ?>처리일시<span class="sound_only"> 순 정렬</span></a></li>
</ul>
<form name="fboardgroupmember" id="fboardgroupmember" action="./boardgroupmember_update.php" onsubmit="return fboardgroupmember_submit(this);" method="post">
<input type="hidden" name="sst" value="<?php echo $sst ?>">
<input type="hidden" name="sod" value="<?php echo $sod ?>">
@ -83,13 +92,16 @@ $colspan = 7;
<table>
<thead>
<tr>
<th scope="col"><input type="checkbox" name="chkall" value="1" id="chkall" title="현재 페이지 접근가능회원 전체선택" onclick="check_all(this.form)"></th>
<th scope="col">
<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"><?php echo subject_sort_link('b.mb_id', 'gr_id='.$gr_id) ?>회원아이디</a></th>
<th scope="col"><?php echo subject_sort_link('b.mb_name', 'gr_id='.$gr_id) ?>이름</a></th>
<th scope="col"><?php echo subject_sort_link('b.mb_nick', 'gr_id='.$gr_id) ?>별명</a></th>
<th scope="col"><?php echo subject_sort_link('b.mb_today_login', 'gr_id='.$gr_id) ?>최종접속</a></th>
<th scope="col"><?php echo subject_sort_link('a.gm_datetime', 'gr_id='.$gr_id) ?>처리일시</a></th>
<th scope="col">회원아이디</th>
<th scope="col">이름</th>
<th scope="col">별명</th>
<th scope="col">최종접속</th>
<th scope="col">처리일시</th>
</tr>
</thead>
<tbody>
@ -108,7 +120,10 @@ $colspan = 7;
$mb_nick = get_sideview($row['mb_id'], $row['mb_nick'], $row['mb_email'], $row['mb_homepage']);
?>
<tr>
<td class="td_chk"><input type="checkbox" name="chk[]" value="<?php echo $row['gm_id'] ?>" id="chk_<?php echo $i ?>" title="<?php echo $row['mb_nick'] ?> 회원 선택"></td>
<td class="td_chk">
<label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo $row['mb_nick'] ?> 회원</label>
<input type="checkbox" name="chk[]" value="<?php echo $row['gm_id'] ?>" id="chk_<?php echo $i ?>">
</td>
<td class="td_grid"><?php echo $group ?></td>
<td class="td_mbid"><?php echo $row['mb_id'] ?></td>
<td class="td_mbname"><?php echo $row['mb_name'] ?></td>

2
adm/mail_list.php
View File

@ -29,7 +29,7 @@ $colspan = 6;
현재 등록된 메일은 총 <?php echo $total_count ?>건입니다.
</p>
<div id="btn_add">
<div class="btn_add">
<a href="./mail_form.php" id="mail_add">메일내용추가</a>
</div>

2
adm/mail_select_list.php
View File

@ -108,7 +108,7 @@ include_once('./admin.head.php');
<?php } ?>
</tbody>
</table>
<textarea name="ma_list" style="display:none"><?=$ma_list?></textarea>
<textarea name="ma_list" style="display:none"><?php echo $ma_list; ?></textarea>
</div>
<div class="btn_confirm">

51
adm/member_list.php
View File

@ -103,11 +103,27 @@ $colspan = 15;
<p>회원자료 삭제 시 다른 회원이 기존 회원아이디를 사용하지 못하도록 회원아이디, 이름, 별명은 삭제하지 않고 영구 보관합니다.</p>
<?php if ($is_admin == 'super') { ?>
<div id="btn_add">
<div class="btn_add sort_with">
<a href="./member_form.php" id="member_add">회원추가</a>
</div>
<?php } ?>
<ul id="sort_mb" class="sort_odr">
<li><?php echo subject_sort_link('mb_id') ?>회원아이디<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('mb_name') ?>이름<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('mb_today_login', '', 'desc') ?>최종접속<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('mb_point', '', 'desc') ?> 포인트<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('mb_nick') ?>별명<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('mb_level', '', 'desc') ?>권한<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('mb_email_certify', '', 'desc') ?>메일인증<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('mb_mailling', '', 'desc') ?>메일수신<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('mb_open', '', 'desc') ?>정보공개<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('mb_hp_certify', '', 'desc') ?>본인확인<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('mb_adult', '', 'desc') ?>성인인증<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('mb_intercept_date', '', 'desc') ?>접근차단<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('mb_datetime', '', 'desc') ?>가입일<span class="sound_only"> 순 정렬</span></a></li>
</ul>
<form name="fmemberlist" id="fmemberlist" action="./member_list_update.php" onsubmit="return fmemberlist_submit(this);" method="post">
<input type="hidden" name="sst" value="<?php echo $sst ?>">
<input type="hidden" name="sod" value="<?php echo $sod ?>">
@ -118,26 +134,29 @@ $colspan = 15;
<table class="tbl_mb_list">
<thead>
<tr>
<th scope="col" rowspan="2"><input type="checkbox" name="chkall" value="1" id="chkall" title="현재 페이지 회원 전체선택" onclick="check_all(this.form)"></th>
<th scope="col"><?php echo subject_sort_link('mb_id') ?>회원아이디</a></th>
<th scope="col"><?php echo subject_sort_link('mb_name') ?>이름</a></th>
<th scope="col" rowspan="2">
<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"><?php echo subject_sort_link('mb_today_login', '', 'desc') ?>최종접속</a></th>
<th scope="col"><?php echo subject_sort_link('mb_point', '', 'desc') ?> 포인트</a></th>
<th scope="col">최종접속</th>
<th scope="col">포인트</th>
<th scope="col" rowspan="2">관리</th>
</tr>
<tr>
<th scope="col"><?php echo subject_sort_link('mb_nick') ?>별명</a></th>
<th scope="col">상태/<?php echo subject_sort_link('mb_level', '', 'desc') ?>권한</a></th>
<th scope="col">별명</th>
<th scope="col">상태/권한</th>
<th scope="col">전화번호</th>
<th scope="col"><?php echo subject_sort_link('mb_email_certify', '', 'desc') ?>메일<br>인증</a></th>
<th scope="col"><?php echo subject_sort_link('mb_mailling', '', 'desc') ?>메일<br>수신</a></th>
<th scope="col"><?php echo subject_sort_link('mb_open', '', 'desc') ?>정보<br>공개</a></th>
<th scope="col"><?php echo subject_sort_link('mb_hp_certify', '', 'desc') ?>본인<br>확인</a></th>
<th scope="col"><?php echo subject_sort_link('mb_adult', '', 'desc') ?>성인<br>인증</a></th>
<th scope="col"><?php echo subject_sort_link('mb_intercept_date', '', 'desc') ?>접근<br>차단</a></th>
<th scope="col"><?php echo subject_sort_link('mb_datetime', '', 'desc') ?>가입일</a></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>
</tr>
</thead>
@ -190,7 +209,7 @@ $colspan = 15;
<tr <?php echo $tr_bg; ?>>
<td 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">회원선택</label>
<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>

27
adm/point_list.php
View File

@ -100,6 +100,13 @@ function point_clear()
<section class="cbox">
<h2>포인트 내역</h2>
<ul class="sort_odr">
<li><?php echo subject_sort_link('mb_id') ?>회원아이디<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('po_datetime') ?>일시<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('po_content') ?>포인트 내용<span class="sound_only"> 순 정렬</span></a></li>
<li><?php echo subject_sort_link('po_point') ?>포인트<span class="sound_only"> 순 정렬</span></a></li>
</ul>
<form name="fpointlist" id="fpointlist" method="post" action="./point_list_delete.php" onsubmit="return fpointlist_submit(this);">
<input type="hidden" name="sst" value="<?php echo $sst ?>">
<input type="hidden" name="sod" value="<?php echo $sod ?>">
@ -111,13 +118,16 @@ function point_clear()
<table class="tbl_pt_list">
<thead>
<tr>
<th scope="col"><input type="checkbox" name="chkall" value="1" id="chkall" title="현재 페이지 포인트 내역 전체선택" onclick="check_all(this.form)"></th>
<th scope="col"><?php echo subject_sort_link('mb_id') ?>회원아이디</a></th>
<th scope="col">
<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"><?php echo subject_sort_link('po_datetime') ?>일시</a></th>
<th scope="col"><?php echo subject_sort_link('po_content') ?>포인트 내용</a></th>
<th scope="col"><?php echo subject_sort_link('po_point') ?>포인트</a></th>
<th scope="col">일시</th>
<th scope="col">포인트 내용</th>
<th scope="col">포인트</th>
<th scope="col">포인트합</th>
</tr>
</thead>
@ -140,9 +150,10 @@ function point_clear()
<tr>
<td class="td_chk">
<input type="hidden" id="mb_id_<?php echo $i ?>" name="mb_id[<?php echo $i ?>]" value="<?php echo $row['mb_id'] ?>">
<input type="hidden" id="po_id_<?php echo $i ?>" name="po_id[<?php echo $i ?>]" value="<?php echo $row['po_id'] ?>">
<input type="checkbox" id="chk_<?php echo $i ?>" name="chk[]" value="<?php echo $i ?>" title="내역선택">
<input type="hidden" name="mb_id[<?php echo $i ?>]" value="<?php echo $row['mb_id'] ?>" id="mb_id_<?php echo $i ?>">
<input type="hidden" name="po_id[<?php echo $i ?>]" value="<?php echo $row['po_id'] ?>" id="po_id_<?php echo $i ?>">
<label for="chk_<?php echo $i; ?>" class="sound_only">내역</label>
<input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">
</td>
<td class="td_mbid"><a href="?sfl=mb_id&amp;stx=<?php echo $row['mb_id'] ?>"><?php echo $row['mb_id'] ?></a></td>
<td class="td_mbname"><?php echo $row2['mb_name'] ?></td>

2
adm/poll_list.php
View File

@ -73,7 +73,7 @@ $colspan = 6;
<section class="cbox">
<h2>투표목록</h2>
<div id="btn_add">
<div class="btn_add">
<a href="./poll_form.php" id="poll_add">투표 추가</a>
</div>

2
adm/shop_admin/itemformupdate.php
View File

@ -495,7 +495,7 @@ echo "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">";
?>
<script>
if (confirm("계속 입력하시겠습니까?"))
//location.href = "<?="./itemform.php?it_id=$it_id&amp;sort1=$sort1&amp;sort2=$sort2&amp;sel_ca_id=$sel_ca_id&amp;sel_field=$sel_field&amp;search=$search&amp;page=$page"?>";
//location.href = "<?php echo "./itemform.php?it_id=$it_id&amp;sort1=$sort1&amp;sort2=$sort2&amp;sel_ca_id=$sel_ca_id&amp;sel_field=$sel_field&amp;search=$search&amp;page=$page"?>";
location.href = "<?php echo "./itemform.php?$qstr"; ?>";
else
location.href = "<?php echo "./itemlist.php?$qstr"; ?>";

38
adm/version.php
View File

@ -1,32 +1,32 @@
<?
<?
//
// 조병완(korone)님 , 남규아빠(eagletalon)님께서 만들어 주셨습니다.
//
$sub_menu = "100400";
include_once("./_common.php");
$sub_menu = "100400";
include_once("./_common.php");
auth_check($auth[$sub_menu], "r");
$g4[title] = "버전확인";
$g4[title] = "버전확인";
include_once("./admin.head.php");
include_once("$g4[path]/lib/mailer.lib.php");
include_once("./admin.head.php");
include_once("$g4[path]/lib/mailer.lib.php");
echo "현재버전 : <b>";
$args = "head -1 ".$g4[path]."/HISTORY";
system($args);
$args = "head -1 ".$g4[path]."/HISTORY";
system($args);
echo "</b>";
?>
?>
<table width=100% border="0" align="left" cellpadding="0" cellspacing="0">
<tr>
<td>
<textarea name="textarea" style='width:100%; line-height:150%; padding:10px;' rows="25" class=tx readonly><?=implode("", file("$g4[path]/HISTORY"));?></textarea>
</td>
</tr>
</table>
<table width=100% border="0" align="left" cellpadding="0" cellspacing="0">
<tr>
<td>
<textarea name="textarea" style='width:100%; line-height:150%; padding:10px;' rows="25" class=tx readonly><?php echo implode("", file(G4_PATH.'/HISTORY'));?></textarea>
</td>
</tr>
</table>
<?
include_once("./admin.tail.php");
?>
<?
include_once("./admin.tail.php");
?>