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

g4s merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-05-29 09:06:13 +09:00
parent 93848e4819 b1dcfd185c
commit 158eccb534
104 changed files with 10830 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
skin/member/basic/formmail.skin.php
View File

@ -93,4 +93,4 @@ function fformmail_submit(f)
return true;
}
</script>
</script>

2
skin/member/basic/login.skin.php
View File

@ -54,4 +54,4 @@ function flogin_submit(f)
{
return true;
}
</script>
</script>

2
skin/member/basic/member_confirm.skin.php
View File

@ -44,4 +44,4 @@ function fmemberconfirm_submit(f)
return true;
}
</script>
</script>

2
skin/member/basic/memo_form.skin.php
View File

@ -56,4 +56,4 @@ function fmemoform_submit(f)
return true;
}
</script>
</script>

1
skin/member/basic/memo_view.skin.php
View File

@ -40,6 +40,7 @@ else {
<?php echo conv_content($memo['me_memo'], 0) ?>
</p>
</article>
<div class="btn_win">
<?php if($prev_link) { ?>
<a href="<?php echo $prev_link ?>">이전쪽지</a>

2
skin/member/basic/password_lost.skin.php
View File

@ -41,4 +41,4 @@ $(function() {
var left = sw / 2 - cw / 2;
moveTo(left, top);
});
</script>
</script>

2
skin/member/basic/profile.skin.php
View File

@ -42,4 +42,4 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<div class="btn_win">
<button type="button" onclick="window.close();">창닫기</button>
</div>
</div>
</div>

127
skin/member/basic/register_form.skin.php
View File

@ -8,11 +8,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<form id="fregisterform" name="fregisterform" action="<?php echo $register_action_url ?>" onsubmit="return fregisterform_submit(this);" method="post" enctype="multipart/form-data" autocomplete="off">
<input type="hidden" name="w" value="<?php echo $w ?>">
<input type="hidden" name="url" value="<?php echo $urlencode ?>">
<?php if (isset($member['mb_sex'])) { ?><input type="hidden" name="mb_sex" value="<?php echo $member['mb_sex'] ?>"><?php } ?>
<input type="hidden" name="agree" value="<?php echo $agree ?>">
<input type="hidden" name="agree2" value="<?php echo $agree2 ?>">
<?php if (isset($member['mb_sex'])) { ?><input type="hidden" name="mb_sex" value="<?php echo $member['mb_sex'] ?>"><?php } ?>
<?php 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="<?php echo $member['mb_nick'] ?>">
<input type="hidden" name="mb_nick" value="<?php echo $member['mb_nick'] ?>">
<?php } ?>
<?php } ?>
<table class="frm_tbl">
<caption>사이트 이용정보 입력</caption>
@ -39,19 +41,10 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<tr>
<th scope="row"><label for="reg_mb_name">이름<strong class="sound_only">필수</strong></label></th>
<td>
<?php if ($w=="u" && $config['cf_kcpcert_use']) { ?>
<span class="frm_info">휴대폰 본인확인 후에는 이름과 휴대폰번호가 자동 입력되며 수동으로 입력할수 없게 됩니다.</span>
<?php } ?>
<input type="text" id="reg_mb_name" name="mb_name" value="<?php echo $member['mb_name'] ?>" <?php echo $required ?> <?php if ($w=='u') echo 'readonly'; ?> class="frm_input nospace <?php echo $required ?> <?php echo $readonly ?>" size="10">
<?php if ($w=="u" && $config['cf_kcpcert_use']) { ?>
<button type="button" id="win_kcpcert" class="btn_frmline">휴대폰 본인확인</button>
<noscript>휴대폰 본인확인을 위해서는 자바스크립트 사용이 가능해야합니다.</noscript>
<?php } ?>
<?php if ($member['mb_hp_certify']) { ?>
<div id="msg_hp_certify">
휴대폰 <strong>본인확인</strong><?php if ($member['mb_hp_certify']) { ?> 및 <strong>성인인증</strong><?php } ?> 완료
</div>
<?php } ?>
<?php /* if ($w=='') { echo "<span class=\"frm_info\">공백없이 한글만 입력하세요.</span>"; } */ ?>
<?php echo $config['cf_kcpcert_use'] ? '<span class="frm_info">이름과 휴대폰번호는 아래의 휴대폰 본인확인 기능을 사용하여 입력해 주십시오.</span>' : ''; ?>
<?php echo ($config['cf_kcpcert_use']=='test') ? '<span class="frm_info">테스트의 경우 이동통신사는 반드시 KT를 선택해 주십시오. 나머지 항목은 임의로 입력하시면 됩니다.</span>' : ''; ?>
<input type="text" id="reg_mb_name" name="mb_name" value="<?php echo $member['mb_name'] ?>" <?php echo $required ?> <?php if ($config['cf_kcpcert_use']!=''||$w=='u') echo 'readonly'; ?> class="frm_input nospace <?php echo $required ?> <?php echo $readonly ?>" size="10">
</td>
</tr>
<?php if ($req_nick) { ?>
@ -67,17 +60,17 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<span id="msg_mb_nick"></span>
</td>
</tr>
<?php } ?>
<?php } ?>
<tr>
<th scope="row"><label for="reg_mb_email">E-mail<strong class="sound_only">필수</strong></label></th>
<td>
<?php if ($config['cf_use_email_certify']) { ?>
<span class="frm_info">
<?php if ($w=='') { echo "E-mail 로 발송된 내용을 확인한 후 인증하셔야 회원가입이 완료됩니다."; } ?>
<?php if ($w=='u') { echo "E-mail 주소를 변경하시면 다시 인증하셔야 합니다."; } ?>
<?php if ($w=='') { echo "E-mail 로 발송된 내용을 확인한 후 인증하셔야 회원가입이 완료됩니다."; } ?>
<?php if ($w=='u') { echo "E-mail 주소를 변경하시면 다시 인증하셔야 합니다."; } ?>
</span>
<?php } ?>
<?php } ?>
<input type="hidden" name="old_email" value="<?php echo $member['mb_email'] ?>">
<input type="text" name="mb_email" value="<?php echo isset($member['mb_email'])?$member['mb_email']:''; ?>" id="reg_mb_email" required class="frm_input email required" size="50" maxlength="100">
</td>
@ -88,27 +81,37 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<th scope="row"><label for="reg_mb_homepage">홈페이지<?php if ($config['cf_req_homepage']){ ?><strong class="sound_only">필수</strong><?php } ?></label></th>
<td><input type="text" name="mb_homepage" value="<?php echo $member['mb_homepage'] ?>" id="reg_mb_homepage" <?php echo $config['cf_req_homepage']?"required":""; ?> class="frm_input <?php echo $config['cf_req_homepage']?"required":""; ?>" size="50" maxlength="255"></td>
</tr>
<?php } ?>
<?php } ?>
<?php if ($config['cf_use_tel']) { ?>
<tr>
<th scope="row"><label for="reg_mb_tel">전화번호<?php if ($config['cf_req_tel']) { ?><strong class="sound_only">필수</strong><?php } ?></label></th>
<td><input type="text" name="mb_tel" value="<?php echo $member['mb_tel'] ?>" id="reg_mb_tel" <?php echo $config['cf_req_tel']?"required":""; ?> class="frm_input <?php echo $config['cf_req_tel']?"required":""; ?>" maxlength="20"></td>
</tr>
<?php } ?>
<?php } ?>
<?php if ($config['cf_use_hp']) { ?>
<?php if ($config['cf_use_hp'] || $config['cf_kcpcert_use']) { ?>
<tr>
<th scope="row"><label for="reg_mb_hp">휴대폰번호<?php if ($config['cf_req_hp']) { ?><strong class="sound_only">필수</strong><?php } ?></label></th>
<td><input type="text" name="mb_hp" value="<?php echo $member['mb_hp'] ?>" id="reg_mb_hp" <?php echo ($config['cf_req_hp'])?"required":""; ?> class="frm_input <?php echo ($config['cf_req_hp'])?"required":""; ?>" maxlength="20"></td>
<td>
<?php if ($config['cf_kcpcert_use']) { ?>
<span class="frm_info">휴대폰번호는 휴대폰 본인확인 기능을 이용하여 입력하세요.</span>
<?php } ?>
<input type="text" name="mb_hp" value="<?php echo $member[mb_hp] ?>" id="reg_mb_hp" <?php echo ($config['cf_req_hp']||$config['cf_kcpcert_use'])?"required":""; ?> class="frm_input <?php echo ($config['cf_req_hp']||$config['cf_kcpcert_use'])?"required":""; ?>" <?php echo $config['cf_kcpcert_use']?"readonly":""; ?> maxlength="20">
<?php if ($config['cf_kcpcert_use']) { ?>
<input type="hidden" name="old_mb_hp" value="<?php echo $member['mb_hp'] ?>">
<button type="button" id="win_kcpcert" class="btn_frmline">휴대폰 본인확인</button>
<noscript>휴대폰 본인확인을 위해서는 자바스크립트 사용이 가능해야합니다.</noscript>
<?php } ?>
</td>
</tr>
<?php } ?>
<?php } ?>
<?php if ($config['cf_use_addr']) { ?>
<tr>
<th scope="row">
주소
<?php if ($config['cf_req_addr']) { ?><strong class="sound_only">필수</strong><?php } ?>
<?php if ($config['cf_req_addr']) { ?><strong class="sound_only">필수</strong><?php } ?>
</th>
<td>
<label for="reg_mb_zip1" class="sound_only">우편번호 앞자리<?php echo $config['cf_req_addr']?'<strong class="sound_only"> 필수</strong>':''; ?></label>
@ -129,7 +132,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
</script>
</td>
</tr>
<?php } ?>
<?php } ?>
</table>
<table class="frm_tbl">
@ -139,14 +142,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<th scope="row"><label for="reg_mb_signature">서명<?php if ($config['cf_req_signature']){ ?><strong class="sound_only">필수</strong><?php } ?></label></th>
<td><textarea name="mb_signature" id="reg_mb_signature" <?php echo $config['cf_req_signature']?"required":""; ?> class="<?php echo $config['cf_req_signature']?"required":""; ?>"><?php echo $member['mb_signature'] ?></textarea></td>
</tr>
<?php } ?>
<?php } ?>
<?php if ($config['cf_use_profile']) { ?>
<tr>
<th scope="row"><label for="reg_mb_profile">자기소개</label></th>
<td><textarea name="mb_profile" id="reg_mb_profile" <?php echo $config['cf_req_profile']?"required":""; ?> class="<?php echo $config['cf_req_profile']?"required":""; ?>"><?php echo $member['mb_profile'] ?></textarea></td>
</tr>
<?php } ?>
<?php } ?>
<?php if ($config['cf_use_member_icon'] && $member['mb_level'] >= $config['cf_icon_level']) { ?>
<tr>
@ -157,14 +160,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
gif만 가능하며 용량 <?php echo number_format($config['cf_member_icon_size']) ?>바이트 이하만 등록됩니다.
</span>
<input type="file" name="mb_icon" id="reg_mb_icon" class="frm_input">
<?php if ($w == 'u' && file_exists($mb_icon_path)) { ?>
<img src="<?php echo $mb_icon_url; ?>" alt="회원아이콘">
<?php if ($w == 'u' && file_exists($mb_icon)) { ?>
<input type="checkbox" name="del_mb_icon" value="1" id="del_mb_icon">
<label for="del_mb_icon">삭제</label>
<?php } ?>
<?php } ?>
</td>
</tr>
<?php } ?>
<?php } ?>
<tr>
<th scope="row"><label for="reg_mb_mailling">메일링서비스</label></th>
@ -182,7 +184,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
휴대폰 문자메세지를 받겠습니다.
</td>
</tr>
<?php } ?>
<?php } ?>
<?php if (isset($member['mb_open_date']) && $member['mb_open_date'] <= date("Y-m-d", G4_SERVER_TIME - ($config['cf_open_modify'] * 86400)) || empty($member['mb_open_date'])) { // 정보공개 수정일이 지났다면 수정가능 ?>
<tr>
@ -207,14 +209,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<input type="hidden" name="mb_open" value="<?php echo $member['mb_open'] ?>">
</td>
</tr>
<?php } ?>
<?php } ?>
<?php if ($w == "" && $config['cf_use_recommend']) { ?>
<tr>
<th scope="row"><label for="reg_mb_recommend">추천인아이디</label></th>
<td><input type="text" name="mb_recommend" id="reg_mb_recommend" class="frm_input"></td>
<td><input type="text" name="mb_recommend" id="reg_mb_recommend" class="frm_input" required></td>
</tr>
<?php } ?>
<?php } ?>
<tr>
<th scope="row">자동등록방지</th>
@ -226,7 +228,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<p>
작성하신 내용를 발송하시려면 <strong><?php echo $w==''?'회원가입':'정보수정'; ?></strong> 버튼을, 작성을 취소하고 창을 닫으시려면 <strong>취소</strong> 링크를 누르세요.
</p>
<input type="submit" value="<?php echo $w==''?'회원가입':'정보수정'; ?>" id="btn_submit" class="btn_submit" accesskey="s">
<input type="submit" value="<?php echo $w==''?'회원가입':'정보수정'; ?>" class="btn_submit" accesskey="s">
<a href="<?php echo $g4['path'] ?>/" class="btn_cancel">취소</a>
</div>
</form>
@ -234,13 +236,17 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<?php
if ($config['cf_kcpcert_use']) {
// 휴대폰인증 form
include_once(G4_KCPCERT_PATH.'/kcpcert_form.php');
include_once(G4_KCP_PATH.'/kcpcert_form.php');
?>
<script>
$(function() {
$("#reg_zip_find").css("display", "inline-block");
$("#reg_mb_zip1, #reg_mb_zip2, #reg_mb_addr1").attr("readonly", true);
// 휴대폰인증
$('#win_kcpcert').click(function() {
auth_type_check();
auth_type_check($("#reg_mb_name").val());
return false;
});
});
@ -248,11 +254,6 @@ $(function() {
<?php } ?>
<script>
$(function() {
$("#reg_zip_find").css("display", "inline-block");
$("#reg_mb_zip1, #reg_mb_zip2, #reg_mb_addr1").attr("readonly", true);
});
// submit 최종 폼체크
function fregisterform_submit(f)
{
@ -295,6 +296,15 @@ function fregisterform_submit(f)
f.mb_name.focus();
return false;
}
/*
var pattern = /([^가-힣\x20])/i;
if (pattern.test(f.mb_name.value)) {
alert('이름은 한글로 입력하십시오.');
f.mb_name.select();
return false;
}
*/
}
// 별명 검사
@ -327,7 +337,7 @@ function fregisterform_submit(f)
}
}
if (typeof(f.mb_recommend) != 'undefined' && f.mb_recommend.value) {
if (typeof(f.mb_recommend) != 'undefined') {
if (f.mb_id.value == f.mb_recommend.value) {
alert('본인을 추천할 수 없습니다.');
f.mb_recommend.focus();
@ -342,9 +352,32 @@ function fregisterform_submit(f)
}
}
<?php echo chk_captcha_js(); ?>
<?php if ($config['cf_kcpcert_use']) { ?>
var error = "";
$.ajax({
url: "<?php echo G4_KCP_URL ?>/kcpcert.ajax.php",
type: "POST",
data: {
"w": f.w.value,
"mb_name": f.mb_name.value,
"mb_hp": f.mb_hp.value,
"old_mb_hp":f.old_mb_hp.value
},
dataType: "json",
async: false,
cache: false,
success: function(data, textStatus) {
error = data.error;
}
});
document.getElementById("btn_submit").disabled = "disabled";
if (error) {
alert(error);
return false;
}
<?php } ?>
<?php echo chk_captcha_js(); ?>
return true;
}

7
skin/member/basic/register_form_update.head.skin.php Normal file
View File

@ -0,0 +1,7 @@
<?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
if ($config['cf_kcpcert_use']) {
include_once(G4_KCP_PATH.'/kcpcert.head.skin.php');
}
?>

7
skin/member/basic/register_form_update.tail.skin.php Normal file
View File

@ -0,0 +1,7 @@
<?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
if ($config['cf_kcpcert_use']) {
include_once(G4_KCP_PATH.'/kcpcert.tail.skin.php');
}
?>

2
skin/member/basic/scrap.skin.php
View File

@ -38,4 +38,4 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<div class="btn_win">
<button type="button" onclick="window.close();">창닫기</button>
</div>
</div>
</div>

2
skin/member/basic/zip.skin.php
View File

@ -64,4 +64,4 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
}
</script>
<?php } ?>
</div>
</div>