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 11:16:52 +09:00
parent c945cbfa5f 35e2a0e572
commit 87f3275875
17 changed files with 497 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
adm/board_copy_update.php
View File

@ -50,6 +50,7 @@ $sql = " insert into {$g4['board_table']}
bo_use_category = '{$board['bo_use_category']}',
bo_category_list = '{$board['bo_category_list']}',
bo_disable_tags = '{$board['bo_disable_tags']}',
<<<<<<< HEAD
bo_use_secret = '{$board['bo_use_secret']}',
bo_use_dhtml_editor = '{$board['bo_use_dhtml_editor']}',
bo_use_sideview = '{$board['bo_use_sideview']}',
@ -59,6 +60,16 @@ $sql = " insert into {$g4['board_table']}
bo_use_signature = '{$board['bo_use_signature']}',
bo_use_ip_view = '{$board['bo_use_ip_view']}',
bo_use_trackback = '{$board['bo_use_trackback']}',
=======
bo_use_secret = '{$board[bo_use_secret]}',
bo_use_dhtml_editor = '{$board[bo_use_dhtml_editor]}',
bo_use_sideview = '{$board[bo_use_sideview]}',
bo_use_good = '{$board[bo_use_good]}',
bo_use_nogood = '{$board[bo_use_nogood]}',
bo_use_signature = '{$board[bo_use_signature]}',
bo_use_ip_view = '{$board[bo_use_ip_view]}',
bo_use_trackback = '{$board[bo_use_trackback]}',
>>>>>>> 35e2a0e57216e9ff77b98266f30f5e8f87800654
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']}',

10
adm/board_form.php
View File

@ -311,16 +311,6 @@ include_once ('./admin.head.php');
<label for="chk_use_file_content">동일그룹 모두 적용</label>
</td>
</tr>
<tr>
<th scope="row"><label for="bo_use_comment">댓글 새창 사용</label></th>
<td>
<input type="checkbox" id="bo_use_comment" name="bo_use_comment" value="1" <?=$board['bo_use_comment']?'checked':'';?>>사용 (댓글수 클릭시 새창으로 보임)
</td>
<td class="group_setting">
<input type="checkbox" id="chk_use_comment" name="chk_use_comment" value="1">
<label for="chk_use_comment">동일그룹 모두 적용</label>
</td>
</tr>
<tr>
<th scope="row"><label for="bo_use_secret">비밀글 사용</label></th>
<td>

83
adm/board_form_update.php
View File

