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

추천, 비추천 수정 및 머지 충돌 커밋

Browse Source
This commit is contained in:
chicpro
2013-03-08 12:00:19 +09:00
parent dc3d5e5380
commit 7fe1b31a76
27 changed files with 219 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
adm/board_copy.php
View File

@ -1,7 +1,6 @@
<?
$sub_menu = "300100";
include_once("./_common.php");
include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
auth_check($auth[$sub_menu], 'w');
@ -40,10 +39,6 @@ include_once(G4_PATH.'/head.sub.php');
<label for="copy_case2">구조와 데이터</label>
</td>
</tr>
<tr>
<th scope="col">자동등록방지</th>
<td><?=captcha_html();?></td>
</tr>
</tbody>
</table>
</div>
@ -63,8 +58,6 @@ function fboardcopy_check(f)
return false;
}
<? echo chk_captcha_js(); ?>
return true;
}
</script>

158
adm/board_copy_update.php
View File

@ -1,14 +1,9 @@
<?
$sub_menu = '300100';
include_once('./_common.php');
include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
auth_check($auth[$sub_menu], 'w');
if (!chk_captcha()) {
alert('스팸방지에 입력한 숫자가 틀렸습니다.');
}
$target_table = escape_trim($_POST['target_table']);
$target_subject = escape_trim($_POST['target_subject']);
@ -32,78 +27,87 @@ $file_copy = array();
// 게시판 정보
$sql = " insert into {$g4['board_table']}
set bo_table = '$target_table',
bo_subject = '$target_subject',
gr_id = '{$board['gr_id']}',
bo_admin = '{$board['bo_admin']}',
bo_list_level = '{$board[bo_list_level]}',
bo_read_level = '{$board[bo_read_level]}',
bo_write_level = '{$board[bo_write_level]}',
bo_reply_level = '{$board[bo_reply_level]}',
bo_comment_level = '{$board[bo_comment_level]}',
bo_upload_level = '{$board[bo_upload_level]}',
bo_download_level = '{$board[bo_download_level]}',
bo_html_level = '{$board[bo_html_level]}',
bo_link_level = '{$board[bo_link_level]}',
bo_count_modify = '{$board[bo_count_modify]}',
bo_count_delete = '{$board[bo_count_delete]}',
bo_read_point = '{$board[bo_read_point]}',
bo_write_point = '{$board[bo_write_point]}',
bo_comment_point = '{$board[bo_comment_point]}',
bo_download_point = '{$board[bo_download_point]}',
bo_use_category = '{$board[bo_use_category]}',
bo_category_list = '{$board['bo_category_list']}',
bo_disable_tags = '{$board['bo_disable_tags']}',
bo_use_secret = '{$board[bo_use_secret]}',
bo_use_dhtml_editor = '{$board[bo_use_dhtml_editor]}',
bo_use_sideview = '{$board[bo_use_sideview]}',
bo_use_good = '{$board[bo_use_good]}',
bo_use_nogood = '{$board[bo_use_nogood]}',
bo_use_signature = '{$board[bo_use_signature]}',
bo_use_ip_view = '{$board[bo_use_ip_view]}',
bo_use_list_view = '{$board['o_use_list_view']}',
bo_use_list_content = '{$board[bo_use_list_content]}',
bo_table_width = '{$board[bo_table_width]}',
bo_subject_len = '{$board[bo_subject_len]}',
bo_page_rows = '{$board[bo_page_rows]}',
bo_new = '{$board[bo_new]}',
bo_hot = '{$board[bo_hot]}',
bo_image_width = '{$board[bo_image_width]}',
bo_skin = '{$board['bo_skin']}',
bo_include_head = '{$board['bo_include_head']}',
bo_include_tail = '{$board['bo_include_tail']}',
bo_content_head = '".addslashes($board['bo_content_head'])."',
bo_content_tail = '".addslashes($board['bo_content_tail'])."',
bo_insert_content = '".addslashes($board['bo_insert_content'])."',
bo_gallery_cols = '{$board[bo_gallery_cols]}',
bo_upload_size = '{$board[bo_upload_size]}',
bo_reply_order = '{$board[bo_reply_order]}',
bo_use_search = '{$board[bo_use_search]}',
bo_show_menu = '{$board[bo_show_menu]}',
bo_order = '{$board[bo_order]}',
bo_notice = '{$board['bo_notice']}',
bo_upload_count = '{$board[bo_upload_count]}',
bo_use_email = '{$board[bo_use_email]}',
bo_sort_field = '{$board['bo_sort_field']}',
bo_1_subj = '{$board['bo_1_subj']}',
bo_2_subj = '{$board['bo_2_subj']}',
bo_3_subj = '{$board['bo_3_subj']}',
bo_4_subj = '{$board['bo_4_subj']}',
bo_5_subj = '{$board['bo_5_subj']}',
bo_6_subj = '{$board['bo_6_subj']}',
bo_7_subj = '{$board['bo_7_subj']}',
bo_8_subj = '{$board['bo_8_subj']}',
bo_9_subj = '{$board['bo_9_subj']}',
bo_10_subj = '{$board['bo_10_subj']}',
bo_1 = '{$board['bo_1']}',
bo_2 = '{$board['bo_2']}',
bo_3 = '{$board['bo_3']}',
bo_4 = '{$board['bo_4']}',
bo_5 = '{$board['bo_5']}',
bo_6 = '{$board['bo_6']}',
bo_7 = '{$board['bo_7']}',
bo_8 = '{$board['bo_8']}',
bo_9 = '{$board['bo_9']}',
bo_10 = '{$board['bo_10']}' ";
gr_id = '{$board['gr_id']}',
bo_subject = '$target_subject',
bo_device = '{$board['bo_device']}',
bo_admin = '{$board['bo_admin']}',
bo_list_level = '{$board[bo_list_level]}',
bo_read_level = '{$board[bo_read_level]}',
bo_write_level = '{$board[bo_write_level]}',
bo_reply_level = '{$board[bo_reply_level]}',
bo_comment_level = '{$board[bo_comment_level]}',
bo_upload_level = '{$board[bo_upload_level]}',
bo_download_level = '{$board[bo_download_level]}',
bo_html_level = '{$board[bo_html_level]}',
bo_link_level = '{$board[bo_link_level]}',
bo_trackback_level = '{$board[bo_trackback_level]}',
bo_count_modify = '{$board[bo_count_modify]}',
bo_count_delete = '{$board[bo_count_delete]}',
bo_read_point = '{$board[bo_read_point]}',
bo_write_point = '{$board[bo_write_point]}',
bo_comment_point = '{$board[bo_comment_point]}',
bo_download_point = '{$board[bo_download_point]}',
bo_use_category = '{$board[bo_use_category]}',
bo_category_list = '{$board['bo_category_list']}',
bo_disable_tags = '{$board['bo_disable_tags']}',
bo_use_sideview = '{$board[bo_use_sideview]}',
bo_use_file_content = '{$board[bo_use_file_content]}',
bo_use_secret = '{$board[bo_use_secret]}',
bo_use_dhtml_editor = '{$board[bo_use_dhtml_editor]}',
bo_use_rss_view = '{$board[bo_use_rss_view]}',
bo_use_good = '{$board[bo_use_good]}',
bo_use_nogood = '{$board[bo_use_nogood]}',
bo_use_signature = '{$board[bo_use_signature]}',
bo_use_ip_view = '{$board[bo_use_ip_view]}',
bo_use_list_view = '{$board['o_use_list_view']}',
bo_use_list_content = '{$board[bo_use_list_content]}',
bo_table_width = '{$board[bo_table_width]}',
bo_subject_len = '{$board[bo_subject_len]}',
bo_page_rows = '{$board[bo_page_rows]}',
bo_new = '{$board[bo_new]}',
bo_hot = '{$board[bo_hot]}',
bo_image_width = '{$board[bo_image_width]}',
bo_skin = '{$board['bo_skin']}',
bo_include_head = '{$board['bo_include_head']}',
bo_include_tail = '{$board['bo_include_tail']}',
bo_content_head = '".addslashes($board['bo_content_head'])."',
bo_content_tail = '".addslashes($board['bo_content_tail'])."',
bo_insert_content = '".addslashes($board['bo_insert_content'])."',
bo_gallery_cols = '{$board[bo_gallery_cols]}',
bo_gallery_width = '{$board[bo_gallery_width]}',
bo_gallery_height = '{$board[bo_gallery_height]}',
bo_mobile_gallery_cols = '{$board[bo_mobile_gallery_cols]}',
bo_mobile_gallery_width = '{$board[bo_mobile_gallery_width]}',
bo_mobile_gallery_height = '{$board[bo_mobile_gallery_height]}',
bo_upload_size = '{$board[bo_upload_size]}',
bo_reply_order = '{$board[bo_reply_order]}',
bo_use_search = '{$board[bo_use_search]}',
bo_show_menu = '{$board[bo_show_menu]}',
bo_order = '{$board[bo_order]}',
bo_notice = '{$board['bo_notice']}',
bo_upload_count = '{$board[bo_upload_count]}',
bo_use_email = '{$board[bo_use_email]}',
bo_sort_field = '{$board['bo_sort_field']}',
bo_1_subj = '{$board['bo_1_subj']}',
bo_2_subj = '{$board['bo_2_subj']}',
bo_3_subj = '{$board['bo_3_subj']}',
bo_4_subj = '{$board['bo_4_subj']}',
bo_5_subj = '{$board['bo_5_subj']}',
bo_6_subj = '{$board['bo_6_subj']}',
bo_7_subj = '{$board['bo_7_subj']}',
bo_8_subj = '{$board['bo_8_subj']}',
bo_9_subj = '{$board['bo_9_subj']}',
bo_10_subj = '{$board['bo_10_subj']}',
bo_1 = '{$board['bo_1']}',
bo_2 = '{$board['bo_2']}',
bo_3 = '{$board['bo_3']}',
bo_4 = '{$board['bo_4']}',
bo_5 = '{$board['bo_5']}',
bo_6 = '{$board['bo_6']}',
bo_7 = '{$board['bo_7']}',
bo_8 = '{$board['bo_8']}',
bo_9 = '{$board['bo_9']}',
bo_10 = '{$board['bo_10']}' ";
sql_query($sql);
// 게시판 폴더 생성

