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

g5 merge 충동수정

Browse Source
This commit is contained in:
chicpro
2013-10-21 18:38:50 +09:00
parent c03bfc6afc a442437201
commit 557c0d9fbd
10 changed files with 35 additions and 39 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) {

3
css/default.css
View File

@ -195,8 +195,7 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7f7f7;color:#000;vertical-align:middle} fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7f7f7;color:#000;vertical-align:middle}
/* 필수입력 */ /* 필수입력 */
.required {background:url('../img/wrest.gif') #f7f7f7 top right no-repeat} .required, textarea.required {background:url('../img/wrest.gif') #f7f7f7 top right no-repeat}
textarea.required {background:url('../img/wrest.gif') #f7f7f7 top right no-repeat}
/* 테이블 항목별 정의 */ /* 테이블 항목별 정의 */
.td_board {width:120px;text-align:center} .td_board {width:120px;text-align:center}

3
css/mobile.css
View File

@ -159,8 +159,7 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
.tbl_frm01 .frm_info {display:block;padding:0.3em 0 0;color:#666;line-height:1.3em} .tbl_frm01 .frm_info {display:block;padding:0.3em 0 0;color:#666;line-height:1.3em}
/* 필수입력 */ /* 필수입력 */
.required {background:url('../img/wrest.gif') #f7f7f7 top right no-repeat} .required, textarea.required {background:url('../img/wrest.gif') #f7f7f7 top right no-repeat}
textarea.required {background:url('../img/wrest.gif') #f7f7f7 top right no-repeat}
/* 테이블 항목별 정의 */ /* 테이블 항목별 정의 */
.td_board {width:120px;text-align:center} .td_board {width:120px;text-align:center}

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

@ -125,7 +125,7 @@ if($g5_install || !$result) {
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
mobile/skin/member/basic/style.css
View File

@ -56,8 +56,7 @@
*/ */
.mbskin .tbl_frm01 a {} .mbskin .tbl_frm01 a {}
.mbskin .required {} /* 필수입력 */ .mbskin .required, .mbskin textarea.required {background:url('../../../../img/wrest.gif') #f7f7f7 top right no-repeat} /* 필수입력 */
.mbskin textarea.required {}
/* 테이블 항목별 정의 */ /* 테이블 항목별 정의 */
.mbskin .td_board {} .mbskin .td_board {}

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);
} }
} }

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

@ -5,7 +5,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<!-- 회원정보 입력/수정 시작 { --> <!-- 회원정보 입력/수정 시작 { -->
<link rel="stylesheet" href="<?php echo $member_skin_url ?>/style.css"> <link rel="stylesheet" href="<?php echo $member_skin_url ?>/style.css">
<div class="mb_skin"> <div class="mbskin">
<script src="<?php echo G5_JS_URL ?>/jquery.register_form.js"></script> <script src="<?php echo G5_JS_URL ?>/jquery.register_form.js"></script>
<?php if($config['cf_cert_use'] && ($config['cf_cert_ipin'] || $config['cf_cert_hp'])) { ?> <?php if($config['cf_cert_use'] && ($config['cf_cert_ipin'] || $config['cf_cert_hp'])) { ?>

29
skin/member/basic/style.css
View File

@ -44,26 +44,25 @@
.mbskin td.empty_table {} .mbskin td.empty_table {}
/* 폼 테이블 */ /* 폼 테이블 */
.mb_skin table {} .mbskin table {}
.mb_skin caption {} .mbskin caption {}
.mb_skin .frm_info {} .mbskin .frm_info {}
.mb_skin .frm_address {} .mbskin .frm_address {}
.mb_skin .frm_file {} .mbskin .frm_file {}
.mb_skin .tbl_frm01 {} .mbskin .tbl_frm01 {}
.mb_skin .tbl_frm01 th {} .mbskin .tbl_frm01 th {}
.mb_skin .tbl_frm01 td {} .mbskin .tbl_frm01 td {}
.mb_skin .tbl_frm01 textarea, .mb_skin tbl_frm01 .frm_input {} .mbskin .tbl_frm01 textarea, .mb_skin tbl_frm01 .frm_input {}
.mb_skin .tbl_frm01 textarea {} .mbskin .tbl_frm01 textarea {}
/* /*
.mb_skin .tbl_frm01 #captcha {} .mbskin .tbl_frm01 #captcha {}
.mb_skin .tbl_frm01 #captcha input {} .mbskin .tbl_frm01 #captcha input {}
*/ */
.mb_skin .tbl_frm01 a {} .mbskin .tbl_frm01 a {}
/* 필수입력 */ /* 필수입력 */
.mbskin .required {} .mbskin .required, .mbskin textarea.required {background:url('../../../img/wrest.gif') #f7f7f7 top right no-repeat}
.mbskin textarea.required {}
/* 테이블 항목별 정의 */ /* 테이블 항목별 정의 */
.mbskin .td_board {} .mbskin .td_board {}