From e304651f11cfe0529479df783c44ab526338bf63 Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 4 Oct 2019 12:21:11 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20css=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 6 +++--- theme/basic/css/default.css | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/css/default.css b/css/default.css index 11cd01615..4bede2e0e 100644 --- a/css/default.css +++ b/css/default.css @@ -104,7 +104,7 @@ border:1px solid #558ab7 !important; /* 메인메뉴 */ #gnb {position:relative;background:#fff} #gnb > h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} -#gnb .gnb_wrap {margin:0 auto;position:relative;z-index:10} +#gnb .gnb_wrap {margin:0 auto;position:relative;z-index:3} #gnb #gnb_1dul {font-size:1.083em;padding:0;border-bottom:1px solid #e0e2e5;zoom:1} #gnb ul:after {display:block;visibility:hidden;clear:both;content:""} #gnb .gnb_1dli {float:left;line-height:55px;padding:0px;position:relative} @@ -157,10 +157,10 @@ box-shadow:0 2px 5px rgba(0,0,0,0.2)} /* 중간 레이아웃 */ #wrapper {} #container_wr:after {display:block;visibility:hidden;clear:both;content:""} -#container_wr {z-index:5;margin:0 auto;height:100%;zoom:1} +#container_wr {z-index:2;margin:0 auto;height:100%;zoom:1} #aside {float:right;width:235px;padding:0;height:100%;margin:20px 0 20px 20px} -#container {z-index:4;position:relative;float:left;min-height:500px;height:auto !important;margin:20px 0;height:500px;font-size:1em;width:930px;zoom:1} +#container {z-index:1;position:relative;float:left;min-height:500px;height:auto !important;margin:20px 0;height:500px;font-size:1em;width:930px;zoom:1} #container:after {display:block;visibility:hidden;clear:both;content:""} #container_title {font-size:1.333em;margin:0 auto;font-weight:bold} #container_title span {margin:0 auto 10px;display:block;line-height:30px} diff --git a/theme/basic/css/default.css b/theme/basic/css/default.css index c0ece1a38..128d98042 100644 --- a/theme/basic/css/default.css +++ b/theme/basic/css/default.css @@ -104,7 +104,7 @@ border:1px solid #558ab7 !important; /* 메인메뉴 */ #gnb {position:relative;background:#fff} #gnb > h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} -#gnb .gnb_wrap {margin:0 auto;position:relative;z-index:10} +#gnb .gnb_wrap {margin:0 auto;position:relative;z-index:3} #gnb #gnb_1dul {font-size:1.083em;padding:0;border-bottom:1px solid #e0e2e5;zoom:1} #gnb ul:after {display:block;visibility:hidden;clear:both;content:""} #gnb .gnb_1dli {float:left;line-height:55px;padding:0px;position:relative} @@ -157,10 +157,10 @@ box-shadow:0 2px 5px rgba(0,0,0,0.2)} /* 중간 레이아웃 */ #wrapper {} #container_wr:after {display:block;visibility:hidden;clear:both;content:""} -#container_wr {z-index:5;margin:0 auto;height:100%;zoom:1} +#container_wr {z-index:2;margin:0 auto;height:100%;zoom:1} #aside {float:right;width:235px;padding:0;height:100%;margin:20px 0 20px 20px} -#container {z-index:4;position:relative;float:left;min-height:500px;height:auto !important;margin:20px 0;height:500px;font-size:1em;width:930px;zoom:1} +#container {z-index:1;position:relative;float:left;min-height:500px;height:auto !important;margin:20px 0;height:500px;font-size:1em;width:930px;zoom:1} #container:after {display:block;visibility:hidden;clear:both;content:""} #container_title {font-size:1.333em;margin:0 auto;font-weight:bold} #container_title span {margin:0 auto 10px;display:block;line-height:30px} From 1a829148614ddf0143dca837fcefac44b5db52fc Mon Sep 17 00:00:00 2001 From: thisgun Date: Tue, 22 Oct 2019 12:26:53 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=EB=B9=A0=EC=A7=80=EA=B1=B0=EB=82=98=20?= =?UTF-8?q?=EB=B3=B4=EC=99=84=20=ED=95=B4=EC=95=BC=20=ED=95=A0=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/view_image.php | 88 +++++++++++++------ mobile/skin/latest/basic/style.css | 2 +- skin/board/gallery/style.css | 2 +- .../basic/mobile/skin/latest/basic/style.css | 2 +- theme/basic/skin/board/gallery/style.css | 2 +- 5 files changed, 63 insertions(+), 33 deletions(-) diff --git a/bbs/view_image.php b/bbs/view_image.php index c7a7edca7..f988deeb5 100644 --- a/bbs/view_image.php +++ b/bbs/view_image.php @@ -23,57 +23,87 @@ if(strpos($filename, G5_DATA_DIR.'/editor')) { $filepath = G5_DATA_PATH.'/file/'.$bo_table.'/'.$filename; } -if(is_file($filepath)) { - $size = @getimagesize($filepath); +$file_exists = (is_file($filepath) && file_exists($filepath)) ? 1 : 0; + +if(run_replace('exists_view_image', $file_exists, $filepath, $editor_file)) { + $size = $file_exists ? run_replace('get_view_imagesize', @getimagesize($filepath), $filepath, $editor_file) : array(); if(empty($size)) alert_close('이미지 파일이 아닙니다.'); - $width = $size[0]; - $height = $size[1]; + $width = (isset($size[0]) && $size[0]) ? (int) $size[0] : 0; + $height = (isset($size[1]) && $size[1]) ? (int) $size[1] : 0; if($editor_file) $fileurl = G5_DATA_URL.'/'.$editor_file; else $fileurl = G5_DATA_URL.'/file/'.$bo_table.'/'.$filename; - $img = ''; + $img_attr = ($width && $height) ? 'width="'.$width.'" height="'.$height.'"' : ''; + + $img = ''; } else { alert_close('파일이 존재하지 않습니다.'); } ?> -
+
', 0); -add_javascript('', 0); -add_javascript('', 0); -add_javascript('', 0); -add_javascript('', 0); +add_stylesheet('', 1); +add_javascript('', 1); +add_javascript('', 1); +add_javascript('', 1); +add_javascript('', 1); +add_javascript('', 1); if (!($graph == 'line' || $graph == 'bar')) $graph = 'line'; if ($graph == 'bar') { // 바 타입으로 사용하는 코드입니다. - add_javascript('', 0); - add_javascript('', 0); - add_javascript('', 0); + add_javascript('', 1); + add_javascript('', 1); + add_javascript('', 1); } -$g5['title'] = '글,댓글 현황'; -include_once ('./admin.head.php'); - $period_array = array( '오늘'=>array('시간', 0), '어제'=>array('시간', 0), diff --git a/head.sub.php b/head.sub.php index 32a3d0ccc..66c665ce0 100644 --- a/head.sub.php +++ b/head.sub.php @@ -84,16 +84,16 @@ var g5_admin_url = ""; ', 1); -add_javascript('', 1); -add_javascript('', 1); -add_javascript('', 1); -add_javascript('', 1); -add_javascript('', 1); -add_stylesheet('', 1); +add_javascript('', 0); +add_javascript('', 0); +add_javascript('', 0); +add_javascript('', 0); +add_javascript('', 0); +add_javascript('', 0); +add_stylesheet('', 0); if(G5_IS_MOBILE) { - add_javascript('', 2); // overflow scroll 감지 + add_javascript('', 1); // overflow scroll 감지 } if(!defined('G5_IS_ADMIN')) echo $config['cf_add_script']; diff --git a/theme/basic/head.sub.php b/theme/basic/head.sub.php index fd7bd033e..c808cd204 100644 --- a/theme/basic/head.sub.php +++ b/theme/basic/head.sub.php @@ -66,16 +66,16 @@ var g5_editor = ""; ', 1); -add_javascript('', 1); -add_javascript('', 1); -add_javascript('', 1); -add_javascript('', 1); -add_javascript('', 1); -add_stylesheet('', 1); +add_javascript('', 0); +add_javascript('', 0); +add_javascript('', 0); +add_javascript('', 0); +add_javascript('', 0); +add_javascript('', 0); +add_stylesheet('', 0); if(G5_IS_MOBILE) { - add_javascript('', 2); // overflow scroll 감지 + add_javascript('', 1); // overflow scroll 감지 } if(!defined('G5_IS_ADMIN')) echo $config['cf_add_script']; From bf467d71556fc4661092117f186e95fc0d1f8487 Mon Sep 17 00:00:00 2001 From: thisgun Date: Wed, 23 Oct 2019 16:32:21 +0900 Subject: [PATCH 8/8] =?UTF-8?q?=EB=B2=84=EC=A0=84=205.4.0.3=20=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.php b/config.php index f259b78a4..d7d157cf5 100644 --- a/config.php +++ b/config.php @@ -5,7 +5,7 @@ ********************/ define('G5_VERSION', '그누보드5'); -define('G5_GNUBOARD_VER', '5.4.0.2'); +define('G5_GNUBOARD_VER', '5.4.0.3'); // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음 define('_GNUBOARD_', true);