4
adm/board_form.php
View File

@ -53,7 +53,7 @@ if ($w == '') {
$board['bo_mobile_gallery_cols'] = 2;
$board['bo_mobile_gallery_width'] = 160;
$board['bo_mobile_gallery_height'] = 120;
$board['bo_table_width'] = 97;
$board['bo_table_width'] = 100;
$board['bo_page_rows'] = $config['cf_page_rows'];
$board['bo_subject_len'] = 60;
$board['bo_new'] = 24;
@ -765,7 +765,7 @@ $pg_anchor = "<ul class=\"anchor\">
</td>
</tr>
<tr>
<th scope="row"><label for="bo_table_width">게시판 테이블 폭<strong class="sound_only">필수</strong></label></th>
<th scope="row"><label for="bo_table_width">게시판 폭<strong class="sound_only">필수</strong></label></th>
<td>
<?=help('100 이하는 %')?>
<input type="text" id="bo_table_width" name="bo_table_width" class="required numeric frm_input" required value="<?=$board['bo_table_width']?>" size="4">

11
adm/board_form_update.php
View File

@ -173,16 +173,23 @@ if ($w == '') {
$bo_count_comment = $row['cnt'];
// 글수 조정
/*
엔피씨님의 팁으로 교체합니다. 130308
http://sir.co.kr/bbs/board.php?bo_table=g4_tiptech&wr_id=27207
*/
if (isset($_POST['proc_count'])) {
// 원글을 얻습니다.
$sql = " select wr_id from {$g4['write_prefix']}{$bo_table} where wr_is_comment = 0 ";
//$sql = " select wr_id from {$g4['write_prefix']}{$bo_table} where wr_is_comment = 0 ";
$sql = " select a.wr_id, (count(b.wr_parent) - 1) as cnt from {$g4['write_prefix']}{$bo_table} a, {$g4['write_prefix']}{$bo_table} b where a.wr_id=b.wr_parent and a.wr_is_comment=0 group by a.wr_id ";
$result = sql_query($sql);
for ($i=0; $row=sql_fetch_array($result); $i++) {
/*
// 코멘트수를 얻습니다.
$sql2 = " select count(*) as cnt from {$g4['write_prefix']}$bo_table where wr_parent = '{$row['wr_id']}' and wr_is_comment = 1 ";
$row2 = sql_fetch($sql2);
*/
sql_query(" update {$g4['write_prefix']}{$bo_table} set wr_comment = '{$row2['cnt']}' where wr_id = '{$row['wr_id']}' ");
sql_query(" update {$g4['write_prefix']}{$bo_table} set wr_comment = '{$row['cnt']}' where wr_id = '{$row['wr_id']}' ");
}
}

2
adm/config_form.php
View File

@ -475,7 +475,7 @@ $pg_anchor = "
</td>
<th scope="row"><label for="cf_prohibit_email">입력 금지 메일</label></th>
<td>
<?=help('hanmail.net과 같은 메일 주소는 입력을 못합니다. 엔터로 구분')?>
<?=help('hotmail.com과 같은 메일 주소는 사용하지 못하도록 못합니다. 엔터로 구분')?>
<textarea id="cf_prohibit_email" name="cf_prohibit_email" rows="5"><?=$config['cf_prohibit_email']?></textarea>
</td>
</tr>

2
bbs/formmail_send.php
View File

@ -16,7 +16,7 @@ if (substr_count($to, "@") > 1)
if (!chk_captcha()) {
alert('스팸방지에 입력한 숫자가 틀렸습니다.');
alert('자동등록방지 숫자가 틀렸습니다.');
}

2
bbs/gcaptcha/gcaptcha.js
View File

@ -17,7 +17,7 @@ function chk_captcha()
}
});
if (!captcha_result) {
alert("스팸방지 숫자가 틀렸습니다.");
alert("자동등록방지 숫자가 틀렸습니다.");
captcha_key.select();
return false;
}

