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
2012-12-28 16:48:28 +09:00
parent 3cc1b5463a 6040266aed
commit 2acfb5c582
42 changed files with 639 additions and 983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
adm/board_copy_update.php
View File

@ -31,6 +31,7 @@ $sql = " insert into {$g4['board_table']}
bo_subject = '$target_subject',
gr_id = '{$board['gr_id']}',
bo_admin = '{$board['bo_admin']}',
<<<<<<< HEAD
bo_list_level = '{$board['bo_list_level']}',
bo_read_level = '{$board['bo_read_level']}',
bo_write_level = '{$board['bo_write_level']}',
@ -48,6 +49,24 @@ $sql = " insert into {$g4['board_table']}
bo_comment_point = '{$board['bo_comment_point']}',
bo_download_point = '{$board['bo_download_point']}',
bo_use_category = '{$board['bo_use_category']}',
=======
bo_list_level = '{$board[bo_list_level]}',
bo_read_level = '{$board[bo_read_level]}',
bo_write_level = '{$board[bo_write_level]}',
bo_reply_level = '{$board[bo_reply_level]}',
bo_comment_level = '{$board[bo_comment_level]}',
bo_upload_level = '{$board[bo_upload_level]}',
bo_download_level = '{$board[bo_download_level]}',
bo_html_level = '{$board[bo_html_level]}',
bo_link_level = '{$board[bo_link_level]}',
bo_count_modify = '{$board[bo_count_modify]}',
bo_count_delete = '{$board[bo_count_delete]}',
bo_read_point = '{$board[bo_read_point]}',
bo_write_point = '{$board[bo_write_point]}',
bo_comment_point = '{$board[bo_comment_point]}',
bo_download_point = '{$board[bo_download_point]}',
bo_use_category = '{$board[bo_use_category]}',
>>>>>>> 6040266aed7f782fddaf6f63366be5b06bdfa780
bo_category_list = '{$board['bo_category_list']}',
bo_disable_tags = '{$board['bo_disable_tags']}',
<<<<<<< HEAD
@ -68,8 +87,11 @@ $sql = " insert into {$g4['board_table']}
bo_use_nogood = '{$board[bo_use_nogood]}',
bo_use_signature = '{$board[bo_use_signature]}',
bo_use_ip_view = '{$board[bo_use_ip_view]}',
<<<<<<< HEAD
bo_use_trackback = '{$board[bo_use_trackback]}',
>>>>>>> 35e2a0e57216e9ff77b98266f30f5e8f87800654
=======
>>>>>>> 6040266aed7f782fddaf6f63366be5b06bdfa780
bo_use_list_view = '{$board['o_use_list_view']}',
bo_use_list_content = '{$board['bo_use_list_content']}',
bo_table_width = '{$board['bo_table_width']}',

22
adm/board_form.php
View File

@ -254,17 +254,6 @@ include_once ('./admin.head.php');
<label for="chk_html_level">동일그룹 모두 적용</label>
</td>
</tr>
<tr>
<th scope="row"><label for="bo_trackback_level">트랙백쓰기 권한</label></th>
<td>
<?=help('트랙백이란? 쉽게 설명하여 "내가 작성하는 글을 다른사람에게 알리는 기능" 입니다.'.PHP_EOL.'자세한 내용은 검색엔진에서 "트랙백"으로 검색을 해보시기 바랍니다.')?>
<?=get_member_level_select('bo_trackback_level', 1, 10, $board['bo_trackback_level']) ?>
</td>
<td class="group_setting">
<input type="checkbox" id="chk_trackback_level" name="chk_trackback_level" value="1">
<label for="chk_trackback_level">동일그룹 모두 적용</label>
</td>
</tr>
</tbody>
</table>
@ -406,17 +395,6 @@ include_once ('./admin.head.php');
<label for="chk_use_ip_view">동일그룹 모두 적용</label>
</td>
</tr>
<tr>
<th scope="row"><label for="bo_use_trackback">트랙백 사용</label></th>
<td>
<input type="checkbox" id="bo_use_trackback" name="bo_use_trackback" value="1" <?=$board['bo_use_trackback']?'checked':'';?>>
사용 (트랙백쓰기 권한 보다 우선함)
</td>
<td class="group_setting">
<input type="checkbox" id="chk_use_trackback" name="chk_use_trackback" value="1">
<label for="chk_use_trackback">동일그룹 모두 적용</label>
</td>
</tr>
<tr>
<th scope="row"><label for="bo_use_list_content">목록에서 내용 사용</label></th>
<td>

4
adm/board_form_update.php
View File

@ -152,7 +152,6 @@ $sql_common = " gr_id = '{$_POST['gr_id']}',
bo_comment_level = '{$_POST[bo_comment_level]}',
bo_html_level = '{$_POST[bo_html_level]}',
bo_link_level = '{$_POST[bo_link_level]}',
bo_trackback_level = '{$_POST[bo_trackback_level]}',
bo_count_modify = '{$_POST[bo_count_modify]}',
bo_count_delete = '{$_POST[bo_count_delete]}',
bo_upload_level = '{$_POST[bo_upload_level]}',
@ -174,7 +173,6 @@ $sql_common = " gr_id = '{$_POST['gr_id']}',
bo_use_name = '{$_POST[bo_use_name]}',
bo_use_signature = '{$_POST[bo_use_signature]}',
bo_use_ip_view = '{$_POST[bo_use_ip_view]}',
bo_use_trackback = '{$_POST[bo_use_trackback]}',
bo_use_list_view = '{$_POST[bo_use_list_view]}',
bo_use_list_content = '{$_POST[bo_use_list_content]}',
bo_use_email = '{$_POST[bo_use_email]}',
@ -331,7 +329,6 @@ if ($chk_link_level) $s .= " , bo_link_level = '{$bo_link_level}' ";
if ($chk_upload_level) $s .= " , bo_upload_level = '{$bo_upload_level}' ";
if ($chk_download_level) $s .= " , bo_download_level = '{$bo_download_level}' ";
if ($chk_html_level) $s .= " , bo_html_level = '{$bo_html_level}' ";
if ($chk_trackback_level) $s .= " , bo_trackback_level = '{$bo_trackback_level}' ";
if ($chk_count_modify) $s .= " , bo_count_modify = '{$bo_count_modify}' ";
if ($chk_count_delete) $s .= " , bo_count_delete = '{$bo_count_delete}' ";
if ($chk_read_point) $s .= " , bo_read_point = '{$bo_read_point}' ";
@ -352,7 +349,6 @@ if ($chk_use_nogood) $s .= " , bo_use_nogood = '{$bo_use_nogood}' ";
if ($chk_use_name) $s .= " , bo_use_name = '{$bo_use_name}' ";
if ($chk_use_signature) $s .= " , bo_use_signature = '{$bo_use_signature}' ";
if ($chk_use_ip_view) $s .= " , bo_use_ip_view = '{$bo_use_ip_view}' ";
if ($chk_use_trackback) $s .= " , bo_use_trackback = '{$bo_use_trackback}' ";
if ($chk_use_list_view) $s .= " , bo_use_list_view = '{$bo_use_list_view}' ";
if ($chk_use_list_content) $s .= " , bo_use_list_content = '{$bo_use_list_content}' ";
if ($chk_use_email) $s .= " , bo_use_email = '{$bo_use_email}' ";