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

This commit is contained in:
whitedot
2013-02-01 14:47:55 +09:00
37 changed files with 125 additions and 223 deletions

View File

@ -31,7 +31,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</section>
<div class="btn_confirm">
<a href="<?=$g4['url']?>/">메인으로 돌아가기</a>
<a href="<?=G4_URL?>/">메인으로 돌아가기</a>
</div>
</form>

View File

@ -2,8 +2,6 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<script src="<?=$g4['url']?>/js/capslock.js"></script>
<div id="mb_confirm">
<h1><?=$g4['title']?></h1>
@ -21,14 +19,14 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<span id="mb_confirm_id"><?=$member[mb_id]?></span>
<label for="confirm_mb_password">패스워드<strong class="sound_only">필수</strong></label>
<input type="password" id="confirm_mb_password" name="mb_password" class="fs_input" maxLength="20" size="15" required onkeypress="check_capslock('confirm_mb_password');">
<input type="password" id="confirm_mb_password" name="mb_password" class="fs_input" maxLength="20" size="15" required>
<input type="submit" id="btn_submit" class="fs_submit" value="확인">
</fieldset>
</form>
<div class="btn_confirm">
<a href="<?=$g4['url']?>/">메인으로 돌아가기</a>
<a href="<?=G4_URL?>">메인으로 돌아가기</a>
</div>
</div>

View File

@ -10,6 +10,8 @@ var member_skin_url = "<?=$member_skin_url?>";
<form id="fregisterform" name="fregisterform" method="post" action="<?=$register_action_url?>" onsubmit="return fregisterform_submit(this);" enctype="multipart/form-data" autocomplete="off">
<input type="hidden" name="w" value="<?=$w?>">
<input type="hidden" name="url" value="<?=$urlencode?>">
<input type="hidden" name="agree" value="<?=$agree?>">
<input type="hidden" name="agree2" value="<?=$agree2?>">
<? if (isset($member['mb_sex'])) { ?><input type="hidden" name="mb_sex" value="<?=$member['mb_sex']?>"><? } ?>
<? if (isset($member['mb_nick_date']) && $member['mb_nick_date'] <= date("Y-m-d", $g4['server_time'] - ($config['cf_nick_modify'] * 86400))) { // 별명수정일이 지나지 않았다면 ?>
<input type="hidden" name="mb_nick_default" value="<?=$member['mb_nick']?>">

View File

@ -4,7 +4,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<div id="reg_result" class="cbg">
<div id="reg_result_logo"><a href="<?=$g4['url']?>/"><img src="<?=$member_skin_url?>/img/reg_result_logo.jpg" alt="메인으로"></a></div>
<div id="reg_result_logo"><a href="<?=G4_URL?>"><img src="<?=$member_skin_url?>/img/reg_result_logo.jpg" alt="메인으로"></a></div>
<p>
<strong><?=$mb['mb_name']?></strong>님의 회원가입을 진심으로 축하합니다.<br>

View File

@ -7,7 +7,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<h2>인기검색어</h2>
<ul>
<? for ($i=0; $i<count($list); $i++) { ?>
<li><a href="<?=$g4['url']?>/bbs/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?=urlencode($list[$i]['pp_word'])?>"><?=$list[$i]['pp_word']?></a></li>
<li><a href="<?=G4_BBS_URL?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?=urlencode($list[$i]['pp_word'])?>"><?=$list[$i]['pp_word']?></a></li>
<? } ?>
</ul>
</div>