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

Merge branch 'master' into sns

Browse Source 
Conflicts:
	bbs/register_form_update.php
	config.php
	extend/.htaccess
	plugin/kcp/kcpcert.head.skin.php
	skin/board/basic/view_comment.skin.php
This commit is contained in:
gnuboard
2013-05-21 16:06:07 +09:00
parent 811f9a8893 18b5212c86
commit b1b747646b
121 changed files with 1707 additions and 1874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
bbs/register_form_update.php
View File

@ -75,7 +75,11 @@ if ($w == '' || $w == 'u') {
if ($w=='') {
if ($msg = exist_mb_id($mb_id)) alert($msg);
<<<<<<< HEAD
if ($config['cf_use_recommend']) {
=======
if ($config['cf_use_recommend'] && $mb_recommend) {
>>>>>>> master
if (!exist_mb_id($mb_recommend))
alert("추천인이 존재하지 않습니다.");
}
@ -264,7 +268,29 @@ if ($w == '') {
if ($old_email != $mb_email && $config['cf_use_email_certify'])
$sql_email_certify = " , mb_email_certify = '' ";
// set mb_name = '$mb_name', 제거
/////////////////////////////////////////////////////////////////
// 휴대폰 본인확인
/////////////////////////////////////////////////////////////////
$sql_hp_certify = "";
$md5_cert_no = get_session("ss_kcpcert_no");
if ($config['cf_kcpcert_use'] && $md5_cert_no) {
$hash_data = md5($mb_hp.$mb_name.$md5_cert_no);
// 해시값이 틀린 경우에는 휴대폰 인증 값을 무효화 한다.
if (get_session("ss_kcpcert_hash") != $hash_data) {
$sql_hp_certify .= " , mb_hp = '' ";
$sql_hp_certify .= " , mb_hp_certify = 0 ";
$sql_hp_certify .= " , mb_adult = 0 ";
}
} else {
if (get_session("ss_reg_mb_name") != $mb_name ||
get_session("ss_reg_mb_hp") != $mb_hp) {
$sql_hp_certify .= " , mb_hp = '{$mb_hp}' ";
$sql_hp_certify .= " , mb_hp_certify = 0 ";
$sql_hp_certify .= " , mb_adult = 0 ";
}
}
/////////////////////////////////////////////////////////////////
$sql = " update {$g4['member_table']}
set mb_nick = '{$mb_nick}',
mb_mailling = '{$mb_mailling}',
@ -273,7 +299,6 @@ if ($w == '') {
mb_email = '{$mb_email}',
mb_homepage = '{$mb_homepage}',
mb_tel = '{$mb_tel}',
mb_hp = '{$mb_hp}',
mb_zip1 = '{$mb_zip1}',
mb_zip2 = '{$mb_zip2}',
mb_addr1 = '{$mb_addr1}',
@ -296,6 +321,7 @@ if ($w == '') {
{$sql_open_date}
{$sql_sex}
{$sql_email_certify}
{$sql_hp_certify}
where mb_id = '$mb_id' ";
sql_query($sql);
@ -324,7 +350,7 @@ if ($msg)
echo '<script>alert(\''.$msg.'\');</script>';
if ($w == "") {
goto_url(G4_BBS_URL.'/register_result.php');
goto_url(G4_HTTP_BBS_URL.'/register_result.php');
} else if ($w == 'u') {
$row = sql_fetch(" select mb_password from {$g4['member_table']} where mb_id = '{$member['mb_id']}' ");
$tmp_password = $row['mb_password'];