8
bbs/gcaptcha/gcaptcha.lib.php
View File

@ -178,11 +178,11 @@ function captcha_html($class='captcha')
$html .= PHP_EOL.'<script>var g4_gcaptcha_url = "'.G4_GCAPTCHA_URL.'";</script>';
$html .= PHP_EOL.'<script src="'.G4_GCAPTCHA_URL.'/gcaptcha.js"></script>';
$html .= '<fieldset id="captcha" class="'.$class.'">';
$html .= '<legend class="sound_only">스팸방지</legend>';
$html .= '<img src="'.$jpg_file_url.'" alt="스팸방지 숫자">';
$html .= '<legend class="sound_only">자동등록방지</legend>';
$html .= '<img src="'.$jpg_file_url.'" alt="자동등록방지 숫자">';
$html .= '<a href="'.$wav_file_url.'" id="captcha_wav" target="_blank"><img src="'.G4_GCAPTCHA_URL.'/img/sound.gif" alt="숫자를 음성으로 듣기"></a>';
$html .= '<input type="text" id="captcha_key" name="captcha_key" class="captcha_box frm_input" size="6" maxlength="6" required title="스팸방지 숫자 입력">';
$html .= '<p class="sound_only">스팸방지 숫자를 순서대로 입력하세요.</p>';
$html .= '<input type="text" id="captcha_key" name="captcha_key" class="captcha_box frm_input" size="6" maxlength="6" required title="자동등록방지 숫자 입력">';
$html .= '<p class="sound_only">자동등록방지 숫자를 순서대로 입력하세요.</p>';
$html .= '</fieldset>';
return $html;
}