@ -60,6 +60,7 @@ $src_char = array('&', '=');
$dst_char = array('＆', '〓');
$bo_category_list = str_replace($src_char, $dst_char, $bo_category_list);
<<<<<<< HEAD
$sql_common = " gr_id = '{$_POST['gr_id']}',
bo_subject = '{$_POST['bo_subject']}',
bo_admin = '{$_POST['bo_admin']}',
@ -140,6 +141,87 @@ $sql_common = " gr_id = '{$_POST['gr_id']}',
bo_8 = '{$_POST['bo_8']}',
bo_9 = '{$_POST['bo_9']}',
bo_10 = '{$_POST['bo_10']}' ";
=======
$sql_common = " gr_id = '{$_POST['gr_id']}',
bo_subject = '{$_POST['bo_subject']}',
bo_admin = '{$_POST['bo_admin']}',
bo_list_level = '{$_POST[bo_list_level]}',
bo_read_level = '{$_POST[bo_read_level]}',
bo_write_level = '{$_POST[bo_write_level]}',
bo_reply_level = '{$_POST[bo_reply_level]}',
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]}',
bo_download_level = '{$_POST[bo_download_level]}',
bo_read_point = '{$_POST[bo_read_point]}',
bo_write_point = '{$_POST[bo_write_point]}',
bo_comment_point = '{$_POST[bo_comment_point]}',
bo_download_point = '{$_POST[bo_download_point]}',
bo_use_category = '{$_POST[bo_use_category]}',
bo_category_list = '{$_POST['bo_category_list']}',
bo_disable_tags = '{$_POST['bo_disable_tags']}',
bo_use_sideview = '{$_POST[bo_use_sideview]}',
bo_use_file_content = '{$_POST[bo_use_file_content]}',
bo_use_secret = '{$_POST[bo_use_secret]}',
bo_use_dhtml_editor = '{$_POST[bo_use_dhtml_editor]}',
bo_use_rss_view = '{$_POST[bo_use_rss_view]}',
bo_use_good = '{$_POST[bo_use_good]}',
bo_use_nogood = '{$_POST[bo_use_nogood]}',
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]}',
bo_table_width = '{$_POST[bo_table_width]}',
bo_subject_len = '{$_POST[bo_subject_len]}',
bo_page_rows = '{$_POST[bo_page_rows]}',
bo_new = '{$_POST[bo_new]}',
bo_hot = '{$_POST[bo_hot]}',
bo_image_width = '{$_POST[bo_image_width]}',
bo_skin = '{$_POST['bo_skin']}',
bo_include_head = '{$_POST['bo_include_head']}',
bo_include_tail = '{$_POST['bo_include_tail']}',
bo_content_head = '{$_POST['bo_content_head']}',
bo_content_tail = '{$_POST['bo_content_tail']}',
bo_insert_content = '{$_POST['bo_insert_content']}',
bo_gallery_cols = '{$_POST[bo_gallery_cols]}',
bo_upload_count = '{$_POST[bo_upload_count]}',
bo_upload_size = '{$_POST[bo_upload_size]}',
bo_reply_order = '{$_POST[bo_reply_order]}',
bo_use_search = '{$_POST[bo_use_search]}',
bo_order_search = '{$_POST[bo_order_search]}',
bo_write_min = '{$_POST[bo_write_min]}',
bo_write_max = '{$_POST[bo_write_max]}',
bo_comment_min = '{$_POST[bo_comment_min]}',
bo_comment_max = '{$_POST[bo_comment_max]}',
bo_sort_field = '{$_POST['bo_sort_field']}',
bo_1_subj = '{$_POST['bo_1_subj']}',
bo_2_subj = '{$_POST['bo_2_subj']}',
bo_3_subj = '{$_POST['bo_3_subj']}',
bo_4_subj = '{$_POST['bo_4_subj']}',
bo_5_subj = '{$_POST['bo_5_subj']}',
bo_6_subj = '{$_POST['bo_6_subj']}',
bo_7_subj = '{$_POST['bo_7_subj']}',
bo_8_subj = '{$_POST['bo_8_subj']}',
bo_9_subj = '{$_POST['bo_9_subj']}',
bo_10_subj = '{$_POST['bo_10_subj']}',
bo_1 = '{$_POST['bo_1']}',
bo_2 = '{$_POST['bo_2']}',
bo_3 = '{$_POST['bo_3']}',
bo_4 = '{$_POST['bo_4']}',
bo_5 = '{$_POST['bo_5']}',
bo_6 = '{$_POST['bo_6']}',
bo_7 = '{$_POST['bo_7']}',
bo_8 = '{$_POST['bo_8']}',
bo_9 = '{$_POST['bo_9']}',
bo_10 = '{$_POST['bo_10']}' ";
>>>>>>> 35e2a0e57216e9ff77b98266f30f5e8f87800654
if ($bo_image_head_del) {
@unlink($board_path.'/'.$bo_image_head_del);
@ -262,7 +344,6 @@ if ($chk_category_list) {
}
if ($chk_use_sideview) $s .= " , bo_use_sideview = '{$bo_use_sideview}' ";
if ($chk_use_file_content) $s .= " , bo_use_file_content = '{$bo_use_file_content}' ";
if ($chk_use_comment) $s .= " , bo_use_comment = '{$bo_use_comment}' ";
if ($chk_use_secret) $s .= " , bo_use_secret = '{$bo_use_secret}' ";
if ($chk_use_dhtml_editor) $s .= " , bo_use_dhtml_editor = '{$bo_use_dhtml_editor}' ";
if ($chk_use_rss_view) $s .= " , bo_use_rss_view = '{$bo_use_rss_view}' ";

21
adm/point_list.php
View File

@ -47,9 +47,11 @@ $sql = " select *
limit {$from_record}, {$rows} ";
$result = sql_query($sql);
$listall = '';
if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
$listall = '<a href="'.$_SERVER['PHP_SELF'].'">전체목록</a>';
$mb = array();
if ($sfl == 'mb_id' && $stx)
$mb = get_member(isset($stx));
@ -82,9 +84,15 @@ function point_clear()
<?=$listall?>
전체 <?=number_format($total_count)?> 건
<?
<<<<<<< HEAD
if ($mb['mb_id'])
echo '&nbsp;(' . $mb['mb_id'] .' 님 포인트 합계 : ' . number_format($mb['mb_point']) . '점)';
else {
=======
if (isset($mb['mb_id']) && $mb['mb_id']) {
echo '&nbsp;(' . $mb['mb_id'] .' 님 포인트 합계 : ' . number_format($mb['mb_point']) . '점)';
} else {
>>>>>>> 35e2a0e57216e9ff77b98266f30f5e8f87800654
$row2 = sql_fetch(" select sum(po_point) as sum_point from {$g4['point_table']} ");
echo '&nbsp;(전체 합계 '.number_format($row2['sum_point']).'점)';
}
@ -127,10 +135,8 @@ function point_clear()
</thead>
<tbody>
<?
for ($i=0; $row=sql_fetch_array($result); $i++)
{
if ($row2['mb_id'] != $row['mb_id'])
{
for ($i=0; $row=sql_fetch_array($result); $i++) {
if ($i==0 || ($row2['mb_id'] != $row['mb_id'])) {
$sql2 = " select mb_id, mb_name, mb_nick, mb_email, mb_homepage, mb_point from {$g4['member_table']} where mb_id = '{$row['mb_id']}' ";
$row2 = sql_fetch($sql2);
}
@ -138,8 +144,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
$mb_nick = get_sideview($row['mb_id'], $row2['mb_nick'], $row2['mb_email'], $row2['mb_homepage']);
$link1 = $link2 = '';
if (!preg_match("/^\@/", $row['po_rel_table']) && $row['po_rel_table'])
{
if (!preg_match("/^\@/", $row['po_rel_table']) && $row['po_rel_table']) {
$link1 = '<a href="'.$g4['bbs_path'].'/board.php?bo_table='.$row['po_rel_table'].'&amp;wr_id='.$row['po_rel_id'].'" target="_blank">';
$link2 = '</a>';
}
@ -174,7 +179,11 @@ if ($i == 0)
</div>
<?
<<<<<<< HEAD
$pagelist = get_paging($config['cf_write_pages'], $page, $total_page, "$_SERVER['PHP_SELF']?$qstr&amp;page=");
=======
$pagelist = get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page=");
>>>>>>> 35e2a0e57216e9ff77b98266f30f5e8f87800654
?>
<div class="pg">
<?=$pagelist?>