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

Merge branch 'master' of github.com:gnuboard/g4s

Browse Source
This commit is contained in:
gnuboard
2013-03-11 10:50:48 +09:00
parent c5cee2583b c18c89311d
commit 5af892fab8
15 changed files with 90 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
adm/config_form.php
View File

@ -25,9 +25,14 @@ if (!isset($config['cf_mobile_new_skin'])) {
ADD `cf_mobile_member_skin` VARCHAR(255) NOT NULL AFTER `cf_mobile_connect_skin` ", true);
}
if(!isset($config['cf_kcpcert_site_cd'])) {
sql_query(" ALTER TABLE `{$g4['config_table']}`
ADD `cf_kcpcert_site_cd` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_memo_send_point` ", TRUE);
}
if(!isset($config['cf_adult_check'])) {
sql_query(" ALTER TABLE `{$g4['config_table']}`
ADD `cf_adult_check` TINYINT(4) NOT NULL DEFAULT '0' AFTER `cf_memo_send_point` ", TRUE);
ADD `cf_adult_check` TINYINT(4) NOT NULL DEFAULT '0' AFTER `cf_kcpcert_site_cd` ", TRUE);
}
if(!isset($config['cf_mobile_pages'])) {
@ -429,11 +434,13 @@ $pg_anchor = "
<td><input type="text" id="cf_register_point" name="cf_register_point" class="frm_input" value="<?=$config['cf_register_point']?>" size="5"> 점</td>
</tr>
<tr>
<th scope='row' id="th310"><label for='cf_adult_check'>성인인증 사용</label></th>
<td colspan="3"><input type="checkbox" id="cf_adult_check" name="cf_adult_check" value="1" <?=$config['cf_adult_check']?'checked':'';?>> 사용</td>
<th scope="row"><label for="cf_kcpcert_site_cd">KCP 사이트코드</label></th>
<td><input type="text" id="cf_kcpcert_site_cd" name="cf_kcpcert_site_cd" class="frm_input" value="<?=$config['cf_kcpcert_site_cd']?>" size="10"></td>
<th scope="row"><label for='cf_adult_check'>성인인증 사용</label></th>
<td><input type="checkbox" id="cf_adult_check" name="cf_adult_check" value="1" <?=$config['cf_adult_check']?'checked':'';?>> 사용</td>
</tr>
<tr>
<th scope='row' id="th310"><label for='cf_leave_day'>회원탈퇴후 삭제일</label></th>
<th scope="row" id="th310"><label for='cf_leave_day'>회원탈퇴후 삭제일</label></th>
<td colspan="3"><input type="text" id="cf_leave_day" name="cf_leave_day" class="frm_input" value="<?=$config['cf_leave_day']?>" size="2"> 일 후 자동 삭제</td>
</tr>
<tr>

1
adm/config_form_update.php
View File

@ -104,6 +104,7 @@ $sql = " update {$g4['config_table']}
cf_mobile_search_skin = '{$_POST['cf_mobile_search_skin']}',
cf_mobile_connect_skin = '{$_POST['cf_mobile_connect_skin']}',
cf_mobile_member_skin = '{$_POST['cf_mobile_member_skin']}',
cf_kcpcert_site_cd = '{$_POST['cf_kcpcert_site_cd']}',
cf_adult_check = '{$_POST['cf_adult_check']}',
cf_1_subj = '{$_POST['cf_1_subj']}',
cf_2_subj = '{$_POST['cf_2_subj']}',

2
bbs/gcaptcha/gcaptcha.lib.php
View File

@ -179,7 +179,7 @@ function captcha_html($class='captcha')
$html .= PHP_EOL.'<script src="'.G4_GCAPTCHA_URL.'/gcaptcha.js"></script>';
$html .= '<fieldset id="captcha" class="'.$class.'">';
$html .= '<legend class="sound_only">자동등록방지</legend>';
$html .= '<img src="'.$jpg_file_url.'" alt="자동등록방지 숫자">';
$html .= '<img src="'.$jpg_file_url.'?_='.rand().'" alt="자동등록방지 숫자">';
$html .= '<a href="'.$wav_file_url.'" id="captcha_wav" target="_blank"><img src="'.G4_GCAPTCHA_URL.'/img/sound.gif" alt="숫자를 음성으로 듣기"></a>';
$html .= '<input type="text" id="captcha_key" name="captcha_key" class="captcha_box frm_input" size="6" maxlength="6" required title="자동등록방지 숫자 입력">';
$html .= '<p class="sound_only">자동등록방지 숫자를 순서대로 입력하세요.</p>';

12
bbs/kcp/kcpcert_config.php
View File

@ -8,18 +8,16 @@ $home_dir = G4_BBS_PATH.'/kcp'; // ct_cli 절대경로 ( bin 전까지 )
//web_siteid 값이 없으면 KCP 에서 지정한 값으로 설정됨
$web_siteid = '';
$kcpcert_test = true;
if($kcpcert_test) { // 테스트
if($config['cf_kcpcert_site_cd'] && $config['cf_kcpcert_site_cd'] != 'S6186') { // 실인증
$site_cd = $config['cf_kcpcert_site_cd'];
$cert_url = 'https://cert.kcp.co.kr/kcp_cert/cert_view.jsp';
} else { // 테스트인증
$site_cd = 'S6186';
$cert_url = 'https://testcert.kcp.co.kr/kcp_cert/cert_view.jsp';
} else { // 실인증
$site_cd = '';
$cert_url = 'https://cert.kcp.co.kr/kcp_cert/cert_view.jsp';
}
if(!$site_cd)
alert('KCP 휴대폰인증 사이트코드가 없습니다.', G4_URL);
alert('KCP 휴대폰인증 사이트코드가 없습니다.\\관리자 > 기본환경설정에 사이트코드를 입력해 주십시오.', G4_URL);
// KCP 인증 라이브러리
require G4_BBS_PATH.'/kcp/lib/ct_cli_lib.php';

4
css/default.css
View File

@ -589,7 +589,9 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#333;color:#fff;
#bo_v_act {margin-bottom:30px;text-align:center}
#bo_v_act a {margin-right:5px;vertical-align:top}
#bo_v_act span {display:inline-block;margin-right:5px;padding:0 10px;height:23px;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:top}
#bo_v_act strong {color:#000}
#bo_v_act strong {color:#ff3061}
#bo_v_act_good,
#bo_v_act_nogood {position:absolute;top:0;left:0;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
#bo_v form {padding-top:20px}

9
css/mobile.css
View File

@ -285,7 +285,7 @@ input.required:focus {border:0;background:#21272e !important;color:#fff;line-hei
#pw_confirm .btn_submit {position:absolute;bottom:1em;right:0.5em;width:18%;height:1.9em !important;line-height:1.9em}
/* 설문조사 스킨 */
#poll {margin:0 0 1em;padding:0 0 1em;border-bottom:1px solid #e7f1ed}
#poll {margin:1em 0 0;padding:0 0 1em}
#poll header {position:relative;padding:0 0.5em}
#poll h2 {padding:0 0 0.5em}
#poll header .btn_admin {display:block;padding:0 !important;width:100%;text-align:center}
@ -419,13 +419,14 @@ input.required:focus {border:0;background:#21272e !important;color:#fff;line-hei
.bo_list img {margin-right:4px}
.bo_list img:nth-last-of-type(1) {margin-right:0}
/* 관리자일 때 생략 */
/* 관리자일 때 */
#bo_list_admin th:nth-of-type(1) {width:40px}
#bo_list_admin th:nth-of-type(3) {width:100px}
#bo_list_admin td:nth-of-type(1) {text-align:center}
#bo_list_admin td:nth-of-type(3) {text-align:center}
/* 관리자가 아닐 때 생략 */
/* 관리자가 아닐 때 */
#bo_list th:nth-of-type(2) {width:100px}
#bo_list td:nth-of-type(2) {text-align:center}
@ -533,6 +534,8 @@ input.required:focus {border:0;background:#21272e !important;color:#fff;line-hei
#bo_v_act a {margin-right:0.3em;vertical-align:top}
#bo_v_act span {display:inline-block;margin-right:0.3em;padding:0 1em;border:1px solid #eee !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:2em;vertical-align:top}
#bo_v_act strong {color:#ff3061}
#bo_v_act_good,
#bo_v_act_nogood {display:inline-block;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
#bo_v form {padding-top:1.5em}

9
head.sub.php
View File

@ -82,4 +82,11 @@ var g4_cookie_domain = "<?=G4_COOKIE_DOMAIN?>";
<? if (!defined('G4_IS_ADMIN')) { echo $config['cf_add_script']; } ?>
</head>
<body>
<? if ($is_member) { ?><div id="hd_login_msg"><?=$member['mb_nick']?>님 로그인 중</div><? } ?>
<?
if ($is_member) { // 회원이라면 로그인 중이라는 메세지를 출력해준다.
if ($is_admin == 'super') $sr_admin_msg = "최고관리자 ";
else if ($is_admin == 'group') $sr_admin_msg = "그룹관리자 ";
else if ($is_admin == 'board') $sr_admin_msg = "게시판관리자 ";
?>
<div id="hd_login_msg"><?=$sr_admin_msg?><?=$member['mb_nick']?>님 로그인 중</div>
<? } ?>

1
install/gnuboard4s.sql
View File

@ -266,6 +266,7 @@ CREATE TABLE IF NOT EXISTS `g4s_config` (
`cf_privacy` text NOT NULL,
`cf_open_modify` int(11) NOT NULL default '0',
`cf_memo_send_point` int(11) NOT NULL default '0',
`cf_kcpcert_site_cd` varchar(255) NOT NULL default '',
`cf_adult_check` tinyint(4) NOT NULL default '0',
`cf_1_subj` varchar(255) NOT NULL default '',
`cf_2_subj` varchar(255) NOT NULL default '',

57
js/common.js
View File

@ -522,6 +522,7 @@ var win_poll = function(href) {
/**
* 텍스트 리사이즈
**/
var default_font_size_saved = false;
function font_resize(id, act)
{
var $elements = $("#"+id+" *").not("select").not("option");
@ -530,6 +531,11 @@ function font_resize(id, act)
if(isNaN(count))
count = 0;
// 엘리먼트의 기본 폰트사이즈 저장
if(!default_font_size_saved) {
save_default_font_size($elements);
}
// 크롬의 최소 폰트사이즈 버그로 작게는 한단계만 가능
if(act == "decrease" && count == -1)
return;
@ -538,26 +544,8 @@ function font_resize(id, act)
if($(this).hasClass("no_text_resize"))
return true;
if($(this).children().length != 0) {
return true;
} else {
set_font_size($(this), act);
// 텍스트 노드가 있는지 체크
var $parent = $(this).parent();
var text = $parent.contents().filter(function() {
return this.nodeType == 3;
}).text().replace(/\s*/, "");
if(text.length) {
// 텍스트노드의 형제가 있을 경우 마지막 형제에
// 스타일 적용 후 부모에 폰트 스타일 적용
var $child = $parent.children();
var chdlen = $child.length;
if(chdlen == ($child.index($(this)) + 1)) {
set_font_size($parent, act);
}
}
if($(this).data("fs")) {
set_font_size($(this), act)
}
});
@ -615,13 +603,13 @@ function font_resize2(id, act, loop)
/**
* font size 적용
**/
function set_font_size(el, act)
function set_font_size($el, act)
{
if(el.hasClass("applied"))
if($el.hasClass("applied"))
return true;
var x = 0;
var fs = el.css("font-size");
var fs = $el.data("fs");
var unit = fs.replace(/[0-9\.]/g, "");
var fsize = parseFloat(fs.replace(/[^0-9\.]/g, ""));
var nfsize;
@ -640,7 +628,28 @@ function set_font_size(el, act)
nfsize = nfsize.toFixed(x);
el.css("font-size", nfsize+unit).addClass("applied");
$el.css("font-size", nfsize+unit).addClass("applied");
$el.data("fs", nfsize+unit);
}
/**
* 기본 font size .data()에 저장
**/
function save_default_font_size($el)
{
$el.each(function() {
// 텍스트노드 있는지 체크
var text = $(this).contents().filter(function() {
return this.nodeType == 3;
}).text().replace(/\s*/, "");
if(text.length) {
$(this).data("fs", $(this).css("font-size"));
}
});
default_font_size_saved = true;
}

1
mobile/head.php
View File

@ -96,7 +96,6 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
<div id="wrapper">
<div id="side_nb">
<?=(G4_IS_MOBILE?outlogin('basic'):outlogin('basic')); // 외부 로그인 ?>
<?=(G4_IS_MOBILE?poll('basic'):poll('basic')); // 설문조사 ?>
</div>
<div id="container">
<? if ((!$bo_table || $w == 's' ) && !defined("_INDEX_")) {?><h1 id="wrapper_title"><?=$g4['title']?></h1><?}?>

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

@ -145,11 +145,11 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
<? if ($scrap_href) { ?><a href="<?=$scrap_href; ?>" target="_blank" class="btn_b01" onclick="win_scrap(this.href); return false;">스크랩</a><? } ?>
<? if ($good_href) {?>
<a href="<?=$good_href.'&amp;'.$qstr?>" id="good_button" class="btn_b01">추천 <strong><?=number_format($view['wr_good'])?></strong></a>
<span id="bo_v_act_good"></span>
<b id="bo_v_act_good"></b>
<? } ?>
<? if ($nogood_href) {?>
<a href="<?=$nogood_href.'&amp;'.$qstr?>" id="nogood_button" class="btn_b01">비추천 <strong><?=number_format($view['wr_nogood'])?></strong></a>
<span id="bo_v_act_nogood"></span>
<b id="bo_v_act_nogood"></b>
<? } ?>
</div>
<? } else {
@ -250,9 +250,9 @@ function excute_good(href, $el, $tx)
if(data.count) {
$el.find("strong").text(number_format(String(data.count)));
if($tx.attr("id").search("nogood") > -1) {
$tx.text("이 글을 비추천하셨습니다.").css("display", "inline");
$tx.text("이 글을 비추천하셨습니다.");
} else {
$tx.text("이 글을 추천하셨습니다.").css("display", "inline");
$tx.text("이 글을 추천하셨습니다.");
}
}
}, "json"

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

@ -1,4 +1,4 @@
<?
<?
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
include_once(G4_LIB_PATH.'/thumbnail.lib.php');
?>
@ -145,11 +145,11 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
<? if ($scrap_href) { ?><a href="<?=$scrap_href; ?>" target="_blank" class="btn_b01" onclick="win_scrap(this.href); return false;">스크랩</a><? } ?>
<? if ($good_href) {?>
<a href="<?=$good_href.'&amp;'.$qstr?>" id="good_button" class="btn_b01">추천 <strong><?=number_format($view['wr_good'])?></strong></a>
<span id="bo_v_act_good"></span>
<b id="bo_v_act_good"></b>
<? } ?>
<? if ($nogood_href) {?>
<a href="<?=$nogood_href.'&amp;'.$qstr?>" id="nogood_button" class="btn_b01">비추천 <strong><?=number_format($view['wr_nogood'])?></strong></a>
<span id="bo_v_act_nogood"></span>
<b id="bo_v_act_nogood"></b>
<? } ?>
</div>
<? } else {
@ -250,9 +250,9 @@ function excute_good(href, $el, $tx)
if(data.count) {
$el.find("strong").text(number_format(String(data.count)));
if($tx.attr("id").search("nogood") > -1) {
$tx.text("이 글을 비추천하셨습니다.").css("display", "inline");
$tx.text("이 글을 비추천하셨습니다.");
} else {
$tx.text("이 글을 추천하셨습니다.").css("display", "inline");
$tx.text("이 글을 추천하셨습니다.");
}
}
}, "json"

4
mobile/tail.php
View File

@ -22,6 +22,10 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<hr>
<?=(G4_IS_MOBILE?poll('basic'):poll('basic')); // 설문조사 ?>
<hr>
<footer id="ft">
<h1><?=$config['cf_title']?> 정보</h1>
<?=popular('basic'); // 인기검색어 ?>

8
skin/board/basic/view.skin.php
View File

@ -146,11 +146,11 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
<? if ($good_href) {?>
<a href="<?=$good_href.'&amp;'.$qstr?>" id="good_button" class="btn_b01">추천 <strong><?=number_format($view['wr_good'])?></strong></a>
<span id="bo_v_act_good"></span>
<b id="bo_v_act_good"></b>
<? } ?>
<? if ($nogood_href) {?>
<a href="<?=$nogood_href.'&amp;'.$qstr?>" id="nogood_button" class="btn_b01">비추천 <strong><?=number_format($view['wr_nogood'])?></strong></a>
<span id="bo_v_act_nogood"></span>
<b id="bo_v_act_nogood"></b>
<? } ?>
</div>
@ -252,9 +252,9 @@ function excute_good(href, $el, $tx)
if(data.count) {
$el.find("strong").text(number_format(String(data.count)));
if($tx.attr("id").search("nogood") > -1) {
$tx.text("이 글을 비추천하셨습니다.").css("display", "inline");
$tx.text("이 글을 비추천하셨습니다.");
} else {
$tx.text("이 글을 추천하셨습니다.").css("display", "inline");
$tx.text("이 글을 추천하셨습니다.");
}
}
}, "json"

8
skin/board/gallery/view.skin.php
View File

@ -145,11 +145,11 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
<? if ($scrap_href) { ?><a href="<?=$scrap_href; ?>" target="_blank" class="btn_b01" onclick="win_scrap(this.href); return false;">스크랩</a><? } ?>
<? if ($good_href) {?>
<a href="<?=$good_href.'&amp;'.$qstr?>" id="good_button" class="btn_b01">추천 <strong><?=number_format($view['wr_good'])?></strong></a>
<span id="bo_v_act_good"></span>
<b id="bo_v_act_good"></b>
<? } ?>
<? if ($nogood_href) {?>
<a href="<?=$nogood_href.'&amp;'.$qstr?>" id="nogood_button" class="btn_b01">비추천 <strong><?=number_format($view['wr_nogood'])?></strong></a>
<span id="bo_v_act_nogood"></span>
<b id="bo_v_act_nogood"></b>
<? } ?>
</div>
<? } else {
@ -250,9 +250,9 @@ function excute_good(href, $el, $tx)
if(data.count) {
$el.find("strong").text(number_format(String(data.count)));
if($tx.attr("id").search("nogood") > -1) {
$tx.text("이 글을 비추천하셨습니다.").css("display", "inline");
$tx.text("이 글을 비추천하셨습니다.");
} else {
$tx.text("이 글을 추천하셨습니다.").css("display", "inline");
$tx.text("이 글을 추천하셨습니다.");
}
}
}, "json"