From 1949133e57f78330dc5a0668fe101ea6ba4f139c Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 14 Jan 2013 15:13:56 +0900 Subject: [PATCH] =?UTF-8?q?notice=20=EC=98=A4=EB=A5=98=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/current_connect.php | 25 ++--- bbs/new.php | 110 ++++++++++++---------- bbs/search.php | 96 ++++++++----------- common.php | 1 + head.sub.php | 6 -- skin/connect/neo/current_connect.skin.php | 4 - 6 files changed, 110 insertions(+), 132 deletions(-) diff --git a/bbs/current_connect.php b/bbs/current_connect.php index 6dc4d1c87..68c49e0c3 100644 --- a/bbs/current_connect.php +++ b/bbs/current_connect.php @@ -7,33 +7,28 @@ include_once('./_head.php'); $list = array(); $sql = " select a.mb_id, b.mb_nick, b.mb_name, b.mb_email, b.mb_homepage, b.mb_open, b.mb_point, a.lo_ip, a.lo_location, a.lo_url - from {$g4[login_table]} a left join {$g4[member_table]} b on (a.mb_id = b.mb_id) - where a.mb_id <> '{$config[cf_admin]}' + from {$g4['login_table']} a left join {$g4['member_table']} b on (a.mb_id = b.mb_id) + where a.mb_id <> '{$config['cf_admin']}' order by a.lo_datetime desc "; $result = sql_query($sql); -for ($i=0; $row=sql_fetch_array($result); $i++) -{ +for ($i=0; $row=sql_fetch_array($result); $i++) { $list[$i] = $row; - if ($row[mb_id]) - //$list[$i][name] = get_sideview($row[mb_id], $row[mb_nick], $row[mb_email], $row[mb_homepage]); - $list[$i][name] = get_sideview($row[mb_id], cut_str($row[mb_nick], $config[cf_cut_name]), $row[mb_email], $row[mb_homepage]); - else - { + if ($row['mb_id']) { + $list[$i]['name'] = get_sideview($row['mb_id'], cut_str($row['mb_nick'], $config['cf_cut_name']), $row['mb_email'], $row['mb_homepage']); + } else { if ($is_admin) - $list[$i][name] = $row[lo_ip]; + $list[$i]['name'] = $row[lo_ip]; else - $list[$i][name] = preg_replace("/([0-9]+).([0-9]+).([0-9]+).([0-9]+)/", "\\1.♡.\\3.\\4", $row[lo_ip]); + $list[$i]['name'] = preg_replace("/([0-9]+).([0-9]+).([0-9]+).([0-9]+)/", "\\1.♡.\\3.\\4", $row['lo_ip']); } - $list[$i][num] = sprintf('%03d',$i+1); + $list[$i]['num'] = sprintf('%03d',$i+1); } -$write_pages = get_paging($config[cf_write_pages], $page, $total_page, '?gr_id=$gr_id&page='); - echo ''; -$connect_skin_path = $g4['path'].'/skin/connect/'.$config[cf_connect_skin]; +$connect_skin_path = $g4['path'].'/skin/connect/'.$config['cf_connect_skin']; include_once($connect_skin_path.'/current_connect.skin.php'); include_once('./_tail.php'); diff --git a/bbs/new.php b/bbs/new.php index 0c4bd0269..c24ba1a25 100644 --- a/bbs/new.php +++ b/bbs/new.php @@ -4,102 +4,108 @@ include_once('./_common.php'); $g4['title'] = '최근 게시물'; include_once('./_head.php'); -$sql_common = " from {$g4[board_new_table]} a, {$g4[board_table]} b, {$g4[group_table]} c - where a.bo_table = b.bo_table and b.gr_id = c.gr_id and b.bo_use_search = 1 "; -if ($gr_id) +$sql_common = " from {$g4['board_new_table']} a, {$g4['board_table']} b, {$g4['group_table']} c where a.bo_table = b.bo_table and b.gr_id = c.gr_id and b.bo_use_search = 1 "; + +$gr_id = isset($_GET['gr_id']) ? $_GET['gr_id'] : ""; +if ($gr_id) { $sql_common .= " and b.gr_id = '$gr_id' "; +} + +$view = isset($_GET['view']) ? $_GET['view'] : ""; + if ($view == "w") $sql_common .= " and a.wr_id = a.wr_parent "; else if ($view == "c") $sql_common .= " and a.wr_id <> a.wr_parent "; -if ($mb_id) + +$mb_id = isset($_GET['mb_id']) ? $_GET['mb_id'] : ""; +if ($mb_id) { $sql_common .= " and a.mb_id = '{$mb_id}' "; +} $sql_order = " order by a.bn_id desc "; $sql = " select count(*) as cnt {$sql_common} "; $row = sql_fetch($sql); -$total_count = $row[cnt]; +$total_count = $row['cnt']; -$rows = $config[cf_new_rows]; +$rows = $config['cf_new_rows']; $total_page = ceil($total_count / $rows); // 전체 페이지 계산 if (!$page) $page = 1; // 페이지가 없으면 첫 페이지 (1 페이지) $from_record = ($page - 1) * $rows; // 시작 열을 구함 $group_select = ''; - $list = array(); -$sql = " select a.*, b.bo_subject, c.gr_subject, c.gr_id - {$sql_common} - {$sql_order} - limit {$from_record}, {$rows} "; +$sql = " select a.*, b.bo_subject, c.gr_subject, c.gr_id {$sql_common} {$sql_order} limit {$from_record}, {$rows} "; $result = sql_query($sql); -for ($i=0; $row=sql_fetch_array($result); $i++) -{ - $tmp_write_table = $g4[write_prefix] . $row[bo_table]; +for ($i=0; $row=sql_fetch_array($result); $i++) { + $tmp_write_table = $g4['write_prefix'].$row['bo_table']; - if ($row[wr_id] == $row[wr_parent]) // 원글 - { + if ($row['wr_id'] == $row['wr_parent']) { + + // 원글 $comment = ""; $comment_link = ""; $row2 = sql_fetch(" select * from {$tmp_write_table} where wr_id = '$row[wr_id]' "); $list[$i] = $row2; - $name = get_sideview($row2[mb_id], cut_str($row2[wr_name], $config[cf_cut_name]), $row2[wr_email], $row2[wr_homepage]); + $name = get_sideview($row2['mb_id'], cut_str($row2['wr_name'], $config['cf_cut_name']), $row2['wr_email'], $row2['wr_homepage']); // 당일인 경우 시간으로 표시함 - $datetime = substr($row2[wr_datetime],0,10); - $datetime2 = $row2[wr_datetime]; - if ($datetime == $g4[time_ymd]) + $datetime = substr($row2['wr_datetime'],0,10); + $datetime2 = $row2['wr_datetime']; + if ($datetime == $g4['time_ymd']) { $datetime2 = substr($datetime2,11,5); - else + } else { $datetime2 = substr($datetime2,5,5); + } - } - else // 코멘트 - { + } else { + + // 코멘트 $comment = '[코] '; - $comment_link = '#c_'.$row[wr_id]; - $row2 = sql_fetch(" select * from {$tmp_write_table} where wr_id = '{$row[wr_parent]}' "); - $row3 = sql_fetch(" select mb_id, wr_name, wr_email, wr_homepage, wr_datetime from {$tmp_write_table} where wr_id = '{$row[wr_id]}' "); + $comment_link = '#c_'.$row['wr_id']; + $row2 = sql_fetch(" select * from {$tmp_write_table} where wr_id = '{$row['wr_parent']}' "); + $row3 = sql_fetch(" select mb_id, wr_name, wr_email, wr_homepage, wr_datetime from {$tmp_write_table} where wr_id = '{$row['wr_id']}' "); $list[$i] = $row2; - $list[$i][mb_id] = $row3[mb_id]; - $list[$i][wr_name] = $row3[wr_name]; - $list[$i][wr_email] = $row3[wr_email]; - $list[$i][wr_homepage] = $row3[wr_homepage]; + $list[$i]['mb_id'] = $row3['mb_id']; + $list[$i]['wr_name'] = $row3['wr_name']; + $list[$i]['wr_email'] = $row3['wr_email']; + $list[$i]['wr_homepage'] = $row3['wr_homepage']; - $name = get_sideview($row3[mb_id], cut_str($row3[wr_name], $config[cf_cut_name]), $row3[wr_email], $row3[wr_homepage]); + $name = get_sideview($row3['mb_id'], cut_str($row3['wr_name'], $config['cf_cut_name']), $row3['wr_email'], $row3['wr_homepage']); // 당일인 경우 시간으로 표시함 - $datetime = substr($row3[wr_datetime],0,10); - $datetime2 = $row3[wr_datetime]; - if ($datetime == $g4[time_ymd]) + $datetime = substr($row3['wr_datetime'],0,10); + $datetime2 = $row3['wr_datetime']; + if ($datetime == $g4['time_ymd']) { $datetime2 = substr($datetime2,11,5); - else + } else { $datetime2 = substr($datetime2,5,5); + } + } - $list[$i][gr_id] = $row[gr_id]; - $list[$i][bo_table] = $row[bo_table]; - $list[$i][name] = $name; - $list[$i][comment] = $comment; - $list[$i][href] = './board.php?bo_table='.$row[bo_table].'&wr_id='.$row2[wr_id].$comment_link; - $list[$i][datetime] = $datetime; - $list[$i][datetime2] = $datetime2; + $list[$i]['gr_id'] = $row['gr_id']; + $list[$i]['bo_table'] = $row['bo_table']; + $list[$i]['name'] = $name; + $list[$i]['comment'] = $comment; + $list[$i]['href'] = './board.php?bo_table='.$row['bo_table'].'&wr_id='.$row2['wr_id'].$comment_link; + $list[$i]['datetime'] = $datetime; + $list[$i]['datetime2'] = $datetime2; - $list[$i][gr_subject] = $row[gr_subject]; - $list[$i][bo_subject] = $row[bo_subject]; - $list[$i][wr_subject] = $row2[wr_subject]; + $list[$i]['gr_subject'] = $row['gr_subject']; + $list[$i]['bo_subject'] = $row['bo_subject']; + $list[$i]['wr_subject'] = $row2['wr_subject']; } -$write_pages = get_paging($config[cf_write_pages], $page, $total_page, "?gr_id=$gr_id&view=$view&mb_id=$mb_id&page="); +$write_pages = get_paging($config['cf_write_pages'], $page, $total_page, "?gr_id=$gr_id&view=$view&mb_id=$mb_id&page="); -$new_skin_path = $g4['path'].'/skin/new/'.$config[cf_new_skin]; +$new_skin_path = $g4['path'].'/skin/new/'.$config['cf_new_skin']; echo ''.PHP_EOL; diff --git a/bbs/search.php b/bbs/search.php index a8b9623cf..24674f9cb 100644 --- a/bbs/search.php +++ b/bbs/search.php @@ -1,25 +1,23 @@ '' "; + } else { + $sql3 = " select count(*) as cnt from {$g4['group_member_table']} where gr_id = '{$row['gr_id']}' and mb_id = '{$member['mb_id']}' and mb_id <> '' "; $row3 = sql_fetch($sql3); - if (!$row3[cnt]) + if (!$row3['cnt']) continue; } } } - $g4_search[tables][] = $row[bo_table]; - $g4_search[read_level][] = $row[bo_read_level]; + $g4_search['tables'][] = $row['bo_table']; + $g4_search['read_level'][] = $row['bo_read_level']; } $search_query = 'sfl='.urlencode($sfl).'&stx='.urlencode($stx).'&sop='.$sop; @@ -64,20 +60,18 @@ if ($stx) $field = explode('||', trim($sfl)); $str = '('; - for ($i=0; $i'.$row2[bo_subject].' ('.$row[cnt].')'; + $str_board_list .= '
  • '.$row2[bo_subject].' ('.$row[cnt].')'; } } @@ -144,10 +134,8 @@ if ($stx) if ($page == "") { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지) $from_record = ($page - 1) * $rows; // 시작 열을 구함 - for ($i=0; $i'; } $group_select = ''; if (!$sfl) $sfl = 'wr_subject'; if (!$sop) $sop = 'or'; -$search_skin_path = $g4['path'].'/skin/search/'.$config[cf_search_skin]; +$search_skin_path = $g4['path'].'/skin/search/'.$config['cf_search_skin']; include_once($search_skin_path.'/search.skin.php'); include_once('./_tail.php'); diff --git a/common.php b/common.php index c26713cdb..a0fb9511d 100644 --- a/common.php +++ b/common.php @@ -479,6 +479,7 @@ if (isset($member['mb_id'])) { $write = array(); $write_table = ""; +$gr_id = ""; if (isset($bo_table)) { $board = sql_fetch(" select * from {$g4['board_table']} where bo_table = '$bo_table' "); if ($board['bo_table']) { diff --git a/head.sub.php b/head.sub.php index 35b14a763..37c1c3947 100644 --- a/head.sub.php +++ b/head.sub.php @@ -50,15 +50,9 @@ header("Pragma: no-cache"); // HTTP/1.0 <?=$g4['title']?> -<<<<<<< HEAD -"> - -"> -======= "> "> ->>>>>>> 0ce3006c134433544fcc652714d529d7c49c7f4b