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
2015-11-19 15:49:01 +09:00
parent db30508293 976c9d0f9b
commit 9afb28efba
12 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bbs/board.php
View File

@ -130,13 +130,13 @@ if (isset($wr_id) && $wr_id) {
if ($config['cf_use_point'] && $board['bo_read_point'] && $member['mb_point'] + $board['bo_read_point'] < 0) if ($config['cf_use_point'] && $board['bo_read_point'] && $member['mb_point'] + $board['bo_read_point'] < 0)
alert('보유하신 포인트('.number_format($member['mb_point']).')가 없거나 모자라서 글읽기('.number_format($board['bo_read_point']).')가 불가합니다.\\n\\n포인트를 모으신 후 다시 글읽기 해 주십시오.'); alert('보유하신 포인트('.number_format($member['mb_point']).')가 없거나 모자라서 글읽기('.number_format($board['bo_read_point']).')가 불가합니다.\\n\\n포인트를 모으신 후 다시 글읽기 해 주십시오.');
insert_point($member['mb_id'], $board['bo_read_point'], "{$board['bo_subject']} {$wr_id} 글읽기", $bo_table, $wr_id, '읽기'); insert_point($member['mb_id'], $board['bo_read_point'], ((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']).' '.$wr_id.' 글읽기', $bo_table, $wr_id, '읽기');
} }
set_session($ss_name, TRUE); set_session($ss_name, TRUE);
} }
$g5['title'] = strip_tags(conv_subject($write['wr_subject'], 255))." > ".$board['bo_subject']; $g5['title'] = strip_tags(conv_subject($write['wr_subject'], 255))." > ".((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']);
} else { } else {
if ($member['mb_level'] < $board['bo_list_level']) { if ($member['mb_level'] < $board['bo_list_level']) {
if ($member['mb_id']) if ($member['mb_id'])
@ -171,7 +171,7 @@ if (isset($wr_id) && $wr_id) {
if (!isset($page) || (isset($page) && $page == 0)) $page = 1; if (!isset($page) || (isset($page) && $page == 0)) $page = 1;
$g5['title'] = $board['bo_subject']." ".$page." 페이지"; $g5['title'] = ((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']).' '.$page.' 페이지';
} }
include_once(G5_PATH.'/head.sub.php'); include_once(G5_PATH.'/head.sub.php');

4
bbs/new.php
View File

@ -46,7 +46,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
$group_select .= '</select>'; $group_select .= '</select>';
$list = array(); $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, b.bo_mobile_subject, c.gr_subject, c.gr_id {$sql_common} {$sql_order} limit {$from_record}, {$rows} ";
$result = sql_query($sql); $result = sql_query($sql);
for ($i=0; $row=sql_fetch_array($result); $i++) { for ($i=0; $row=sql_fetch_array($result); $i++) {
$tmp_write_table = $g5['write_prefix'].$row['bo_table']; $tmp_write_table = $g5['write_prefix'].$row['bo_table'];
@ -104,7 +104,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
$list[$i]['datetime2'] = $datetime2; $list[$i]['datetime2'] = $datetime2;
$list[$i]['gr_subject'] = $row['gr_subject']; $list[$i]['gr_subject'] = $row['gr_subject'];
$list[$i]['bo_subject'] = $row['bo_subject']; $list[$i]['bo_subject'] = ((G5_IS_MOBILE && $row['bo_mobile_subject']) ? $row['bo_mobile_subject'] : $row['bo_subject']);
$list[$i]['wr_subject'] = $row2['wr_subject']; $list[$i]['wr_subject'] = $row2['wr_subject'];
} }

8
bbs/search.php
View File

@ -129,13 +129,13 @@ if ($stx) {
$read_level[] = $g5_search['read_level'][$i]; $read_level[] = $g5_search['read_level'][$i];
$search_table_count[] = $total_count; $search_table_count[] = $total_count;
$sql2 = " select bo_subject from {$g5['board_table']} where bo_table = '{$g5_search['tables'][$i]}' "; $sql2 = " select bo_subject, bo_mobile_subject from {$g5['board_table']} where bo_table = '{$g5_search['tables'][$i]}' ";
$row2 = sql_fetch($sql2); $row2 = sql_fetch($sql2);
$sch_class = ""; $sch_class = "";
$sch_all = ""; $sch_all = "";
if ($onetable == $g5_search['tables'][$i]) $sch_class = "class=sch_on"; if ($onetable == $g5_search['tables'][$i]) $sch_class = "class=sch_on";
else $sch_all = "class=sch_on"; else $sch_all = "class=sch_on";
$str_board_list .= '<li><a href="'.$_SERVER['SCRIPT_NAME'].'?'.$search_query.'&amp;gr_id='.$gr_id.'&amp;onetable='.$g5_search['tables'][$i].'" '.$sch_class.'><strong>'.$row2['bo_subject'].'</strong><span class="cnt_cmt">'.$row['cnt'].'</span></a></li>'; $str_board_list .= '<li><a href="'.$_SERVER['SCRIPT_NAME'].'?'.$search_query.'&amp;gr_id='.$gr_id.'&amp;onetable='.$g5_search['tables'][$i].'" '.$sch_class.'><strong>'.((G5_IS_MOBILE && $row2['bo_mobile_subject']) ? $row2['bo_mobile_subject'] : $row2['bo_subject']).'</strong><span class="cnt_cmt">'.$row['cnt'].'</span></a></li>';
} }
} }
@ -157,9 +157,9 @@ if ($stx) {
$k=0; $k=0;
for ($idx=$table_index; $idx<count($search_table); $idx++) { for ($idx=$table_index; $idx<count($search_table); $idx++) {
$sql = " select bo_subject from {$g5['board_table']} where bo_table = '{$search_table[$idx]}' "; $sql = " select bo_subject, bo_mobile_subject from {$g5['board_table']} where bo_table = '{$search_table[$idx]}' ";
$row = sql_fetch($sql); $row = sql_fetch($sql);
$bo_subject[$idx] = $row['bo_subject']; $bo_subject[$idx] = ((G5_IS_MOBILE && $row['bo_mobile_subject']) ? $row['bo_mobile_subject'] : $row['bo_subject']);
$tmp_write_table = $g5['write_prefix'] . $search_table[$idx]; $tmp_write_table = $g5['write_prefix'] . $search_table[$idx];

2
bbs/write.php
View File

@ -214,7 +214,7 @@ else
$write_max = (int)$board['bo_write_max']; $write_max = (int)$board['bo_write_max'];
} }
$g5['title'] = $board['bo_subject']." ".$title_msg; $g5['title'] = ((G5_IS_MOBILE && $board['bo_mobile_subject']) ? $board['bo_mobile_subject'] : $board['bo_subject']).' '.$title_msg;
$is_notice = false; $is_notice = false;
$notice_checked = ''; $notice_checked = '';

4
mobile/skin/board/basic/list.skin.php
View File

@ -10,14 +10,14 @@ if ($is_checkbox) $colspan++;
add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0); add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0);
?> ?>
<h2 id="container_title"><?php echo $board['bo_subject'] ?><span class="sound_only"> 목록</span></h2> <h2 id="container_title"><?php echo ($board['bo_mobile_subject'] ? $board['bo_mobile_subject'] : $board['bo_subject']) ?><span class="sound_only"> 목록</span></h2>
<!-- 게시판 목록 시작 --> <!-- 게시판 목록 시작 -->
<div id="bo_list<?php if ($is_admin) echo "_admin"; ?>"> <div id="bo_list<?php if ($is_admin) echo "_admin"; ?>">
<?php if ($is_category) { ?> <?php if ($is_category) { ?>
<nav id="bo_cate"> <nav id="bo_cate">
<h2><?php echo $board['bo_subject'] ?> 카테고리</h2> <h2><?php echo ($board['bo_mobile_subject'] ? $board['bo_mobile_subject'] : $board['bo_subject']) ?> 카테고리</h2>
<ul id="bo_cate_ul"> <ul id="bo_cate_ul">
<?php echo $category_option ?> <?php echo $category_option ?>
</ul> </ul>

2
mobile/skin/board/basic/view.skin.php
View File

@ -8,7 +8,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
<script src="<?php echo G5_JS_URL; ?>/viewimageresize.js"></script> <script src="<?php echo G5_JS_URL; ?>/viewimageresize.js"></script>
<div id="bo_v_table"><?php echo $board['bo_subject']; ?></div> <div id="bo_v_table"><?php echo ($board['bo_mobile_subject'] ? $board['bo_mobile_subject'] : $board['bo_subject']); ?></div>
<article id="bo_v" style="width:<?php echo $width; ?>"> <article id="bo_v" style="width:<?php echo $width; ?>">
<header> <header>

4
mobile/skin/board/gallery/list.skin.php
View File

@ -8,14 +8,14 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
<script src="<?php echo G5_JS_URL; ?>/jquery.fancylist.js"></script> <script src="<?php echo G5_JS_URL; ?>/jquery.fancylist.js"></script>
<h2 id="container_title"><?php echo $board['bo_subject'] ?><span class="sound_only"> 목록</span></h2> <h2 id="container_title"><?php echo ($board['bo_mobile_subject'] ? $board['bo_mobile_subject'] : $board['bo_subject']) ?><span class="sound_only"> 목록</span></h2>
<!-- 게시판 목록 시작 --> <!-- 게시판 목록 시작 -->
<div id="bo_gall"> <div id="bo_gall">
<?php if ($is_category) { ?> <?php if ($is_category) { ?>
<nav id="bo_cate"> <nav id="bo_cate">
<h2><?php echo $board['bo_subject'] ?> 카테고리</h2> <h2><?php echo ($board['bo_mobile_subject'] ? $board['bo_mobile_subject'] : $board['bo_subject']) ?> 카테고리</h2>
<ul id="bo_cate_ul"> <ul id="bo_cate_ul">
<?php echo $category_option ?> <?php echo $category_option ?>
</ul> </ul>

2
mobile/skin/board/gallery/view.skin.php
View File

@ -8,7 +8,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
<script src="<?php echo G5_JS_URL; ?>/viewimageresize.js"></script> <script src="<?php echo G5_JS_URL; ?>/viewimageresize.js"></script>
<div id="bo_v_table"><?php echo $board['bo_subject']; ?></div> <div id="bo_v_table"><?php echo ($board['bo_mobile_subject'] ? $board['bo_mobile_subject'] : $board['bo_subject']); ?></div>
<article id="bo_v" style="width:<?php echo $width; ?>"> <article id="bo_v" style="width:<?php echo $width; ?>">
<header> <header>

4
theme/basic/mobile/skin/board/basic/list.skin.php
View File

@ -10,14 +10,14 @@ if ($is_checkbox) $colspan++;
add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0); add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0);
?> ?>
<h2 id="container_title"><?php echo $board['bo_subject'] ?><span class="sound_only"> 목록</span></h2> <h2 id="container_title"><?php echo ($board['bo_mobile_subject'] ? $board['bo_mobile_subject'] : $board['bo_subject']) ?><span class="sound_only"> 목록</span></h2>
<!-- 게시판 목록 시작 --> <!-- 게시판 목록 시작 -->
<div id="bo_list<?php if ($is_admin) echo "_admin"; ?>"> <div id="bo_list<?php if ($is_admin) echo "_admin"; ?>">
<?php if ($is_category) { ?> <?php if ($is_category) { ?>
<nav id="bo_cate"> <nav id="bo_cate">
<h2><?php echo $board['bo_subject'] ?> 카테고리</h2> <h2><?php echo ($board['bo_mobile_subject'] ? $board['bo_mobile_subject'] : $board['bo_subject']) ?> 카테고리</h2>
<ul id="bo_cate_ul"> <ul id="bo_cate_ul">
<?php echo $category_option ?> <?php echo $category_option ?>
</ul> </ul>

2
theme/basic/mobile/skin/board/basic/view.skin.php
View File

@ -8,7 +8,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
<script src="<?php echo G5_JS_URL; ?>/viewimageresize.js"></script> <script src="<?php echo G5_JS_URL; ?>/viewimageresize.js"></script>
<div id="bo_v_table"><?php echo $board['bo_subject']; ?></div> <div id="bo_v_table"><?php echo ($board['bo_mobile_subject'] ? $board['bo_mobile_subject'] : $board['bo_subject']); ?></div>
<article id="bo_v" style="width:<?php echo $width; ?>"> <article id="bo_v" style="width:<?php echo $width; ?>">
<header> <header>

4
theme/basic/mobile/skin/board/gallery/list.skin.php
View File

@ -8,14 +8,14 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
<script src="<?php echo G5_JS_URL; ?>/jquery.fancylist.js"></script> <script src="<?php echo G5_JS_URL; ?>/jquery.fancylist.js"></script>
<h2 id="container_title"><?php echo $board['bo_subject'] ?><span class="sound_only"> 목록</span></h2> <h2 id="container_title"><?php echo ($board['bo_mobile_subject'] ? $board['bo_mobile_subject'] : $board['bo_subject']) ?><span class="sound_only"> 목록</span></h2>
<!-- 게시판 목록 시작 --> <!-- 게시판 목록 시작 -->
<div id="bo_gall"> <div id="bo_gall">
<?php if ($is_category) { ?> <?php if ($is_category) { ?>
<nav id="bo_cate"> <nav id="bo_cate">
<h2><?php echo $board['bo_subject'] ?> 카테고리</h2> <h2><?php echo ($board['bo_mobile_subject'] ? $board['bo_mobile_subject'] : $board['bo_subject']) ?> 카테고리</h2>
<ul id="bo_cate_ul"> <ul id="bo_cate_ul">
<?php echo $category_option ?> <?php echo $category_option ?>
</ul> </ul>

2
theme/basic/mobile/skin/board/gallery/view.skin.php
View File

@ -8,7 +8,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
<script src="<?php echo G5_JS_URL; ?>/viewimageresize.js"></script> <script src="<?php echo G5_JS_URL; ?>/viewimageresize.js"></script>
<div id="bo_v_table"><?php echo $board['bo_subject']; ?></div> <div id="bo_v_table"><?php echo ($board['bo_mobile_subject'] ? $board['bo_mobile_subject'] : $board['bo_subject']); ?></div>
<article id="bo_v" style="width:<?php echo $width; ?>"> <article id="bo_v" style="width:<?php echo $width; ?>">
<header> <header>