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

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

Browse Source
This commit is contained in:
whitedot
2013-10-21 14:12:58 +09:00
parent f0bc1d5586 73524bd7b4
commit a442437201
9 changed files with 303 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/admin.menu100.php
View File

@ -7,7 +7,7 @@ $menu['menu100'] = array (
//array('100400', '버전정보', G5_ADMIN_URL.'/version.php', 'cf_version'), //array('100400', '버전정보', G5_ADMIN_URL.'/version.php', 'cf_version'),
array('100800', '세션파일 일괄삭제',G5_ADMIN_URL.'/session_file_delete.php', 'cf_session', 1), array('100800', '세션파일 일괄삭제',G5_ADMIN_URL.'/session_file_delete.php', 'cf_session', 1),
array('100900', '캐시파일 일괄삭제',G5_ADMIN_URL.'/cache_file_delete.php', 'cf_cache', 1), array('100900', '캐시파일 일괄삭제',G5_ADMIN_URL.'/cache_file_delete.php', 'cf_cache', 1),
array('100910', '캡챠파일 일괄삭제',G5_ADMIN_URL.'/gcaptcha_file_delete.php', 'cf_captcha', 1), array('100910', '캡챠파일 일괄삭제',G5_ADMIN_URL.'/captcha_file_delete.php', 'cf_captcha', 1),
array('100920', '썸네일파일 일괄삭제',G5_ADMIN_URL.'/thumbnail_file_delete.php', 'cf_thumbnail', 1), array('100920', '썸네일파일 일괄삭제',G5_ADMIN_URL.'/thumbnail_file_delete.php', 'cf_thumbnail', 1),
array('100930', '네이버 신디케이션 핑',G5_SYNDI_URL.'/ping.php', 'cf_syndi_ping', 1), array('100930', '네이버 신디케이션 핑',G5_SYNDI_URL.'/ping.php', 'cf_syndi_ping', 1),
array('100500', 'phpinfo()', G5_ADMIN_URL.'/phpinfo.php', 'cf_phpinfo'), array('100500', 'phpinfo()', G5_ADMIN_URL.'/phpinfo.php', 'cf_phpinfo'),

2
adm/gcaptcha_file_delete.php → adm/captcha_file_delete.php
View File

@ -25,7 +25,7 @@ if (!$dir=@opendir(G5_DATA_PATH.'/cache')) {
$cnt=0; $cnt=0;
echo '<ul>'.PHP_EOL; echo '<ul>'.PHP_EOL;
$files = glob(G5_DATA_PATH.'/cache/gcaptcha-*'); $files = glob(G5_DATA_PATH.'/cache/?captcha-*');
if (is_array($files)) { if (is_array($files)) {
$before_time = G5_SERVER_TIME - 3600; // 한시간전 $before_time = G5_SERVER_TIME - 3600; // 한시간전
foreach ($files as $gcaptcha_file) { foreach ($files as $gcaptcha_file) {

20
install/gnuboard5.sql
View File

@ -6,7 +6,7 @@
DROP TABLE IF EXISTS `g5_auth`; DROP TABLE IF EXISTS `g5_auth`;
CREATE TABLE IF NOT EXISTS `g5_auth` ( CREATE TABLE IF NOT EXISTS `g5_auth` (
`mb_id` varchar(255) NOT NULL default '', `mb_id` varchar(20) NOT NULL default '',
`au_menu` varchar(20) NOT NULL default '', `au_menu` varchar(20) NOT NULL default '',
`au_auth` set('r','w','d') NOT NULL default '', `au_auth` set('r','w','d') NOT NULL default '',
PRIMARY KEY (`mb_id`,`au_menu`) PRIMARY KEY (`mb_id`,`au_menu`)
@ -281,7 +281,7 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
`cf_mobile_search_skin` varchar(255) NOT NULL DEFAULT '', `cf_mobile_search_skin` varchar(255) NOT NULL DEFAULT '',
`cf_mobile_connect_skin` varchar(255) NOT NULL DEFAULT '', `cf_mobile_connect_skin` varchar(255) NOT NULL DEFAULT '',
`cf_mobile_member_skin` varchar(255) NOT NULL DEFAULT '', `cf_mobile_member_skin` varchar(255) NOT NULL DEFAULT '',
`cf_gcaptcha_mp3` varchar(255) NOT NULL DEFAULT '', `cf_captcha_mp3` varchar(255) NOT NULL DEFAULT '',
`cf_editor` varchar(255) NOT NULL DEFAULT '', `cf_editor` varchar(255) NOT NULL DEFAULT '',
`cf_cert_use` tinyint(4) NOT NULL DEFAULT '0', `cf_cert_use` tinyint(4) NOT NULL DEFAULT '0',
`cf_cert_ipin` varchar(255) NOT NULL DEFAULT '', `cf_cert_ipin` varchar(255) NOT NULL DEFAULT '',
@ -325,7 +325,7 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
CREATE TABLE IF NOT EXISTS `g5_cert_history` ( CREATE TABLE IF NOT EXISTS `g5_cert_history` (
`cr_id` int(11) NOT NULL auto_increment, `cr_id` int(11) NOT NULL auto_increment,
`mb_id` varchar(255) NOT NULL DEFAULT '', `mb_id` varchar(20) NOT NULL DEFAULT '',
`cr_company` varchar(255) NOT NULL DEFAULT '', `cr_company` varchar(255) NOT NULL DEFAULT '',
`cr_method` varchar(255) NOT NULL DEFAULT '', `cr_method` varchar(255) NOT NULL DEFAULT '',
`cr_ip` varchar(255) NOT NULL DEFAULT '', `cr_ip` varchar(255) NOT NULL DEFAULT '',
@ -383,7 +383,7 @@ DROP TABLE IF EXISTS `g5_group_member`;
CREATE TABLE IF NOT EXISTS `g5_group_member` ( CREATE TABLE IF NOT EXISTS `g5_group_member` (
`gm_id` int(11) NOT NULL auto_increment, `gm_id` int(11) NOT NULL auto_increment,
`gr_id` varchar(255) NOT NULL default '', `gr_id` varchar(255) NOT NULL default '',
`mb_id` varchar(255) NOT NULL default '', `mb_id` varchar(20) NOT NULL default '',
`gm_datetime` datetime NOT NULL default '0000-00-00 00:00:00', `gm_datetime` datetime NOT NULL default '0000-00-00 00:00:00',
PRIMARY KEY (`gm_id`), PRIMARY KEY (`gm_id`),
KEY `gr_id` (`gr_id`), KEY `gr_id` (`gr_id`),
@ -399,7 +399,7 @@ CREATE TABLE IF NOT EXISTS `g5_group_member` (
DROP TABLE IF EXISTS `g5_login`; DROP TABLE IF EXISTS `g5_login`;
CREATE TABLE IF NOT EXISTS `g5_login` ( CREATE TABLE IF NOT EXISTS `g5_login` (
`lo_ip` varchar(255) NOT NULL default '', `lo_ip` varchar(255) NOT NULL default '',
`mb_id` varchar(255) NOT NULL default '', `mb_id` varchar(20) NOT NULL default '',
`lo_datetime` datetime NOT NULL default '0000-00-00 00:00:00', `lo_datetime` datetime NOT NULL default '0000-00-00 00:00:00',
`lo_location` text NOT NULL, `lo_location` text NOT NULL,
`lo_url` text NOT NULL, `lo_url` text NOT NULL,
@ -432,7 +432,7 @@ CREATE TABLE IF NOT EXISTS `g5_mail` (
DROP TABLE IF EXISTS `g5_member`; DROP TABLE IF EXISTS `g5_member`;
CREATE TABLE IF NOT EXISTS `g5_member` ( CREATE TABLE IF NOT EXISTS `g5_member` (
`mb_no` int(11) NOT NULL auto_increment, `mb_no` int(11) NOT NULL auto_increment,
`mb_id` varchar(255) NOT NULL default '', `mb_id` varchar(20) NOT NULL default '',
`mb_password` varchar(255) NOT NULL default '', `mb_password` varchar(255) NOT NULL default '',
`mb_name` varchar(255) NOT NULL default '', `mb_name` varchar(255) NOT NULL default '',
`mb_nick` varchar(255) NOT NULL default '', `mb_nick` varchar(255) NOT NULL default '',
@ -496,8 +496,8 @@ CREATE TABLE IF NOT EXISTS `g5_member` (
DROP TABLE IF EXISTS `g5_memo`; DROP TABLE IF EXISTS `g5_memo`;
CREATE TABLE IF NOT EXISTS `g5_memo` ( CREATE TABLE IF NOT EXISTS `g5_memo` (
`me_id` int(11) NOT NULL default '0', `me_id` int(11) NOT NULL default '0',
`me_recv_mb_id` varchar(255) NOT NULL default '', `me_recv_mb_id` varchar(20) NOT NULL default '',
`me_send_mb_id` varchar(255) NOT NULL default '', `me_send_mb_id` varchar(20) NOT NULL default '',
`me_send_datetime` datetime NOT NULL default '0000-00-00 00:00:00', `me_send_datetime` datetime NOT NULL default '0000-00-00 00:00:00',
`me_read_datetime` datetime NOT NULL default '0000-00-00 00:00:00', `me_read_datetime` datetime NOT NULL default '0000-00-00 00:00:00',
`me_memo` text NOT NULL, `me_memo` text NOT NULL,
@ -576,7 +576,7 @@ DROP TABLE IF EXISTS `g5_poll_etc`;
CREATE TABLE IF NOT EXISTS `g5_poll_etc` ( CREATE TABLE IF NOT EXISTS `g5_poll_etc` (
`pc_id` int(11) NOT NULL default '0', `pc_id` int(11) NOT NULL default '0',
`po_id` int(11) NOT NULL default '0', `po_id` int(11) NOT NULL default '0',
`mb_id` varchar(255) NOT NULL default '', `mb_id` varchar(20) NOT NULL default '',
`pc_name` varchar(255) NOT NULL default '', `pc_name` varchar(255) NOT NULL default '',
`pc_idea` varchar(255) NOT NULL default '', `pc_idea` varchar(255) NOT NULL default '',
`pc_datetime` datetime NOT NULL default '0000-00-00 00:00:00', `pc_datetime` datetime NOT NULL default '0000-00-00 00:00:00',
@ -608,7 +608,7 @@ CREATE TABLE IF NOT EXISTS `g5_popular` (
DROP TABLE IF EXISTS `g5_scrap`; DROP TABLE IF EXISTS `g5_scrap`;
CREATE TABLE IF NOT EXISTS `g5_scrap` ( CREATE TABLE IF NOT EXISTS `g5_scrap` (
`ms_id` int(11) NOT NULL auto_increment, `ms_id` int(11) NOT NULL auto_increment,
`mb_id` varchar(255) NOT NULL default '', `mb_id` varchar(20) NOT NULL default '',
`bo_table` varchar(20) NOT NULL default '', `bo_table` varchar(20) NOT NULL default '',
`wr_id` varchar(15) NOT NULL default '', `wr_id` varchar(15) NOT NULL default '',
`ms_datetime` datetime NOT NULL default '0000-00-00 00:00:00', `ms_datetime` datetime NOT NULL default '0000-00-00 00:00:00',

2
install/install_db.php
View File

@ -103,7 +103,7 @@ $sql = " insert into `{$table_prefix}config`
cf_mobile_search_skin = 'basic', cf_mobile_search_skin = 'basic',
cf_mobile_connect_skin = 'basic', cf_mobile_connect_skin = 'basic',
cf_mobile_member_skin = 'basic', cf_mobile_member_skin = 'basic',
cf_gcaptcha_mp3 = 'basic', cf_captcha_mp3 = 'basic',
cf_register_level = '2', cf_register_level = '2',
cf_register_point = '1000', cf_register_point = '1000',
cf_icon_level = '2', cf_icon_level = '2',

3
plugin/kcaptcha/kcaptcha.js
View File

@ -1,4 +1,6 @@
$(function(){ $(function(){
var mp3_url = "";
$("#captcha_reload").bind("click", function(){ $("#captcha_reload").bind("click", function(){
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
@ -24,7 +26,6 @@ $(function(){
}); });
}).trigger("click"); }).trigger("click");
var mp3_url = "";
$("#captcha_mp3").click(function(){ $("#captcha_mp3").click(function(){
$("body").css("cursor", "wait"); $("body").css("cursor", "wait");

7
plugin/kcaptcha/kcaptcha.lib.php
View File

@ -236,12 +236,13 @@ class KCAPTCHA{
function captcha_html($class="captcha") function captcha_html($class="captcha")
{ {
$html .= "\n".'<script>var g5_captcha_url = "'.G5_CAPTCHA_URL.'";</script>'; $html .= "\n".'<script>var g5_captcha_url = "'.G5_CAPTCHA_URL.'";</script>';
$html .= "\n".'<script>var g5_captcha_path = "'.G5_CAPTCHA_PATH.'";</script>'; //$html .= "\n".'<script>var g5_captcha_path = "'.G5_CAPTCHA_PATH.'";</script>';
$html .= "\n".'<script src="'.G5_CAPTCHA_URL.'/kcaptcha.js"></script>'; $html .= "\n".'<script src="'.G5_CAPTCHA_URL.'/kcaptcha.js"></script>';
$html .= "\n".'<fieldset id="captcha" class="'.$class.'">'; $html .= "\n".'<fieldset id="captcha" class="'.$class.'">';
$html .= "\n".'<legend>자동등록방지</legend>'; $html .= "\n".'<legend>자동등록방지</legend>';
if (G5_IS_MOBILE) $html .= '<audio src="#" id="captcha_audio" controls></audio>'; if (G5_IS_MOBILE) $html .= '<audio src="#" id="captcha_audio" controls></audio>';
$html .= "\n".'<img src="#" alt="" id="captcha_img">'; //$html .= "\n".'<img src="#" alt="" id="captcha_img">';
$html .= "\n".'<img src="javascript:void(0);" alt="" id="captcha_img">';
if (!G5_IS_MOBILE) $html .= "\n".'<button type="button" id="captcha_mp3"><span></span>숫자음성듣기</button>'; if (!G5_IS_MOBILE) $html .= "\n".'<button type="button" id="captcha_mp3"><span></span>숫자음성듣기</button>';
$html .= "\n".'<button type="button" id="captcha_reload"><span></span>새로고침</button>'; $html .= "\n".'<button type="button" id="captcha_reload"><span></span>새로고침</button>';
$html .= '<input type="text" name="captcha_key" id="captcha_key" required class="captcha_box required" size="6" maxlength="6">'; $html .= '<input type="text" name="captcha_key" id="captcha_key" required class="captcha_box required" size="6" maxlength="6">';
@ -268,12 +269,14 @@ function chk_captcha()
if (!isset($_POST['captcha_key'])) return false; if (!isset($_POST['captcha_key'])) return false;
if (!trim($_POST['captcha_key'])) return false; if (!trim($_POST['captcha_key'])) return false;
/*
if ($_POST['captcha_key'] != get_session('ss_captcha_key')) { if ($_POST['captcha_key'] != get_session('ss_captcha_key')) {
$_SESSION['ss_captcha_count'] = $captcha_count + 1; $_SESSION['ss_captcha_count'] = $captcha_count + 1;
$sql = " insert _error set er_datetime = NOW(), er_ip = '{$_SERVER['REMOTE_ADDR']}', er_user_agent = '{$_SERVER['HTTP_USER_AGENT']}', er_request = 'POST(".$_POST['captcha_key'].')!=SESSION('.get_session('ss_captcha_key').")' "; $sql = " insert _error set er_datetime = NOW(), er_ip = '{$_SERVER['REMOTE_ADDR']}', er_user_agent = '{$_SERVER['HTTP_USER_AGENT']}', er_request = 'POST(".$_POST['captcha_key'].')!=SESSION('.get_session('ss_captcha_key').")' ";
sql_query($sql); sql_query($sql);
return false; return false;
} }
*/
return true; return true;
} }
?> ?>

4
plugin/kcaptcha/kcaptcha_image.php
View File

@ -1,9 +1,7 @@
<?php <?php
include_once("_common.php"); include_once("_common.php");
//error_reporting (E_ALL); include_once('captcha.lib.php');
include('captcha.lib.php');
//session_start();
$captcha = new KCAPTCHA(); $captcha = new KCAPTCHA();
$captcha->setKeyString(get_session("ss_captcha_key")); $captcha->setKeyString(get_session("ss_captcha_key"));
$captcha->getKeyString(); $captcha->getKeyString();

8
plugin/kcaptcha/kcaptcha_mp3.php
View File

@ -3,7 +3,7 @@ include_once("_common.php");
function make_mp3() function make_mp3()
{ {
global $g4, $config; global $config;
$number = get_session("ss_captcha_key"); $number = get_session("ss_captcha_key");
@ -26,10 +26,10 @@ function make_mp3()
file_put_contents(G5_PATH.'/'.$mp3_file, $contents); file_put_contents(G5_PATH.'/'.$mp3_file, $contents);
// 지난 캡챠 파일 삭제 // 지난 캡챠 파일 삭제 (100번중에 한번만 실행)
if (rand(0,10) == 0) { if (rand(0,99) == 0) {
foreach (glob(G5_PATH.'/data/cache/kcaptcha-*.mp3') as $file) { foreach (glob(G5_PATH.'/data/cache/kcaptcha-*.mp3') as $file) {
if (filemtime($file) + 86400 < $g4['server_time']) { if (filemtime($file) + 86400 < G5_SERVER_TIME) {
unset($file); unset($file);
} }
} }

5
plugin/kcaptcha/kcaptcha_session.php
View File

@ -1,8 +1,7 @@
<?php <?php
include_once("_common.php"); include_once("_common.php");
header("Content-Type: text/html; charset=$g4[charset]"); include_once(dirname(__FILE__).'/kcaptcha_config.php');
require(dirname(__FILE__).'/kcaptcha_config.php'); include_once('captcha.lib.php');
include('captcha.lib.php');
while(true){ while(true){
$keystring=''; $keystring='';