diff --git a/adm/cache_file_delete.php b/adm/cache_file_delete.php index 77a0cdb15..91435809d 100644 --- a/adm/cache_file_delete.php +++ b/adm/cache_file_delete.php @@ -5,6 +5,11 @@ include_once('./_common.php'); if ($is_admin != 'super') alert('최고관리자만 접근 가능합니다.', G5_URL); +@include_once('./safe_check.php'); +if(function_exists('social_log_file_delete')){ + social_log_file_delete(); +} + $g5['title'] = '캐시파일 일괄삭제'; include_once('./admin.head.php'); ?> diff --git a/adm/index.php b/adm/index.php index 810ebc5bc..9a6d0b259 100644 --- a/adm/index.php +++ b/adm/index.php @@ -2,6 +2,11 @@ $sub_menu = '100000'; include_once('./_common.php'); +@include_once('./safe_check.php'); +if(function_exists('social_log_file_delete')){ + social_log_file_delete(86400); //소셜로그인 디버그 파일 24시간 지난것은 삭제 +} + $g5['title'] = '관리자메인'; include_once ('./admin.head.php'); diff --git a/adm/safe_check.php b/adm/safe_check.php new file mode 100644 index 000000000..71f28f5c5 --- /dev/null +++ b/adm/safe_check.php @@ -0,0 +1,17 @@ + $before_time) continue; + + unlink($social_log_file); + } + } +} +?> \ No newline at end of file diff --git a/bbs/memo_view.php b/bbs/memo_view.php index e032c9fca..9b5f72a12 100644 --- a/bbs/memo_view.php +++ b/bbs/memo_view.php @@ -68,8 +68,8 @@ $mb = get_member($memo['me_'.$unkind.'_mb_id']); $list_link = './memo.php?kind='.$kind; if(isset($page) && $page){ - $prev_link .= '&page='.(int) $page; - $next_link .= '&page='.(int) $page; + $prev_link .= $prev_link ? '&page='.(int) $page : ''; + $next_link .= $next_link ? '&page='.(int) $page : ''; $list_link .= '&page='.(int) $page; } diff --git a/config.php b/config.php index 04b607a33..12933a353 100644 --- a/config.php +++ b/config.php @@ -5,7 +5,7 @@ ********************/ define('G5_VERSION', '그누보드5'); -define('G5_GNUBOARD_VER', '5.3.1'); +define('G5_GNUBOARD_VER', '5.3.1.2'); define('G5_YOUNGCART_VER', '5.3.1.1'); // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음 @@ -153,7 +153,7 @@ define('G5_DIR_PERMISSION', 0755); // 디렉토리 생성시 퍼미션 define('G5_FILE_PERMISSION', 0644); // 파일 생성시 퍼미션 // 모바일 인지 결정 $_SERVER['HTTP_USER_AGENT'] -define('G5_MOBILE_AGENT', 'phone|samsung|lgtel|mobile|[^A]skt|nokia|blackberry|android|sony'); +define('G5_MOBILE_AGENT', 'phone|samsung|lgtel|mobile|[^A]skt|nokia|blackberry|BB10|android|sony'); // SMTP // lib/mailer.lib.php 에서 사용 diff --git a/css/default.css b/css/default.css index c7af1da08..e64520b9a 100644 --- a/css/default.css +++ b/css/default.css @@ -325,7 +325,7 @@ box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); .full_input{width:100%} .half_input{width:49.5%} -.tbl_frm01 textarea {width:100%;height:100px} +.tbl_frm01 textarea, .write_div textarea {width:100%;height:100px} .tbl_frm01 a {text-decoration:none} .tbl_frm01 .frm_file {display:block;margin-bottom:5px} .tbl_frm01 .frm_info {display:block;padding:0 0 5px;line-height:1.4em} diff --git a/extend/social_login.extend.php b/extend/social_login.extend.php index 3e8c8f3a5..fd851f6b4 100644 --- a/extend/social_login.extend.php +++ b/extend/social_login.extend.php @@ -39,7 +39,10 @@ define('G5_SOCIAL_USE_POPUP', ! is_mobile() ); // 모바일에서는 팝업사 define('G5_SOCIAL_DELETE_DAY', 0); // 메일 인증관련, false 이면 메일인증을 받지 않고 로그인됩니다. true 이고 기본환경설정에서 메일인증설정이 활성화 되어 있는 경우 메일인증을 받아야만 로그인 됩니다. -define('G5_SOCIAL_CERTIFY_MAIL', false ); +define('G5_SOCIAL_CERTIFY_MAIL', false); + +// 소셜 DEBUG 관련 설정, 기본값은 false, true 로 설정시 data/tmp/social_anystring.log 파일이 생성됩니다. +define('G5_SOCIAL_IS_DEBUG', false); include_once(G5_SOCIAL_LOGIN_PATH.'/includes/functions.php'); ?> \ No newline at end of file diff --git a/lib/common.lib.php b/lib/common.lib.php index d079d217f..130610e81 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -412,7 +412,7 @@ function get_list($write_row, $board, $skin_url, $subject_len=40) $list['icon_new'] = ''; if ($board['bo_new'] && $list['wr_datetime'] >= date("Y-m-d H:i:s", G5_SERVER_TIME - ($board['bo_new'] * 3600))) - $list['icon_new'] = '새글 '; + $list['icon_new'] = '새글 '; $list['icon_hot'] = ''; if ($board['bo_hot'] && $list['wr_hit'] >= $board['bo_hot']) diff --git a/mobile/skin/board/basic/list.skin.php b/mobile/skin/board/basic/list.skin.php index ebdacd66f..421c19592 100644 --- a/mobile/skin/board/basic/list.skin.php +++ b/mobile/skin/board/basic/list.skin.php @@ -11,9 +11,9 @@ add_stylesheet('', 0 ?> -