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

Merge branch 'g5'

Browse Source
This commit is contained in:
chicpro
2014-08-07 09:43:10 +09:00
parent a33b20364f ca7b488f4d
commit 7eccb79c94
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bbs/search.php
View File

@ -172,7 +172,6 @@ if ($stx) {
if ($row['wr_is_comment'])
{
$link .= '#c'.$row['wr_id'];
$sql2 = " select wr_subject, wr_option from {$tmp_write_table} where wr_id = '{$row['wr_parent']}' ";
$row2 = sql_fetch($sql2);
//$row['wr_subject'] = $row2['wr_subject'];
@ -204,7 +203,7 @@ if ($stx) {
$list[$idx][$i]['subject'] = $subject;
$list[$idx][$i]['content'] = $content;
$list[$idx][$i]['name'] = get_sideview($row['mb_id'], cut_str($row['wr_name'], $config['cf_cut_name']), $row['wr_email'], $row['wr_homepage']);
$list[$idx][$i]['name'] = get_sideview($row['mb_id'], get_text(cut_str($row['wr_name'], $config['cf_cut_name'])), $row['wr_email'], $row['wr_homepage']);
$k++;
if ($k >= $rows)

6
js/wrest.js
View File

@ -208,7 +208,7 @@ function wrestMinLength(fld, css)
{
if (!wrestTrim(fld)) return;
var str = css.split('_'); // minlength_?? <-- str[1]
var str = css.split('='); // minlength=?? <-- str[1]
if (wrestFld == null) {
if (fld.value.length < parseInt(str[1])) {
@ -305,8 +305,8 @@ function wrestSubmit()
case "telnum" : wrestTelNum(el); break; // 김선용 2006.3 - 전화번호 형식 검사
case "imgext" : wrestImgExt(el); break;
default :
// css 가 minlength_ 로 시작한다면 _ 뒤의 숫자는 최소길이값
if (/^minlength\_/.test(css)) {
// css 가 minlength= 로 시작한다면 = 뒤의 숫자는 최소길이값
if (/^minlength\=/.test(css)) {
wrestMinLength(el, css); break;
} else if (/^extension\=/.test(css)) {
wrestExtension(el, css); break;

11
mobile/skin/search/basic/search.skin.php
View File

@ -106,8 +106,6 @@ add_stylesheet('<link rel="stylesheet" href="'.$search_skin_url.'/style.css">',
<?php
$k=0;
for ($idx=$table_index, $k=0; $idx<count($search_table) && $k<$rows; $idx++) {
$comment_def = "";
$comment_href = "";
?>
<h2><a href="./board.php?bo_table=<?php echo $search_table[$idx] ?>&amp;<?php echo $search_query ?>"><?php echo $bo_subject[$idx] ?> 게시판 내 결과</a></h2>
<ul>
@ -115,8 +113,13 @@ add_stylesheet('<link rel="stylesheet" href="'.$search_skin_url.'/style.css">',
for ($i=0; $i<count($list[$idx]) && $k<$rows; $i++, $k++) {
if ($list[$idx][$i]['wr_is_comment'])
{
$comment_def = "<span class=\"cmt_def\">댓글</span>";
$comment_href = "#c_".$list[$idx][$i]['wr_id'];
$comment_def = '<span class="cmt_def">댓글</span>';
$comment_href = '#c_'.$list[$idx][$i]['wr_id'];
}
else
{
$comment_def = '';
$comment_href = '';
}
?>
<li>

11
skin/search/basic/search.skin.php
View File

@ -102,8 +102,6 @@ add_stylesheet('<link rel="stylesheet" href="'.$search_skin_url.'/style.css">',
<?php
$k=0;
for ($idx=$table_index, $k=0; $idx<count($search_table) && $k<$rows; $idx++) {
$comment_def = "";
$comment_href = "";
?>
<h2><a href="./board.php?bo_table=<?php echo $search_table[$idx] ?>&amp;<?php echo $search_query ?>"><?php echo $bo_subject[$idx] ?> 게시판 내 결과</a></h2>
<ul>
@ -111,8 +109,13 @@ add_stylesheet('<link rel="stylesheet" href="'.$search_skin_url.'/style.css">',
for ($i=0; $i<count($list[$idx]) && $k<$rows; $i++, $k++) {
if ($list[$idx][$i]['wr_is_comment'])
{
$comment_def = "<span class=\"cmt_def\">댓글 | </span>";
$comment_href = "#c_".$list[$idx][$i]['wr_id'];
$comment_def = '<span class="cmt_def">댓글 | </span>';
$comment_href = '#c_'.$list[$idx][$i]['wr_id'];
}
else
{
$comment_def = '';
$comment_href = '';
}
?>