2
bbs/memo_form_update.php
View File

@ -6,7 +6,7 @@ if ($is_guest)
alert('회원만 이용하실 수 있습니다.');
if (!chk_captcha()) {
alert('스팸방지에 입력한 숫자가 틀렸습니다.');
alert('자동등록방지 숫자가 틀렸습니다.');
}
$recv_list = explode(',', trim($_POST['me_recv_mb_id']));

4
bbs/password_lost2.php
View File

@ -3,11 +3,11 @@ include_once('./_common.php');
include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
if ($is_member) {
alert("이미 로그인중입니다.");
alert('이미 로그인중입니다.');
}
if (!chk_captcha()) {
alert('스팸방지에 입력한 숫자가 틀렸습니다.');
alert('자동등록방지 숫자가 틀렸습니다.');
}
include_once($member_skin_path.'/password_lost2.skin.php');

7
bbs/poll_update.php
View File

@ -1,12 +1,5 @@
<?
include_once('./_common.php');
/*
include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
if ($is_guest && !chk_captcha()) {
alert('스팸방지에 입력한 숫자가 틀렸습니다.');
}
*/
$po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '{$_POST['po_id']}' ");
if (!$po['po_id'])

2
bbs/register_form_update.php
View File

@ -17,7 +17,7 @@ if ($w == 'u' && $is_admin == 'super') {
}
if (!chk_captcha()) {
alert('스팸방지에 입력한 숫자가 틀렸습니다.');
alert('자동등록방지 숫자가 틀렸습니다.');
}
$mb_id = escape_trim($_POST['mb_id']);

