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

Merge branch 'g5'

Browse Source
This commit is contained in:
chicpro
2013-12-26 17:02:51 +09:00
parent bf436a83cd ec341bda32
commit a4981943a4
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bbs/register_email.php
View File

@ -29,7 +29,7 @@ include_once('./_head.php');
<td><?php echo captcha_html(); ?></td>
</tr>
</table>
<div>
</div>
<div class="btn_confirm">
<input type="submit" id="btn_submit" class="btn_submit" value="인증메일변경">

2
common.php
View File

@ -144,7 +144,7 @@ if (file_exists($dbconfig_file)) {
@ini_set("session.use_trans_sid", 0); // PHPSESSID를 자동으로 넘기지 않음
@ini_set("url_rewriter.tags",""); // 링크에 PHPSESSID가 따라다니는것을 무력화함 (해뜰녘님께서 알려주셨습니다.)
session_save_path(G5_DATA_PATH.'/session');
session_save_path(G5_SESSION_PATH);
if (isset($SESSION_CACHE_LIMITER))
@session_cache_limiter($SESSION_CACHE_LIMITER);

2
config.php
View File

@ -56,6 +56,7 @@ define('G5_KCPCERT_DIR', 'kcpcert');
define('G5_SNS_DIR', 'sns');
define('G5_SYNDI_DIR', 'syndi');
define('G5_PHPMAILER_DIR', 'PHPMailer_v2.0.4');
define('G5_SESSION_DIR', 'session');
// URL 은 브라우저상에서의 경로 (도메인으로 부터의)
if (G5_DOMAIN) {
@ -98,6 +99,7 @@ define('G5_LIB_PATH', G5_PATH.'/'.G5_LIB_DIR);
define('G5_PLUGIN_PATH', G5_PATH.'/'.G5_PLUGIN_DIR);
define('G5_SKIN_PATH', G5_PATH.'/'.G5_SKIN_DIR);
define('G5_MOBILE_PATH', G5_PATH.'/'.G5_MOBILE_DIR);
define('G5_SESSION_PATH', G5_DATA_PATH.'/'.G5_SESSION_DIR);
define('G5_CAPTCHA_PATH', G5_PLUGIN_PATH.'/'.G5_CAPTCHA_DIR);
define('G5_EDITOR_PATH', G5_PLUGIN_PATH.'/'.G5_EDITOR_DIR);
define('G5_OKNAME_PATH', G5_PLUGIN_PATH.'/'.G5_OKNAME_DIR);

18
css/admin.css
View File

@ -770,12 +770,12 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
.sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto}
.sv_nojs .sv {display:block}
/* pagination */
.pg_wrap {clear:both;margin:0 0 20px;padding-top:20px;text-align:center}
.pg {display:inline-block;border:1px solid #ddd;letter-spacing:-4px}
.pg a:focus, .pg a:hover, .pg a:active {text-decoration:none}
.pg_page, .pg_current {display:inline-block;padding:0 12px;height:30px;color:#000;letter-spacing:0;line-height:2.6em;vertical-align:middle}
.pg_page {background:#f9f9f9;text-decoration:none}
.pg_start, .pg_prev {border-right:1px solid #ddd}
.pg_end, .pg_next {border-left:1px solid #ddd}
.pg_current {background:#444;color:#fff;font-weight:bold}
/* 페이징 */
.pg_wrap {clear:both;margin:0 0 20px;padding:20px 0 0;text-align:center}
.pg {}
.pg_page, .pg_current {display:inline-block;padding:0 8px;height:25px;color:#000;letter-spacing:0;line-height:2.2em;vertical-align:middle}
.pg a:focus, .pg a:hover {text-decoration:none}
.pg_page {background:#e4eaec;text-decoration:none}
.pg_start, .pg_prev {/* 이전 */}
.pg_end, .pg_next {/* 다음 */}
.pg_current {display:inline-block;margin:0 4px 0 0;background:#333;color:#fff;font-weight:normal}

0
plugin/kcpcert/bin/ct_cli Normal file → Executable file
View File

2
plugin/kcpcert/kcpcert_result.php
View File

@ -102,7 +102,7 @@ if( $cert_enc_use == "Y" )
{
// 검증 실패시 처리 영역
echo "dn_hash 변조 위험있음";
echo "dn_hash 변조 위험있음 (".G5_KCPCERT_PATH."/bin/ct_cli 파일에 실행권한이 있는지 확인하세요.)";
exit;
// 오류 처리 ( dn_hash 변조 위험있음)
}