Merge branch 'master' of github.com:gnuboard/g4s

This commit is contained in:
chicpro
2013-02-18 14:00:35 +09:00
4 changed files with 66 additions and 59 deletions

View File

@ -156,9 +156,10 @@ $colspan = 5;
<input type="hidden" name="page" value="<?=$page?>"> <input type="hidden" name="page" value="<?=$page?>">
<input type="hidden" name="token" value="<?=$token?>"> <input type="hidden" name="token" value="<?=$token?>">
<fieldset> <section id="add_admin" class="cbox">
<legend>관리권한 추가</legend> <h2>관리권한 추가</h2>
<p>다음 양식에서 회원에게 관리권한을 부여하실 수 있습니다.</p> <p>다음 양식에서 회원에게 관리권한을 부여하실 수 있습니다.</p>
<label for="mb_id">회원아이디<strong class="sound_only">필수</strong></label> <label for="mb_id">회원아이디<strong class="sound_only">필수</strong></label>
<input type="text" id="mb_id" name="mb_id" class="required frm_input" required value="<?=$mb_id?>" title="회원아이디"> <input type="text" id="mb_id" name="mb_id" class="required frm_input" required value="<?=$mb_id?>" title="회원아이디">
<label for="au_menu">접근가능메뉴<strong class="sound_only">필수</strong></label> <label for="au_menu">접근가능메뉴<strong class="sound_only">필수</strong></label>
@ -178,11 +179,15 @@ $colspan = 5;
<label for="w">w (쓰기)</label> <label for="w">w (쓰기)</label>
<input type="checkbox" id="d" name="d" value="d"> <input type="checkbox" id="d" name="d" value="d">
<label for="d">d (삭제)</label> <label for="d">d (삭제)</label>
<p>관리자 권한을 탈취당하는 경우를 대비하여 패스워드를 다시 한번 확인합니다.</p> <fieldset id="admin_confirm">
<label for="admin_password">관리자 패스워드</label> <p>관리자 권한을 탈취당하는 경우를 대비하여 패스워드를 다시 한번 확인합니다.</p>
<input type="password" id="admin_password" name="admin_password" class="required frm_input" required> <label for="admin_password">관리자 패스워드</label>
<input type="submit" class="btn_submit" value="완료"> <input type="password" id="admin_password" name="admin_password" class="required frm_input" required>
</fieldset> </fieldset>
<div class="btn_confirm">
<input type="submit" class="btn_submit" value="완료">
</div>
</section>
</form> </form>

View File

@ -86,17 +86,13 @@ $colspan = 8;
<h2>생성된 게시판 목록</h2> <h2>생성된 게시판 목록</h2>
<p>여러개의 게시판 설정을 한번에 바꾸실 때는 게시판 체크기능을 이용하세요.</p> <p>여러개의 게시판 설정을 한번에 바꾸실 때는 게시판 체크기능을 이용하세요.</p>
<<<<<<< HEAD
<?if ($is_admin == 'super') {?> <?if ($is_admin == 'super') {?>
<div id="btn_add"> <div id="btn_add">
<a href="./board_form.php" id="bo_add">게시판 추가</a> <a href="./board_form.php" id="bo_add">게시판 추가</a>
</div> </div>
<?}?> <?}?>
<form id="fboardlist" name="fboardlist" method="post" action="./board_list_update.php" onsubmit="return fboardlist_submit(this);">
=======
<form id="fboardlist" name="fboardlist" method="post" action="./board_list_update.php"> <form id="fboardlist" name="fboardlist" method="post" action="./board_list_update.php">
>>>>>>> 6351d0732dbb9a7896c228d552d98ba457ee7b4f
<input type="hidden" name="sst" value="<?=$sst?>"> <input type="hidden" name="sst" value="<?=$sst?>">
<input type="hidden" name="sod" value="<?=$sod?>"> <input type="hidden" name="sod" value="<?=$sod?>">
<input type="hidden" name="sfl" value="<?=$sfl?>"> <input type="hidden" name="sfl" value="<?=$sfl?>">

View File

