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

Merge branch 'g4s'

Browse Source
This commit is contained in:
chicpro
2013-05-02 14:53:04 +09:00
parent bcaa9a0fe5 60b7649f6f
commit 5f9dd384d0
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
adm/config_form.php
View File

@ -27,23 +27,25 @@ if (!isset($config['cf_mobile_new_skin'])) {
if(!isset($config['cf_gcaptcha_mp3'])) { if(!isset($config['cf_gcaptcha_mp3'])) {
sql_query(" ALTER TABLE `{$g4['config_table']}` sql_query(" ALTER TABLE `{$g4['config_table']}`
ADD `cf_gcaptcha_mp3` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_mobile_member_skin` ", TRUE); ADD `cf_gcaptcha_mp3` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_mobile_member_skin` ", true);
} }
if(!isset($config['cf_kcpcert_site_cd'])) { if(!isset($config['cf_kcpcert_site_cd'])) {
sql_query(" ALTER TABLE `{$g4['config_table']}` sql_query(" ALTER TABLE `{$g4['config_table']}`
ADD `cf_kcpcert_site_cd` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_memo_send_point` ", TRUE); ADD `cf_kcpcert_site_cd` VARCHAR(255) NOT NULL DEFAULT '' AFTER `cf_memo_send_point` ", true);
} }
if(!isset($config['cf_kcpcert_use'])) { if(!isset($config['cf_kcpcert_use'])) {
sql_query(" ALTER TABLE `{$g4['config_table']}` sql_query(" ALTER TABLE `{$g4['config_table']}`
ADD `cf_kcpcert_use` ENUM('','test','service') NOT NULL DEFAULT '' AFTER `cf_memo_send_point` ", TRUE); ADD `cf_kcpcert_use` ENUM('','test','service') NOT NULL DEFAULT '' AFTER `cf_memo_send_point` ", true);
} }
sql_query(" ALTER TABLE `{$g4['config_table']}` CHANGE `cf_kcpcert_use` `cf_kcpcert_use` ENUM('','test','service') NOT NULL DEFAULT '' ", false);
if(!isset($config['cf_mobile_pages'])) { if(!isset($config['cf_mobile_pages'])) {
sql_query(" ALTER TABLE `{$g4['config_table']}` sql_query(" ALTER TABLE `{$g4['config_table']}`
ADD `cf_mobile_pages` INT(11) NOT NULL DEFAULT '0' AFTER `cf_write_pages` ", TRUE); ADD `cf_mobile_pages` INT(11) NOT NULL DEFAULT '0' AFTER `cf_write_pages` ", true);
sql_query(" UPDATE `{$g4['config_table']}` SET cf_mobile_pages = '5' ", TRUE); sql_query(" UPDATE `{$g4['config_table']}` SET cf_mobile_pages = '5' ", true);
} }
// uniqid 테이블이 없을 경우 생성 // uniqid 테이블이 없을 경우 생성

2
bbs/register_form_update.php
View File

@ -75,7 +75,7 @@ if ($w == '' || $w == 'u') {
if ($w=='') { if ($w=='') {
if ($msg = exist_mb_id($mb_id)) alert($msg); if ($msg = exist_mb_id($mb_id)) alert($msg);
if ($config['cf_use_recommend']) { if ($config['cf_use_recommend'] && $mb_recommend) {
if (!exist_mb_id($mb_recommend)) if (!exist_mb_id($mb_recommend))
alert("추천인이 존재하지 않습니다."); alert("추천인이 존재하지 않습니다.");
} }

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

@ -214,7 +214,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<?php if ($w == "" && $config['cf_use_recommend']) { ?> <?php if ($w == "" && $config['cf_use_recommend']) { ?>
<tr> <tr>
<th scope="row"><label for="reg_mb_recommend">추천인아이디</label></th> <th scope="row"><label for="reg_mb_recommend">추천인아이디</label></th>
<td><input type="text" name="mb_recommend" id="reg_mb_recommend" class="frm_input" required></td> <td><input type="text" name="mb_recommend" id="reg_mb_recommend" class="frm_input"></td>
</tr> </tr>
<?php } ?> <?php } ?>
@ -337,7 +337,7 @@ function fregisterform_submit(f)
} }
} }
if (typeof(f.mb_recommend) != 'undefined') { if (typeof(f.mb_recommend) != 'undefined' && f.mb_recommend.value) {
if (f.mb_id.value == f.mb_recommend.value) { if (f.mb_id.value == f.mb_recommend.value) {
alert('본인을 추천할 수 없습니다.'); alert('본인을 추천할 수 없습니다.');
f.mb_recommend.focus(); f.mb_recommend.focus();