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-04-08 17:04:38 +09:00
parent 88263a77b9 821f95d84b
commit 33dba0973a
15 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bbs/board.php
View File

@ -129,7 +129,10 @@ if (isset($wr_id) && $wr_id) {
include_once(G4_PATH.'/head.sub.php');
$width = $board['bo_table_width'];
if ($width <= 100) $width .= '%';
if ($width <= 100)
$width .= '%';
else
$width .='px';
// IP보이기 사용 여부
$ip = "";

18
bbs/email_certify.php
View File

@ -1,21 +1,21 @@
<?
include_once('./_common.php');
$sql = " select mb_id, mb_email, mb_datetime from {$g4[member_table]} where mb_id = '{$mb_id}' ";
$sql = " select mb_id, mb_email, mb_datetime from {$g4['member_table']} where mb_id = '{$mb_id}' ";
$row = sql_fetch($sql);
if (!$row[mb_id])
alert('존재하는 회원이 아닙니다.', G4_PATH);
if (!$row['mb_id'])
alert('존재하는 회원이 아닙니다.', G4_URL);
if ($mb_md5)
if ($mb_md5)
{
$tmp_md5 = md5($row[mb_id].$row[mb_email].$row[mb_datetime]);
if ($mb_md5 == $tmp_md5)
$tmp_md5 = md5($row['mb_id'].$row['mb_email'].$row['mb_datetime']);
if ($mb_md5 == $tmp_md5)
{
sql_query(" update {$g4[member_table]} set mb_email_certify = '".G4_TIME_YMDHIS."' where mb_id = '{$mb_id}' ");
sql_query(" update {$g4['member_table']} set mb_email_certify = '".G4_TIME_YMDHIS."' where mb_id = '{$mb_id}' ");
alert('E-mail 인증 처리를 완료 하였습니다.', G4_PATH);
alert('E-mail 인증 처리를 완료 하였습니다.', G4_URL);
}
}
alert('제대로 된 값이 넘어오지 않았습니다.', G4_PATH);
alert('제대로 된 값이 넘어오지 않았습니다.', G4_URL);
?>

2
bbs/password.php
View File

@ -23,7 +23,7 @@ switch ($w) {
goto_url('./board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id);
else {
$action = './password_check.php';
$return_url = $_SERVER['HTTP_REFERER'];
$return_url = './board.php?bo_table='.$bo_table;
}
break;
default :

4
bbs/register_form_update_mail3.php
View File

@ -24,12 +24,12 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<b><?=$mb_name?></b> 님의 E-mail 주소가 변경되었습니다.<br><br>
아래의 주소를 클릭하시면 인증이 완료됩니다.<br>
<a href="<?=$certify_href?>"><b><?=$certify_href?></b></a><br><br>
<a href="<?=$certify_href?>" target="_blank"><b><?=$certify_href?></b></a><br><br>
회원님의 성원에 보답하고자 더욱 더 열심히 하겠습니다.<br>
감사합니다.
</p>
<a href="<?=G4_BBS_URL?>/login.php" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center"><?=$config['cf_title']?> 로그인</a>
<a href="<?=G4_BBS_URL?>/login.php" target="_blank" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center"><?=$config['cf_title']?> 로그인</a>
</div>
</div>

2
bbs/write.php
View File

@ -338,6 +338,8 @@ $upload_max_filesize = number_format($board['bo_upload_size']) . ' 바이트';
$width = $board['bo_table_width'];
if ($width <= 100)
$width .= '%';
else
$width .= 'px';
$captcha_html = '';
$captcha_js = '';

1
css/default.css
View File

@ -145,6 +145,7 @@ a:active {color:#000;text-decoration:underline}
.btn_confirm {text-align:center} /* 서식단계 진행 */
.btn_submit {padding:0 10px;height:24px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer}
button.btn_submit {height:22px !important;font-size:1em}
fieldset .btn_submit {height:22px !important;font-size:1em}
.btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em}
button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;line-height:2em}
.btn_cancel:focus,

2
css/mobile.css
View File

@ -94,7 +94,7 @@ pre {overflow-x:scroll;font-size:1.1em}
#ft_copy {background:#232323}
#ft_copy p {position:relative;padding:0.5em;color:#4a9ab8}
#ft_copy b {color:#fff}
#ft_copy a {position:absolute;top:0.5em;right:0.5em;color:#fff;text-decoration:none}
#ft_copy a {color:#fff;text-decoration:none}
/* PC화면으로 */
#g4s_cng {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;color:#000;font-size:1em;text-decoration:none;text-align:center}

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

@ -12,7 +12,7 @@ if ($is_nogood) $colspan++;
<? if (!$wr_id) {?><h1 id="bo_list_title"><?=$g4['title']?></h1><?}?>
<!-- 게시판 목록 시작 -->
<div id="bo_list<? if ($is_admin) echo "_admin";?>" style="width:<?=$width;?>">
<div id="bo_list<? if ($is_admin) echo "_admin";?>">
<? if ($is_category) { ?>
<form name="fcategory" id="fcategory" method="get">

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

@ -20,7 +20,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
</div>
<!-- 게시판 목록 시작 -->
<div id="bo_img" style="width:<?=$width;?>">
<div id="bo_img">
<? if ($is_category) { ?>
<form name="fcategory" id="fcategory" method="get">

2
skin/board/basic/list.skin.php
View File

@ -128,7 +128,7 @@ if ($is_nogood) $colspan++;
</ul>
<ul class="btn_bo_user">
<li><? if ($write_href) { ?><a href="<?=$write_href?>" class="btn_b02">글쓰기</a><? } ?></li>
<? if ($write_href) { ?><li><a href="<?=$write_href?>" class="btn_b02">글쓰기</a></li><? } ?>
</ul>
</div>
<? } ?>

2
skin/board/basic/style.css
View File

@ -86,7 +86,7 @@
.bo_v_com li {float:left;margin-left:5px}
#bo_v_atc {min-height:200px;height:auto !important;height:200px}
#bo_v_atc h1 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_atc header h1 {margin:0;padding:0;width:1px;height:1px;overflow:hidden}
#bo_v_img {margin:0 0 10px;width:100%;overflow:hidden:zoom:1}
#bo_v_img:after {display:block;visibility:hidden;clear:both;content:""}

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

@ -41,9 +41,9 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
?>
<li>
<a href="<? echo $view['file'][$i]['href']; ?>" class="view_file_download">
<img src="<?=$board_skin_url?>/img/icon_file.gif" alt="첨부파일">
<img src="<?=$board_skin_url?>/img/icon_file.gif" alt="첨부">
<strong><?=$view['file'][$i]['source']?></strong>
<span> (<?=$view['file'][$i]['size']?>)</span>
<?=$view['file'][$i]['bf_content']?> (<?=$view['file'][$i]['size']?>)
</a>
<span class="bo_v_file_cnt"><?=$view['file'][$i]['download']?>회 다운로드</span>
<span>DATE : <?=$view['file'][$i]['datetime']?></span>

2
skin/board/gallery/style.css
View File

@ -108,7 +108,7 @@
.bo_v_com li {float:left;margin-left:5px}
#bo_v_atc {min-height:200px;height:auto !important;height:200px}
#bo_v_atc h1 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_atc header h1 {margin:0;padding:0;width:1px;height:1px;overflow:hidden}
#bo_v_img {margin:0 0 10px;width:100%;overflow:hidden:zoom:1}
#bo_v_img:after {display:block;visibility:hidden;clear:both;content:""}

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

@ -41,9 +41,9 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
?>
<li>
<a href="<? echo $view['file'][$i]['href']; ?>" class="view_file_download">
<img src="<?=$board_skin_url?>/img/icon_file.gif" alt="첨부파일">
<img src="<?=$board_skin_url?>/img/icon_file.gif" alt="첨부">
<strong><?=$view['file'][$i]['source']?></strong>
<span> (<?=$view['file'][$i]['size']?>)</span>
<?=$view['file'][$i]['bf_content']?> (<?=$view['file'][$i]['size']?>)
</a>
<span class="bo_v_file_cnt"><?=$view['file'][$i]['download']?>회 다운로드</span>
<span>DATE : <?=$view['file'][$i]['datetime']?></span>

2
tail.sub.php
View File

@ -21,8 +21,6 @@ $(function() {
<![endif]-->
<script>
$('.sv').removeClass('sv_js_off'); //js 사용 가능한지를 사이드뷰에 알려주는 역할
$(function(){
var hide_menu = false;
var mouse_event = false;