@ -68,58 +68,61 @@ $colspan = 7;
</fieldset> </fieldset>
</form> </form>
<table> <section class="cbox">
<caption><?=$gr['gr_subject']?> 그룹에 접근가능한 회원 목록 (그룹아이디:<?=$gr['gr_id']?>)</caption> <h2><?=$gr['gr_subject']?> 그룹에 접근가능한 회원 목록 (그룹아이디:<?=$gr['gr_id']?>)</h2>
<thead> <table>
<tr> <thead>
<th scope="col">그룹</th> <tr>
<th scope="col"><?=subject_sort_link('b.mb_id', 'gr_id='.$gr_id)?>회원아이디</a></th> <th scope="col"><input type="checkbox" id="chkall" name="chkall" value="1" title="현재 페이지 접근가능회원 전체선택" onclick="check_all(this.form)"></th>
<th scope="col"><?=subject_sort_link('b.mb_name', 'gr_id='.$gr_id)?>이름</a></th> <th scope="col">그룹</th>
<th scope="col"><?=subject_sort_link('b.mb_nick', 'gr_id='.$gr_id)?>별명</a></th> <th scope="col"><?=subject_sort_link('b.mb_id', 'gr_id='.$gr_id)?>회원아이디</a></th>
<th scope="col"><?=subject_sort_link('b.mb_today_login', 'gr_id='.$gr_id)?>최종접속</a></th> <th scope="col"><?=subject_sort_link('b.mb_name', 'gr_id='.$gr_id)?>이름</a></th>
<th scope="col"><?=subject_sort_link('a.gm_datetime', 'gr_id='.$gr_id)?>처리일시</a></th> <th scope="col"><?=subject_sort_link('b.mb_nick', 'gr_id='.$gr_id)?>별명</a></th>
<th scope="col">삭제</th> <th scope="col"><?=subject_sort_link('b.mb_today_login', 'gr_id='.$gr_id)?>최종접속</a></th>
</tr> <th scope="col"><?=subject_sort_link('a.gm_datetime', 'gr_id='.$gr_id)?>처리일시</a></th>
</thead> </tr>
<tbody> </thead>
<? <tbody>
for ($i=0; $row=sql_fetch_array($result); $i++) <?
{ for ($i=0; $row=sql_fetch_array($result); $i++)
// 접근가능한 그룹수 {
$sql2 = " select count(*) as cnt from {$g4['group_member_table']} where mb_id = '{$row['mb_id']}' "; // 접근가능한 그룹수
$row2 = sql_fetch($sql2); $sql2 = " select count(*) as cnt from {$g4['group_member_table']} where mb_id = '{$row['mb_id']}' ";
$group = ""; $row2 = sql_fetch($sql2);
if ($row2['cnt']) $group = "";
$group = '<a href="./boardgroupmember_form.php?mb_id='.$row['mb_id'].'">'.$row2['cnt'].'</a>'; if ($row2['cnt'])
$group = '<a href="./boardgroupmember_form.php?mb_id='.$row['mb_id'].'">'.$row2['cnt'].'</a>';
$s_del = '<a href="javascript:post_delete(\'boardgroupmember_update.php\', \''.$row['gm_id'].'\');">삭제</a>'; //$s_del = '<a href="javascript:post_delete(\'boardgroupmember_update.php\', \''.$row['gm_id'].'\');">삭제</a>';
$mb_nick = get_sideview($row['mb_id'], $row['mb_nick'], $row['mb_email'], $row['mb_homepage']); $mb_nick = get_sideview($row['mb_id'], $row['mb_nick'], $row['mb_email'], $row['mb_homepage']);
?> ?>
<tr> <tr>
<td class="td_grid"><?=$group?></td> <td class="td_chk"> <input type="checkbox" id="chk_<?=$i?>" name="chk[]" value="<?=$i?>" title="<?=$row['mb_nick']?> 회원 선택"></td>
<td class="td_mbid"><?=$row['mb_id']?></td> <td class="td_grid"><?=$group?></td>
<td class="td_mbname"><?=$row['mb_name']?></td> <td class="td_mbid"><?=$row['mb_id']?></td>
<td class="td_name"><?=$mb_nick?></td> <td class="td_mbname"><?=$row['mb_name']?></td>
<td class="td_time"><?=substr($row['mb_today_login'],2,8)?></td> <td class="td_name"><?=$mb_nick?></td>
<td class="td_time"><?=$row['gm_datetime']?></td> <td class="td_time"><?=substr($row['mb_today_login'],2,8)?></td>
<td class="td_mng"><?=$s_del?></td> <td class="td_time"><?=$row['gm_datetime']?></td>
</tr> </tr>
<? <?
} }
if ($i == 0) if ($i == 0)
{ {
echo '<tr><td colspan="'.$colspan.'" class="empty_table">자료가 없습니다.</td></tr>'; echo '<tr><td colspan="'.$colspan.'" class="empty_table">자료가 없습니다.</td></tr>';
} }
?> ?>
</tbody> </tbody>
</table> </table>
<? <div class="btn_list">
$pagelist = get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;gr_id=$gr_id&page="); <input type="submit" name="" value="선택삭제">
echo $pagelist; </div>
?> </section>
<?=get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;gr_id=$gr_id&page=");?>
<? <?
if (isset($stx)) if (isset($stx))

View File

@ -231,6 +231,9 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
.txt_true {color:#2a6bc4} .txt_true {color:#2a6bc4}
.txt_false {color:#ccc} .txt_false {color:#ccc}
/* 관리권한설정 */
#add_admin fieldset {margin-top:20px}
/* 메일 테스트 */ /* 메일 테스트 */
#fsendmailtest {margin-bottom:20px;padding:30px 0;border:1px solid #ced9de;background:#fff;text-align:center} #fsendmailtest {margin-bottom:20px;padding:30px 0;border:1px solid #ced9de;background:#fff;text-align:center}