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:
whitedot
2013-10-14 17:28:13 +09:00
parent f2a5866c52 6f5803bb3c
commit 0fbb63a64c
79 changed files with 704 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bbs/formmail.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
if (!$config['cf_email_use'])
alert_close('환경설정에서 \"메일발송 사용\"에 체크하셔야 메일을 발송할 수 있습니다.\\n\\n관리자에게 문의하시기 바랍니다.');

2
bbs/formmail_send.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
include_once(G5_LIB_PATH.'/mailer.lib.php');
if (!$config['cf_email_use'])

2
bbs/memo_form.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
if ($is_guest)
alert_close('회원만 이용하실 수 있습니다.');

2
bbs/memo_form_update.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
if ($is_guest)
alert('회원만 이용하실 수 있습니다.');

2
bbs/password_lost.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
if ($is_member) {
alert("이미 로그인중입니다.");

2
bbs/password_lost2.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
include_once(G5_LIB_PATH.'/mailer.lib.php');
if ($is_member) {

2
bbs/poll_result.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
$po = sql_fetch(" select * from {$g5['poll_table']} where po_id = '{$po_id}' ");
if (!$po['po_id'])

2
bbs/register_email.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
$sql = " select mb_email, mb_datetime, mb_email_certify from {$g5['member_table']} where mb_id = '{$mb_id}' ";
$mb = sql_fetch($sql);

2
bbs/register_email_update.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
include_once(G5_LIB_PATH.'/mailer.lib.php');
$mb_id = escape_trim($_POST['mb_id']);

4
bbs/register_form.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
include_once(G5_LIB_PATH.'/register.lib.php');
// 불법접근을 막도록 토큰생성
@ -118,8 +118,6 @@ $req_nick = !isset($member['mb_nick_date']) || (isset($member['mb_nick_date']) &
$required = ($w=='') ? 'required' : '';
$readonly = ($w=='u') ? 'readonly' : '';
$captcha_html = captcha_html();
include_once($member_skin_path.'/register_form.skin.php');
include_once('./_tail.php');
?>

2
bbs/register_form_update.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
include_once(G5_LIB_PATH.'/register.lib.php');
include_once(G5_LIB_PATH.'/mailer.lib.php');

2
bbs/view_comment.php
View File

@ -1,6 +1,6 @@
<?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
$captcha_html = "";
if ($is_guest && $board['bo_comment_level'] < 2) {

2
bbs/write.php
View File

@ -1,7 +1,7 @@
<?php
include_once('./_common.php');
include_once(G5_EDITOR_LIB);
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
set_session('ss_bo_table', $_REQUEST['bo_table']);
set_session('ss_wr_id', $_REQUEST['wr_id']);

2
bbs/write_comment_update.php
View File

@ -1,7 +1,7 @@
<?php
define('G5_CAPTCHA', true);
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
// 090710
if (substr_count($wr_content, "&#") > 50) {

2
bbs/write_update.php
View File

@ -1,6 +1,6 @@
<?php
include_once('./_common.php');
include_once(G5_GCAPTCHA_PATH.'/gcaptcha.lib.php');
include_once(G5_CAPTCHA_PATH.'/captcha.lib.php');
$g5['title'] = '게시글 저장';