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

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

Browse Source
This commit is contained in:
whitedot
2013-04-30 18:16:22 +09:00
parent 5532ddf153 d43f4f53d5
commit 92ee0e71d2
20 changed files with 229 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
adm/admin.menu100.php
View File

@ -7,7 +7,8 @@ $menu['menu100'] = array (
//array('100400', '버전정보', G4_ADMIN_URL.'/version.php', 'cf_version'),
array('100800', '세션파일 일괄삭제',G4_ADMIN_URL.'/session_file_delete.php', 'cf_session', 1),
array('100900', '캐쉬파일 일괄삭제',G4_ADMIN_URL.'/cache_file_delete.php', 'cf_cache', 1),
array('100920', '썸네일파일 일괄삭제',G4_ADMIN_URL.'/thumbnail_file_delete.php', 'cf_cache', 1),
array('100910', '캡챠파일 일괄삭제',G4_ADMIN_URL.'/gcaptcha_file_delete.php', 'cf_captcha', 1),
array('100920', '썸네일파일 일괄삭제',G4_ADMIN_URL.'/thumbnail_file_delete.php', 'cf_thumbnail', 1),
array('100500', 'phpinfo()', G4_ADMIN_URL.'/phpinfo.php', 'cf_phpinfo'),
//array('100600', '업그레이드', G4_ADMIN_URL.'/upgrade.php', 'cf_upgrade'),
//array('100700', '복구/최적화', G4_ADMIN_URL.'/repair.php', 'cf_repair'),

4
adm/board_form.php
View File

@ -46,9 +46,11 @@ if (!isset($board['bo_mobile_content_head'])) {
}
if (!isset($board['bo_use_cert'])) {
sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_use_cert` ENUM('','cert','adult') NOT NULL DEFAULT 'none' AFTER `bo_use_email` ", false);
sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_use_cert` ENUM('','cert','adult') NOT NULL DEFAULT '' AFTER `bo_use_email` ", false);
}
sql_query(" ALTER TABLE `{$g4['board_table']}` CHANGE `bo_use_cert` `bo_use_cert` ENUM('','cert','adult') NOT NULL DEFAULT '' ", false);
$required = "";
$readonly = "";
if ($w == '') {

6
adm/member_form.php
View File

@ -83,10 +83,12 @@ if ($mb['mb_open']) {
if(!isset($mb['mb_adult'])) {
sql_query(" ALTER TABLE `{$g4['member_table']}`
ADD `mb_adult` ENUM('Y', 'N') NOT NULL DEFAULT 'N' AFTER `mb_birth`,
ADD `mb_hp_certify` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `mb_lost_certify` ", FALSE);
ADD `mb_adult` ENUM('N', 'Y') NOT NULL DEFAULT 'N' AFTER `mb_birth`,
ADD `mb_hp_certify` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `mb_lost_certify` ", false);
}
sql_query(" ALTER TABLE `{$g4['member_table']}` CHANGE `mb_adult` `mb_adult` ENUM('N','Y') NOT NULL DEFAULT 'N' ", false);
if ($mb['mb_intercept_date']) $g4['title'] = "차단된 ";
else $g4['title'] .= "";
$g4['title'] .= '회원 '.$html_title;

13
bbs/ajax.mb_recommend.php Normal file
View File

@ -0,0 +1,13 @@
<?php
include_once("./_common.php");
include_once(G4_LIB_PATH."/register.lib.php");
$mb_recommend = escape_trim($_POST["reg_mb_recommend"]);
if ($msg = valid_mb_id($mb_recommend)) {
die("추천인의 아이디는 영문자, 숫자, _ 만 입력하세요.");
}
if (!($msg = exist_mb_id($mb_recommend))) {
die("입력하신 추천인은 존재하지 않는 아이디 입니다.");
}
?>

2
bbs/register_form_update.php
View File

@ -75,6 +75,8 @@ if ($w == '' || $w == 'u') {
if ($w=='') {
if ($msg = exist_mb_id($mb_id)) alert($msg);
if (!exist_mb_id($mb_recommend)) alert("추천인이 존재하지 않습니다.");
if (strtolower($mb_id) == strtolower($mb_recommend)) {
alert('본인을 추천할 수 없습니다.');
}

8
bbs/write_update.php
View File

@ -8,7 +8,7 @@ $msg = array();
$wr_subject = '';
if (isset($_POST['wr_subject'])) {
$wr_subject = substr(escape_trim($_POST['wr_subject']),0,255);
$wr_subject = substr(trim($_POST['wr_subject']),0,255);
}
if ($wr_subject == '') {
$msg[] = '<strong>제목</strong>을 입력하세요.';
@ -16,7 +16,7 @@ if ($wr_subject == '') {
$wr_content = '';
if (isset($_POST['wr_content'])) {
$wr_content = escape_trim($_POST['wr_content']);
$wr_content = substr(trim($_POST['wr_content']),0,65536);
}
if ($wr_content == '') {
$msg[] = '<strong>내용</strong>을 입력하세요.';
@ -24,12 +24,12 @@ if ($wr_content == '') {
$wr_link1 = '';
if (isset($_POST['wr_link1'])) {
$wr_link1 = substr(escape_trim($_POST['wr_link1']),0,1000);
$wr_link1 = substr($_POST['wr_link1'],0,1000);
}
$wr_link2 = '';
if (isset($_POST['wr_link2'])) {
$wr_link2 = substr(escape_trim($_POST['wr_link2']),0,1000);
$wr_link2 = substr($_POST['wr_link2'],0,1000);
}
$msg = implode('<br>', $msg);

2
common.php
View File

@ -119,7 +119,7 @@ div a {display:block;margin:50px auto 10px;width:170px;text-align:center}
<li><strong><?php echo G4_DATA_DIR.'/'.G4_DBCONFIG_FILE ?></strong></li>
</ul>
<p>프로그램 설치 후 실행하시기 바랍니다.</p>
<a href="./install/">그누보드4s 설치하기</a>
<a href="<?php echo G4_URL; ?>/install/">그누보드4s 설치하기</a>
</div>
</body>
</html>

2
install/gnuboard4s.sql
View File

@ -411,7 +411,7 @@ CREATE TABLE IF NOT EXISTS `g4s_member` (
`mb_jumin` varchar(255) NOT NULL default '',
`mb_sex` char(1) NOT NULL default '',
`mb_birth` varchar(255) NOT NULL default '',
`mb_adult` enum('Y','N') NOT NULL default 'N',
`mb_adult` enum('N','Y') NOT NULL default 'N',
`mb_tel` varchar(255) NOT NULL default '',
`mb_hp` varchar(255) NOT NULL default '',
`mb_zip1` char(3) NOT NULL default '',

2
install/install_config.php
View File

@ -10,7 +10,7 @@ $title = "그누보드4s 설치 3단계 중 2단계 설정";
include_once ('../config.php');
include_once ('./install.inc.php');
if ($_POST['agree'] != '동의함') {
if (isset($_POST['agree']) && $_POST['agree'] != '동의함') {
echo "<div>라이센스(License) 내용에 동의하셔야 설치를 계속하실 수 있습니다.</div>".PHP_EOL;
echo "<div><a href=\"./\">뒤로가기</a></div>".PHP_EOL;
exit;

19
js/jquery.register_form.js
View File

@ -16,6 +16,25 @@ var reg_mb_id_check = function() {
}
// 추천인 검사
var reg_mb_recommend_check = function() {
var result = "";
$.ajax({
type: "POST",
url: g4_bbs_url+"/ajax.mb_recommend.php",
data: {
"reg_mb_recommend": encodeURIComponent($("#reg_mb_recommend").val())
},
cache: false,
async: false,
success: function(data) {
result = data;
}
});
return result;
}
var reg_mb_nick_check = function() {
var result = "";
$.ajax({

4
lib/register.lib.php
View File

@ -28,6 +28,10 @@ function count_mb_id($reg_mb_id)
function exist_mb_id($reg_mb_id)
{
global $g4;
$reg_mb_id = trim($reg_mb_id);
if ($reg_mb_id == "") return "";
$sql = " select count(*) as cnt from `{$g4['member_table']}` where mb_id = '$reg_mb_id' ";
$row = sql_fetch($sql);
if ($row['cnt'])

2
skin/board/basic/write.skin.php
View File

@ -101,7 +101,7 @@ echo $option_hidden;
<tr>
<th scope="row"><label for="wr_subject">제목<strong class="sound_only">필수</strong></label></th>
<td><input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input required" size="50"></td>
<td><input type="text" name="wr_subject" value="<?php echo $subject ?>" id="wr_subject" required class="frm_input required" size="50" maxlength="255"></td>
</tr>
<tr>

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

@ -343,6 +343,13 @@ function fregisterform_submit(f)
f.mb_recommend.focus();
return false;
}
var msg = reg_mb_recommend_check();
if (msg) {
alert(msg);
f.mb_recommend.select();
return false;
}
}
<?php if ($config['cf_kcpcert_use']) { ?>