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

merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2015-07-20 11:07:33 +09:00
parent e37f5554d2 8da71f60ed
commit 3c9e22a330
8 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bbs/register_email.php
View File

@ -2,27 +2,28 @@
include_once('./_common.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
$g5['title'] = '메일인증 메일주소 변경';
include_once('./_head.php');
$mb_id = substr(clean_xss_tags($_GET['mb_id']), 0, 20);
$sql = " select mb_email, mb_datetime, mb_email_certify from {$g5['member_table']} where mb_id = '{$mb_id}' ";
$mb = sql_fetch($sql);
if (substr($mb['mb_email_certify'],0,1)!=0) {
alert("이미 메일인증 하신 회원입니다.", G5_URL);
}
$g5['title'] = '메일인증 메일주소 변경';
include_once('./_head.php');
?>
<p>메일인증을 받지 못한 경우 회원정보의 메일주소를 변경 할 수 있습니다.</p>
<p class="rg_em_p">메일인증을 받지 못한 경우 회원정보의 메일주소를 변경 할 수 있습니다.</p>
<form method="post" name="fregister_email" action="<?php echo G5_HTTPS_BBS_URL.'/register_email_update.php'; ?>" onsubmit="return fregister_email_submit(this);">
<input type="hidden" name="mb_id" value="<?php echo $mb_id; ?>">
<div class="tbl_frm01 tbl_frm">
<div class="tbl_frm01 tbl_frm rg_em">
<table>
<caption>사이트 이용정보 입력</caption>
<tr>
<th scope="row"><label for="reg_mb_email">E-mail<strong class="sound_only">필수</strong></label></th>
<td><input type="text" name="mb_email" id="reg_mb_email" required class="frm_input email required" size="50" maxlength="100" value="<?php echo $mb['mb_email']; ?>"></td>
<td><input type="text" name="mb_email" id="reg_mb_email" required class="frm_input email required" size="30" maxlength="100" value="<?php echo $mb['mb_email']; ?>"></td>
</tr>
<tr>
<th scope="row">자동등록방지</th>

2
bbs/register_email_update.php
View File

@ -8,7 +8,7 @@ $mb_email = trim($_POST['mb_email']);
$sql = " select mb_name, mb_datetime from {$g5['member_table']} where mb_id = '{$mb_id}' and mb_email_certify <> '' ";
$mb = sql_fetch($sql);
if (!$mb) {
if ($mb) {
alert("이미 메일인증 하신 회원입니다.", G5_URL);
}

6
css/default.css
View File

@ -279,4 +279,8 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
.pg_current {display:inline-block;margin:0 4px 0 0;background:#333;color:#fff;font-weight:normal}
/* Mobile화면으로 */
#device_change {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;background:#fff;color:#000;font-size:2em;text-decoration:none;text-align:center}
#device_change {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;background:#fff;color:#000;font-size:2em;text-decoration:none;text-align:center}
/*메일인증*/
.rg_em{margin-top:5px}
.rg_em caption{padding:0;font-size:0;line-height:0;overflow:hidden}

8
css/mobile.css
View File

@ -247,4 +247,10 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
.pg_current {display:inline-block;margin:0 4px 0 0;background:#333;color:#fff;font-weight:normal}
/* PC화면으로 */
#device_change {display:block;margin:5px;padding:5px 0;border:1px solid #eee;border-radius:2em;color:#000;font-size:1em;text-decoration:none;text-align:center}
#device_change {display:block;margin:5px;padding:5px 0;border:1px solid #eee;border-radius:2em;color:#000;font-size:1em;text-decoration:none;text-align:center}
/*메일인증*/
.rg_em_p{padding:0 5px}
.rg_em{margin:5px 5px 10px;}
.rg_em table{width:100%;border-collapse:collapse}
.rg_em caption{padding:0;font-size:0;line-height:0;overflow:hidden}

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

@ -65,8 +65,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
<?php } ?>
<?php
if (implode('', $view['link'])) {
?>
if ($view['link']) {
?>
<section id="bo_v_link">
<h2>관련링크</h2>
<ul>

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

@ -65,8 +65,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
<?php } ?>
<?php
if (implode('', $view['link'])) {
?>
if ($view['link']) {
?>
<section id="bo_v_link">
<h2>관련링크</h2>
<ul>

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

@ -68,8 +68,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
<?php } ?>
<?php
if (implode('', $view['link'])) {
?>
if ($view['link']) {
?>
<!-- 관련링크 시작 { -->
<section id="bo_v_link">
<h2>관련링크</h2>

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

@ -68,8 +68,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
<?php } ?>
<?php
if (implode('', $view['link'])) {
?>
if ($view['link']) {
?>
<!-- 관련링크 시작 { -->
<section id="bo_v_link">
<h2>관련링크</h2>