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

This commit is contained in:
whitedot
2013-01-30 10:36:38 +09:00
34 changed files with 425 additions and 402 deletions

View File

@ -77,8 +77,6 @@ jQuery(function($){
var member_skin_path = "<?=$member_skin_path?>";
</script>
<script type="text/javascript" src="<?=$member_skin_path?>/ajax_register_form.jquery.js"></script>
<script type="text/javascript" src="<?=$g4[path]?>/js/md5.js"></script>
<script type="text/javascript" src="<?=$g4[path]?>/js/sideview.js"></script>
<form id="fregisterform" name=fregisterform method=post onsubmit="return fregisterform_submit(this);" enctype="multipart/form-data" autocomplete="off">
<input type=hidden name=w value="<?=$w?>">
@ -551,7 +549,7 @@ function fregisterform_submit(f)
?>
// 보안인증관련 코드로 반드시 포함되어야 합니다.
set_cookie("<?=md5($token)?>", "<?=base64_encode($token)?>", 1, "<?=$g4['cookie_domain']?>");
//set_cookie("<?=md5($token)?>", "<?=base64_encode($token)?>", 1, "<?=$g4['cookie_domain']?>");
return true;
}

View File

@ -45,7 +45,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<script>
function fmemoform_submit(f)
{
<? if ($is_guest) { echo chk_captcha_js(); } ?>
<? echo chk_captcha_js(); ?>
return true;
}

View File

@ -7,7 +7,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<header id="ol_after_hd">
<h2>나의 이용정보</h2>
<strong><?=$nick?></strong>님
<? if ($is_admin == 'super' || $is_auth) { ?><a href="<?=G4_ADM_URL?>" id="ol_admin">관리자</a><? } ?>
<? if ($is_admin == 'super' || $is_auth) { ?><a href="<?=G4_ADMIN_URL?>" id="ol_admin">관리자</a><? } ?>
</header>
<ul id="ol_after_private">
<li>

View File

@ -1,5 +1,5 @@
<?
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
global $is_admin;
?>
@ -17,6 +17,6 @@ global $is_admin;
<dt>전체</dt>
<dd><?=number_format($visit[4])?></dd>
</dl>
<? if ($is_admin == "super") { ?><a href="<?=$g4['admin_path']?>/visit_list.php">상세보기</a><?}?>
<? if ($is_admin == "super") { ?><a href="<?=G4_ADMIN_URL?>/visit_list.php">상세보기</a><?}?>
</div>
</section>