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

Merge branch 'g4s'

Browse Source
This commit is contained in:
chicpro
2013-06-07 18:06:24 +09:00
parent 83c2037c3b ffbc3f18f6
commit b39a9ece35
6 changed files with 98 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
adm/config_form.php
View File

@ -83,6 +83,7 @@ $pg_anchor = '<ul class="anchor">
<li><a href="#anc_cf_join_mail">가입메일</a></li>
<li><a href="#anc_cf_vote_mail">투표메일</a></li>
<li><a href="#anc_cf_sns">SNS</a></li>
<li><a href="#anc_cf_lay">레이아웃 추가설정</a></li>
<li><a href="#anc_cf_extra">여분필드</a></li>
</ul>';
?>
@ -108,34 +109,6 @@ $pg_anchor = '<ul class="anchor">
<th scope="row"><label for="cf_admin">최고관리자<strong class="sound_only">필수</strong></label></th>
<td><?php echo get_member_id_select('cf_admin', 10, $config['cf_admin'], 'required') ?></td>
</tr>
<tr>
<th scope="row"><label for="cf_include_index">초기화면 파일 경로</label></th>
<td colspan="3">
<?php echo help('입력이 없으면 index.php가 초기화면 파일의 기본 경로로 설정됩니다.') ?>
<input type="text" name="cf_include_index" value="<?php echo $config['cf_include_index'] ?>" id="cf_include_index" class="frm_input" size="50">
</td>
</tr>
<tr>
<th scope="row"><label for="cf_include_head">상단 파일 경로</label></th>
<td colspan="3">
<?php echo help('입력이 없으면 head.php가 상단 파일의 기본 경로로 설정됩니다.') ?>
<input type="text" name="cf_include_head" value="<?php echo $config['cf_include_head'] ?>" id="cf_include_head" class="frm_input" size="50">
</td>
</tr>
<tr>
<th scope="row"><label for="cf_include_tail">하단 파일 경로</label></th>
<td colspan="3">
<?php echo help('입력이 없으면 tail.php가 상단 파일의 기본 경로로 설정됩니다.') ?>
<input type="text" name="cf_include_tail" value="<?php echo $config['cf_include_tail'] ?>" id="cf_include_tail" class="frm_input" size="50">
</td>
</tr>
<tr>
<th scope="row"><label for="cf_add_script">추가 script, css</label></th>
<td colspan="3">
<?php echo help('HTML의 &lt;/HEAD&gt; 태그위로 추가될 JavaScript와 css 코드를 설정합니다.<br>관리자 페이지에서는 이 코드를 사용하지 않습니다.') ?>
<textarea name="cf_add_script" id="cf_add_script"><?php echo $config['cf_add_script'] ?></textarea>
</td>
</tr>
<tr>
<th scope="row"><label for="cf_use_point">포인트 사용</label></th>
<td colspan="3"><input type="checkbox" name="cf_use_point" value="1" id="cf_use_point" <?php echo $config['cf_use_point']?'checked':''; ?>> 사용</td>
@ -765,6 +738,47 @@ $pg_anchor = '<ul class="anchor">
</table>
</section>
<section id="anc_cf_lay" class="cbox">
<h2>레이아웃 추가설정</h2>
<?php echo $pg_anchor; ?>
<p>기본 설정된 파일 경로 및 script, css 를 추가하거나 변경할 수 있습니다.</p>
<table class="frm_tbl">
<colgroup>
<col class="grid_3">
<col class="grid_15">
</colgroup>
<tbody>
<tr>
<th scope="row"><label for="cf_include_index">초기화면 파일 경로</label></th>
<td>
<?php echo help('입력이 없으면 index.php가 초기화면 파일의 기본 경로로 설정됩니다.') ?>
<input type="text" name="cf_include_index" value="<?php echo $config['cf_include_index'] ?>" id="cf_include_index" class="frm_input" size="50">
</td>
</tr>
<tr>
<th scope="row"><label for="cf_include_head">상단 파일 경로</label></th>
<td>
<?php echo help('입력이 없으면 head.php가 상단 파일의 기본 경로로 설정됩니다.') ?>
<input type="text" name="cf_include_head" value="<?php echo $config['cf_include_head'] ?>" id="cf_include_head" class="frm_input" size="50">
</td>
</tr>
<tr>
<th scope="row"><label for="cf_include_tail">하단 파일 경로</label></th>
<td>
<?php echo help('입력이 없으면 tail.php가 상단 파일의 기본 경로로 설정됩니다.') ?>
<input type="text" name="cf_include_tail" value="<?php echo $config['cf_include_tail'] ?>" id="cf_include_tail" class="frm_input" size="50">
</td>
</tr>
<tr>
<th scope="row"><label for="cf_add_script">추가 script, css</label></th>
<td>
<?php echo help('HTML의 &lt;/HEAD&gt; 태그위로 추가될 JavaScript와 css 코드를 설정합니다.<br>관리자 페이지에서는 이 코드를 사용하지 않습니다.') ?>
<textarea name="cf_add_script" id="cf_add_script"><?php echo $config['cf_add_script'] ?></textarea>
</td>
</tr>
</tbody>
</table>
</section>
<section id="anc_cf_extra" class="cbox">
<h2>여분필드 기본 설정</h2>