2
bbs/register_form_update_mail2.php
View File

@ -27,7 +27,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
회원 별명 : <?=$mb_nick?><br>
추천인아이디 : <?=$mb_recommend?>
</p>
<a href="<?=G4_BBS_URL?>/member_form.php?w=u&amp;mb_id=<?=$mb_id?>" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center">관리자에서 회원정보 확인하기</a>
<a href="<?=G4_ADMIN_URL?>/member_form.php?w=u&amp;mb_id=<?=$mb_id?>" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center">관리자에서 회원정보 확인하기</a>
</div>
</div>

2
bbs/write_comment_update.php
View File

@ -22,7 +22,7 @@ if ($is_guest) {
if ($wr_name == '')
alert('이름은 필히 입력하셔야 합니다.');
if(!chk_captcha())
alert('스팸방지에 입력한 숫자가 틀렸습니다.');
alert('자동등록방지 숫자가 틀렸습니다.');
}
if ($w == "c" || $w == "cu") {

2
bbs/write_update.php
View File

@ -149,7 +149,7 @@ if ($w == '' || $w == 'u') {
}
if ($is_guest && !chk_captcha()) {
alert('스팸방지에 입력한 숫자가 틀렸습니다.');
alert('자동등록방지 숫자가 틀렸습니다.');
}
if ($w == '' || $w == 'r') {

2
css/default.css
View File

@ -314,7 +314,7 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#333;color:#fff;
#mb_login .login_id {position:absolute;top:26px;left:95px}
#mb_login .login_pw {position:absolute;top:52px;left:95px}
#mb_login .frm_input {display:block;margin:0 0 5px 80px}
#mb_login .btn_submit {position:absolute;top:20px;left:335px;height:53px}
#mb_login .btn_submit {position:absolute;top:20px;left:335px;height:49px}
#mb_login section {margin:0 0 30px;padding:20px;border:1px solid #cfded8;background:#f7f7f2}
#mb_login section div {text-align:right}

1
install/gnuboard4s.sql
View File

@ -49,7 +49,6 @@ CREATE TABLE IF NOT EXISTS `g4s_board` (
`bo_use_secret` tinyint(4) NOT NULL default '0',
`bo_use_dhtml_editor` tinyint(4) NOT NULL default '0',
`bo_use_rss_view` tinyint(4) NOT NULL default '0',
`bo_use_comment` tinyint(4) NOT NULL default '0',
`bo_use_good` tinyint(4) NOT NULL default '0',
`bo_use_nogood` tinyint(4) NOT NULL default '0',
`bo_use_name` tinyint(4) NOT NULL default '0',

2
install/index.php
View File

@ -1,5 +1,5 @@
<?
$title = "그누보드4S 설치 3단계 중 1단계 라이센스 확인";
$title = "그누보드4s 설치 3단계 중 1단계 라이센스 확인";
include_once ('../config.php');
include_once ('./install.inc.php');
?>

11
install/install.inc.php
View File

@ -2,7 +2,7 @@
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
$data_path = '../'.G4_DATA_DIR;
if (!$title) $title = "그누보드4S 설치";
if (!$title) $title = "그누보드4s 설치";
?>
<!doctype html>
@ -13,17 +13,18 @@ if (!$title) $title = "그누보드4S 설치";
<style>
body {margin:0;padding:0;background:#f7f7f7}
h1 {margin:50px auto 30px;width:540px;font-size:1.4em}
h2 {font-size:1.2em}
p {line-height:1.5em}
table {width:100%;border-collapse:collapse;border-spacing:0;font-size:0.895em}
table {width:100%;border:0;border-collapse:collapse;border-spacing:0;font-size:0.895em}
caption {padding:0 0 20px;font-weight:bold;text-align:left}
th,td {padding:5px;border:1px solid #ddd}
th,td {padding:5px;border:0;border-top:1px solid #ddd;border-bottom:1px solid #ddd}
th {text-align:left}
td span {display:block;margin:0 0 5px;color:#666;font-size:0.9em}
#wrapper {margin:0 auto;padding:20px;width:500px;border:1px solid #eee;background:#fff}
#wrapper {margin:0 auto 20px;padding:20px;width:500px;border:1px solid #eee;background:#fff}
#idx_license {padding:10px;width:480px;height:300px;border:1px solid #ccc;background:#000;color:#fff}
#idx_agree {padding:20px;font-weight:bold;text-align:center}
#idx_agree {padding:0 20px 20px;font-weight:bold;text-align:center}
#btn_confirm {text-align:center}

11
install/install_config.php
View File

@ -1,5 +1,5 @@
<?
$title = "그누보드4S 설치 3단계 중 2단계 설정";
$title = "그누보드4s 설치 3단계 중 2단계 설정";
include_once ('../config.php');
include_once ('./install.inc.php');
@ -11,9 +11,8 @@ header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
header('Pragma: no-cache'); // HTTP/1.0
if ($_POST['agree'] != '동의함') {
echo '<meta http-equiv="content-type" content="text/html; charset=utf-8">'.PHP_EOL;
echo '<div>라이센스(License) 내용에 동의하셔야 설치를 계속하실 수 있습니다.</div>'.PHP_EOL;
echo '<div><a href="./">뒤로가기</a></div>'.PHP_EOL;
echo "<div>라이센스(License) 내용에 동의하셔야 설치를 계속하실 수 있습니다.</div>".PHP_EOL;
echo "<div><a href=\"./\">뒤로가기</a></div>".PHP_EOL;
exit;
}
?>
@ -104,8 +103,8 @@ if ($_POST['agree'] != '동의함') {
</div>
<p class="outside">
<strong class="st_strong">주의! 이미 그누보드4S가 존재한다면 DB 자료가 망실되므로 주의하십시오.</strong><br>
주의사항을 읽으셨다면 다음을 눌러 설치를 계속하십시오.
<strong class="st_strong">주의! 이미 그누보드4s가 존재한다면 DB 자료가 망실되므로 주의하십시오.</strong><br>
주의사항을 이해하고, 새로 설치하시려면 다음을 눌러 설치를 계속하십시오.
</p>
<div id="btn_confirm">

77
install/install_db.php
View File

@ -42,14 +42,10 @@ if (!$select_db) {
exit;
}
?>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>그누보드4 설치 (3/3) - DB</title>
</head>
<body>
<div>그누보드4S 설치시작</div>
<h2>그누보드4s 설치가 시작되었습니다.</h2>
<ol>
<?
// 테이블 생성 ------------------------------------
$file = implode('', file('./gnuboard4s.sql'));
@ -63,9 +59,11 @@ for ($i=0; $i<count($f); $i++) {
mysql_query($f[$i]) or die(mysql_error());
}
// 테이블 생성 ------------------------------------
?>
echo '<div>전체 테이블 생성 완료</div>';
<li>전체 테이블 생성 완료</li>
<?
$read_point = -1;
$write_point = 5;
$comment_point = 1;
@ -74,7 +72,7 @@ $download_point = -20;
//-------------------------------------------------------------------------------------------------
// config 테이블 설정
$sql = " insert into `{$table_prefix}config`
set cf_title = '그누보드4',
set cf_title = '그누보드4s',
cf_admin = '$admin_id',
cf_use_point = '1',
cf_use_norobot = '1',
@ -126,28 +124,31 @@ $sql = " insert into `{$table_prefix}config`
cf_stipulation = '해당 홈페이지에 맞는 회원가입약관을 입력합니다.',
cf_privacy = '해당 홈페이지에 맞는 개인정보취급방침을 입력합니다.'
";
>>>>>>> 58918b3528c5945215be90227f5d74759b172042
mysql_query($sql) or die(mysql_error() . "<p>" . $sql);
// 운영자 회원가입
// 관리자 회원가입
$sql = " insert into `{$table_prefix}member`
set mb_id = '$admin_id',
mb_password = PASSWORD('$admin_pass'),
mb_name = '$admin_name',
mb_nick = '$admin_name',
mb_email = '$admin_email',
mb_level = '10',
mb_mailling = '1',
mb_open = '1',
mb_email_certify = '".G4_TIME_YMDHIS."',
mb_datetime = '".G4_TIME_YMDHIS."',
mb_ip = '{$_SERVER['REMOTE_ADDR']}'
";
mb_password = PASSWORD('$admin_pass'),
mb_name = '$admin_name',
mb_nick = '$admin_name',
mb_email = '$admin_email',
mb_level = '10',
mb_mailling = '1',
mb_open = '1',
mb_email_certify = '".G4_TIME_YMDHIS."',
mb_datetime = '".G4_TIME_YMDHIS."',
mb_ip = '{$_SERVER['REMOTE_ADDR']}'
";
@mysql_query($sql);
?>
echo '<div>DB설정 완료</div>';
<li>DB설정 완료</li>
<?
//-------------------------------------------------------------------------------------------------
// 디렉토리 생성
$dir_arr = array (
$data_path.'/cache',
@ -162,8 +163,11 @@ for ($i=0; $i<count($dir_arr); $i++) {
@mkdir($dir_arr[$i], 0707);
@chmod($dir_arr[$i], 0707);
}
?>
echo '<div>데이터 디렉토리 생성 완료</div>';
<li>데이터 디렉토리 생성 완료</li>
<?
//-------------------------------------------------------------------------------------------------
// DB 설정 파일 생성
@ -203,8 +207,11 @@ fwrite($f, "?>");
fclose($f);
@chmod($file, 0606);
echo "<div>DB설정 파일 생성 완료 ($file)";
?>
<li>DB설정 파일 생성 완료 (<?=$file?>)</li>
<?
// data 디렉토리 및 하위 디렉토리에서는 .htaccess .htpasswd .php .phtml .html .htm .inc .cgi .pl 파일을 실행할수 없게함.
$f = fopen($data_path.'/.htaccess', 'w');
$str = <<<EOD
@ -216,11 +223,23 @@ EOD;
fwrite($f, $str);
fclose($f);
//-------------------------------------------------------------------------------------------------
echo '<div>필요한 DB Table, File, 디렉토리 생성을 모두 완료 하였습니다.</div>'.PHP_EOL;
echo '<div>메인화면에서 운영자 로그인을 한 후 운영자 화면으로 이동하여 환경설정을 변경해 주십시오.</div>';
echo '<div><a href="../index.php">메인화면으로 가기</a></div>';
?>
</ol>
<p class="st_strong">축하합니다. 그누보드4s 설치가 완료되었습니다.</p>
<h2>환경설정 변경은 다음의 과정을 따르십시오.</h2>
<ol>
<li>메인화면으로 이동</li>
<li>관리자 로그인</li>
<li>관리자 모드 접속</li>
<li>환경설정 메뉴의 기본환경설정 페이지로 이동</li>
</ol>
</div>
<div id="btn_confirm"><a href="../index.php">메인화면으로 가기</a></div>
</body>
</html>

2
mobile/skin/board/basic/view_comment.skin.php
View File

@ -128,7 +128,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
</table>
<div class="btn_confirm">
<input type="submit" class="btn_submit" value="댓글입력">
<input type="submit" class="btn_submit" value="댓글등록">
</div>
</form>

2
mobile/skin/board/gallery/view_comment.skin.php
View File

@ -128,7 +128,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
</table>
<div class="btn_confirm">
<input type="submit" class="btn_submit" value="댓글입력">
<input type="submit" class="btn_submit" value="댓글등록">
</div>
</form>

37
skin/board/basic/view.skin.php
View File

@ -144,8 +144,16 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
<? if ($scrap_href || $good_href || $nogood_href) { ?>
<div id="bo_v_act">
<? if ($scrap_href) { ?><a href="<?=$scrap_href; ?>" target="_blank" class="btn_b01" onclick="win_scrap(this.href); return false;">스크랩</a><? } ?>
<? if ($good_href) {?><a href="<?=$good_href.'&amp;'.$qstr?>" id="good_button" class="btn_b01">추천 <strong><?=number_format($view['wr_good'])?></strong></a><? } ?>
<? if ($nogood_href) {?><a href="<?=$nogood_href.'&amp;'.$qstr?>" id="nogood_button" class="btn_b01">비추천 <strong><?=number_format($view['wr_nogood'])?></strong></a><? } ?>
<? if ($good_href) {?>
<a href="<?=$good_href.'&amp;'.$qstr?>" id="good_button" class="btn_b01">추천 <strong><?=number_format($view['wr_good'])?></strong></a>
<span id="bo_v_act_good"></span>
<? } ?>
<? if ($nogood_href) {?>
<a href="<?=$nogood_href.'&amp;'.$qstr?>" id="nogood_button" class="btn_b01">비추천 <strong><?=number_format($view['wr_nogood'])?></strong></a>
<span id="bo_v_act_nogood"></span>
<? } ?>
</div>
<? } else {
if($board['bo_use_good'] || $board['bo_use_nogood']) {
@ -202,15 +210,15 @@ $(function() {
return false;
});
// 추천
$("#good_button").click(function() {
excute_good(this.href, this.id);
return false;
});
// 추천, 비추천
$("#good_button, #nogood_button").click(function() {
var $tx;
if(this.id == "good_button")
$tx = $("#bo_v_act_good");
else
$tx = $("#bo_v_act_nogood");
// 비추천
$("#nogood_button").click(function() {
excute_good(this.href, this.id);
excute_good(this.href, $(this), $tx);
return false;
});
});
@ -231,7 +239,7 @@ function view_image_resize()
});
}
function excute_good(href, id)
function excute_good(href, $el, $tx)
{
$.post(
href,
@ -243,7 +251,12 @@ function excute_good(href, id)
}
if(data.count) {
$("#"+id).find("strong").text(number_format(String(data.count)));
$el.find("strong").text(number_format(String(data.count)));
if($tx.attr("id").search("nogood") > -1) {
$tx.text("이 글을 비추천하셨습니다.").css("display", "inline");
} else {
$tx.text("이 글을 추천하셨습니다.").css("display", "inline");
}
}
}, "json"
);

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

@ -128,7 +128,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
</table>
<div class="btn_confirm">
<input type="submit" class="btn_submit" value="댓글입력">
<input type="submit" class="btn_submit" value="댓글등록">
</div>
</form>

35
skin/board/gallery/view.skin.php
View File

@ -144,8 +144,14 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
<? if ($scrap_href || $good_href || $nogood_href) { ?>
<div id="bo_v_act">
<? if ($scrap_href) { ?><a href="<?=$scrap_href; ?>" target="_blank" class="btn_b01" onclick="win_scrap(this.href); return false;">스크랩</a><? } ?>
<? if ($good_href) {?><a href="<?=$good_href.'&amp;'.$qstr?>" id="good_button" class="btn_b01">추천 <strong><?=number_format($view['wr_good'])?></strong></a><? } ?>
<? if ($nogood_href) {?><a href="<?=$nogood_href.'&amp;'.$qstr?>" id="nogood_button" class="btn_b01">비추천 <strong><?=number_format($view['wr_nogood'])?></strong></a><? } ?>
<? if ($good_href) {?>
<a href="<?=$good_href.'&amp;'.$qstr?>" id="good_button" class="btn_b01">추천 <strong><?=number_format($view['wr_good'])?></strong></a>
<span id="bo_v_act_good"></span>
<? } ?>
<? if ($nogood_href) {?>
<a href="<?=$nogood_href.'&amp;'.$qstr?>" id="nogood_button" class="btn_b01">비추천 <strong><?=number_format($view['wr_nogood'])?></strong></a>
<span id="bo_v_act_nogood"></span>
<? } ?>
</div>
<? } else {
if($board['bo_use_good'] || $board['bo_use_nogood']) {
@ -202,15 +208,15 @@ $(function() {
return false;
});
// 추천
$("#good_button").click(function() {
excute_good(this.href, this.id);
return false;
});
// 추천, 비추천
$("#good_button, #nogood_button").click(function() {
var $tx;
if(this.id == "good_button")
$tx = $("#bo_v_act_good");
else
$tx = $("#bo_v_act_nogood");
// 비추천
$("#nogood_button").click(function() {
excute_good(this.href, this.id);
excute_good(this.href, $(this), $tx);
return false;
});
});
@ -231,7 +237,7 @@ function view_image_resize()
});
}
function excute_good(href, id)
function excute_good(href, $el, $tx)
{
$.post(
href,
@ -243,7 +249,12 @@ function excute_good(href, id)
}
if(data.count) {
$("#"+id).find("strong").text(number_format(String(data.count)));
$el.find("strong").text(number_format(String(data.count)));
if($tx.attr("id").search("nogood") > -1) {
$tx.text("이 글을 비추천하셨습니다.").css("display", "inline");
} else {
$tx.text("이 글을 추천하셨습니다.").css("display", "inline");
}
}
}, "json"
);

2
skin/board/gallery/view_comment.skin.php
View File

@ -128,7 +128,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
</table>
<div class="btn_confirm">
<input type="submit" class="btn_submit" value="댓글입력">
<input type="submit" class="btn_submit" value="댓글등록">
</div>
</form>