2
bbs/search.php
View File

@ -214,7 +214,7 @@ if ($stx) {
$write_pages = get_paging(G4_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$search_query.'&amp;gr_id='.$gr_id.'&amp;srows='.$srows.'&amp;onetable='.$onetable.'&amp;page=');
}
$group_select = '<select id="gr_id" name="gr_id" class="select" title="그룹선택"><option value="">전체 분류';
$group_select = '<label for="gr_id" class="sound_only">게시판 그룹선택</label><select name="gr_id" id="gr_id" class="select"><option value="">전체 분류';
$sql = " select gr_id, gr_subject from {$g4['group_table']} order by gr_id ";
$result = sql_query($sql);
for ($i=0; $row=sql_fetch_array($result); $i++)

4
plugin/ckeditor/config.js
View File

@ -106,8 +106,8 @@ CKEDITOR.editorConfig = function( config ) {
'Arial;Comic Sans MS;Courier New;Lucida Sans Unicode;monospace;sans-serif;serif;Tahoma;Times New Roman;Verdana';
config.fontSize_defaultLabel = "10pt";
config.fontSize_sizes = "7pt/9px;8pt/11px;9pt/12px;10pt/13px;11pt/15px;14pt/19px;18pt/24px;24pt/32px;36/48px;";
config.enterMode = CKEDITOR.ENTER_BR;
config.shiftEnterMode = CKEDITOR.ENTER_P;
config.enterMode = CKEDITOR.ENTER_DIV;
config.shiftEnterMode = CKEDITOR.ENTER_DIV;
config.filebrowserUploadUrl = g4_ckeditor_url+"/upload.php?type=Images";
config.keystrokes=[
// Formatting

2
plugin/gcaptcha/gcaptcha.js
View File

@ -26,7 +26,7 @@ function chk_captcha()
$(function() {
$("#captcha").click(function(e) {
this.setAttribute("src", g4_url+"/plugin/captcha/run.php?t="+(new Date).getTime());
this.setAttribute("src", g4_url+"/plugin/gcaptcha/run.php?t="+(new Date).getTime());
var keycode = (e.keyCode ? e.keyCode : e.which);
// 첫 실행에서는 포커스를 주지 않음
if (typeof(keycode) != "undefined") {

4
skin/member/basic/register_form.skin.php
View File

@ -342,7 +342,7 @@ function fregisterform_submit(f)
}
}
if (typeof(f.mb_recommend) != "undefined") {
if (typeof(f.mb_recommend) != "undefined" && f.mb_recommend.value) {
if (f.mb_id.value == f.mb_recommend.value) {
alert("본인을 추천할 수 없습니다.");
f.mb_recommend.focus();
@ -357,6 +357,7 @@ function fregisterform_submit(f)
}
}
/*
if (typeof(f.mb_hp) != "undefined" && f.mb_hp.value) {
var error = "";
$.ajax({
@ -381,6 +382,7 @@ function fregisterform_submit(f)
return false;
}
}
*/
<?php echo chk_captcha_js(); ?>

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

@ -6,8 +6,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<form name="fsearch" onsubmit="return fsearch_submit(this);" method="get">
<input type="hidden" name="srows" value="<?php echo $srows ?>">
<fieldset id="sch_result_detail">
<legend class="sound_only">상세검색</legend>
<fieldset id="sch_res_detail">
<legend>상세검색</legend>
<?php echo $group_select ?>
<script>document.getElementById("gr_id").value = "<?php echo $gr_id ?>";</script>
@ -61,34 +61,33 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<div id="sch_result">
<?php if ($stx) { ?>
<?php if ($board_count) { ?>
<dl id="sch_result_hd">
<dt><strong><?php echo $stx ?></strong>에 대한 검색 결과입니다.</dt>
<dd>
<ul>
<li><span style="color:<?php echo $config['cf_search_color'] ?>"><?php echo $board_count ?></span>개의 게시판</li>
<li><span style="color:<?php echo $config['cf_search_color'] ?>"><?php echo number_format($total_count) ?></span>개의 게시물</li>
<li>현재 <?php echo number_format($page) ?>/<?php echo number_format($total_page) ?> 페이지 열람 중</li>
</ul>
</dd>
</dl>
<?php } ?>
<?php } ?>
<?php
if ($stx) {
if ($board_count) {
?>
<section id="sch_res_ov">
<h2><?php echo $stx ?> 전체검색 결과</h2>
<dl>
<dt>게시판</dt>
<dd><strong style="color:<?php echo $config['cf_search_color'] ?>"><?php echo $board_count ?>개</strong></dd>
<dt>게시물</dt>
<dd><strong style="color:<?php echo $config['cf_search_color'] ?>"><?php echo number_format($total_count) ?>개</strong></dd>
</dl>
<p><?php echo number_format($page) ?>/<?php echo number_format($total_page) ?> 페이지 열람 중</p>
</section>
<?php
}
}
?>
<?php
if ($stx) {
if ($board_count) {
?>
<dl id="sch_result_bo">
<dt>검색결과가 있는 게시판 목록</dt>
<dd>
<ul>
<li><a href="?<?php echo $search_query ?>&amp;gr_id=<?php echo $gr_id ?>" <?php echo $sch_all ?>>전체게시판</a></li>
<?php echo $str_board_list; ?>
</ul>
</dd>
</dl>
<ul id="sch_res_board">
<li><a href="?<?php echo $search_query ?>&amp;gr_id=<?php echo $gr_id ?>" <?php echo $sch_all ?>>전체게시판</a></li>
<?php echo $str_board_list; ?>
</ul>
<?php
} else {
?>
@ -97,38 +96,38 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<hr>
<?php if ($stx && $board_count) { ?><dl id="sch_result_atc"><?php } ?>
<?php if ($stx && $board_count) { ?><section class="sch_res_list"><?php } ?>
<?php
$k=0;
for ($idx=$table_index, $k=0; $idx<count($search_table) && $k<$rows; $idx++) {
$comment_def = "";
$comment_href = "";
?>
<dt><a href="./board.php?bo_table=<?php echo $search_table[$idx] ?>&amp;<?php echo $search_query ?>"><?php echo $bo_subject[$idx] ?>에서</a></dt>
<dd>
<ul>
<?php
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];
}
?>
<li>
<a href="<?php echo $list[$idx][$i][href] ?><?php echo $comment_href ?>" class="sch_result_title"><?php echo $comment_def ?><?php echo $list[$idx][$i][subject] ?></a>
<a href="<?php echo $list[$idx][$i][href] ?><?php echo $comment_href ?>" target="_blank">새창</a>
<p><?php echo $list[$idx][$i][content] ?></p>
<?php echo $list[$idx][$i][name] ?>
<span class="sch_datetime"><?php echo $list[$idx][$i][wr_datetime] ?></span>
</li>
<?php } ?>
</ul>
<div class="sch_more"><a href="./board.php?bo_table=<?php echo $search_table[$idx] ?>&amp;<?php echo $search_query ?>"><?php echo $bo_subject[$idx] ?> 더보기</a></div>
</dd>
<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>
<?php
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];
}
?>
<li>
<a href="<?php echo $list[$idx][$i][href] ?><?php echo $comment_href ?>" class="sch_res_title"><?php echo $comment_def ?><?php echo $list[$idx][$i][subject] ?></a>
<a href="<?php echo $list[$idx][$i][href] ?><?php echo $comment_href ?>" target="_blank">새창</a>
<p><?php echo $list[$idx][$i][content] ?></p>
<?php echo $list[$idx][$i][name] ?>
<span class="sch_datetime"><?php echo $list[$idx][$i][wr_datetime] ?></span>
</li>
<?php } ?>
</ul>
<div class="sch_more"><a href="./board.php?bo_table=<?php echo $search_table[$idx] ?>&amp;<?php echo $search_query ?>"><strong><?php echo $bo_subject[$idx] ?></strong> 결과 더보기</a></div>
<hr>
<?php } ?>
<?php if ($stx && $board_count) { ?></dl><?php } ?>
<?php if ($stx && $board_count) { ?></section><?php } ?>
<?php echo $write_pages ?>
</div>
</div>