diff --git a/adm/write_count.php b/adm/write_count.php
index 6729e6fd8..c37271627 100644
--- a/adm/write_count.php
+++ b/adm/write_count.php
@@ -6,27 +6,27 @@ check_demo();
auth_check($auth[$sub_menu], 'r');
+$g5['title'] = '글,댓글 현황';
+include_once ('./admin.head.php');
+
// http://www.jqplot.com/
-add_stylesheet('', 0);
-add_javascript('', 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/bbs/good.php b/bbs/good.php
index 8a8ae1a74..bd35b085e 100644
--- a/bbs/good.php
+++ b/bbs/good.php
@@ -92,7 +92,7 @@ if(isset($_POST['js']) && $_POST['js'] === "on") {
if (!$is_member)
{
- $href = './login.php?'.$qstr.'&url='.urlencode(get_pretty_url($bo_table, $wr_id));
+ $href = G5_BBS_URL.'/login.php?'.$qstr.'&url='.urlencode(get_pretty_url($bo_table, $wr_id));
alert('회원만 가능합니다.', $href);
}
diff --git a/bbs/view_image.php b/bbs/view_image.php
index c7a7edca7..efa8d5a10 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;
+ $fileurl = run_replace('get_editor_content_url', G5_DATA_URL.'/'.$editor_file);
else
- $fileurl = G5_DATA_URL.'/file/'.$bo_table.'/'.$filename;
+ $fileurl = run_replace('get_file_board_url', G5_DATA_URL.'/file/'.$bo_table.'/'.$filename, $bo_table);
- $img = '
';
+ $img_attr = ($width && $height) ? 'width="'.$width.'" height="'.$height.'"' : '';
+
+ $img = '
';
} else {
alert_close('파일이 존재하지 않습니다.');
}
?>
-
+
', 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/lib/thumbnail.lib.php b/lib/thumbnail.lib.php
index ce53dda2b..35260e2d2 100644
--- a/lib/thumbnail.lib.php
+++ b/lib/thumbnail.lib.php
@@ -53,7 +53,7 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
if(!$filename)
return false;
-
+
if( $thumbnail_info = run_replace('get_list_thumbnail_info', array(), array('bo_table'=>$bo_table, 'wr_id'=>$wr_id, 'data_path'=>$data_path, 'edt'=>$edt, 'filename'=>$filename, 'filepath'=>$filepath, 'thumb_width'=>$thumb_width, 'thumb_height'=>$thumb_height, 'is_create'=>$is_create, 'is_crop'=>$is_crop, 'crop_mode'=>$crop_mode, 'is_sharpen'=>$is_sharpen, 'um_value'=>$um_value)) ){
return $thumbnail_info;
}
@@ -202,7 +202,7 @@ function get_view_thumbnail($contents, $thumb_width=0)
}
}
- return $contents;
+ return run_replace('get_view_thumbnail', $contents);
}
function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_height, $is_create, $is_crop=false, $crop_mode='center', $is_sharpen=false, $um_value='80/0.5/3')
diff --git a/mobile/skin/board/basic/list.skin.php b/mobile/skin/board/basic/list.skin.php
index 7a6096ed3..d541890c5 100644
--- a/mobile/skin/board/basic/list.skin.php
+++ b/mobile/skin/board/basic/list.skin.php
@@ -108,7 +108,7 @@ add_stylesheet('', 0
작성자
- 회
+ 회
추천
비추천
diff --git a/mobile/skin/latest/basic/style.css b/mobile/skin/latest/basic/style.css
index bfd2320f4..a4455c61b 100644
--- a/mobile/skin/latest/basic/style.css
+++ b/mobile/skin/latest/basic/style.css
@@ -15,7 +15,7 @@
.lt .lt_date {color:#828282}
.lt .latest-sel{margin-top:1px}
-.lt .lt_more {position:absolute;top:15px;right:15px;color:#3a8afd;background:#fff;border:1px solid #d1d7e5;font-size:0.925em;border-radius:3px;padding:4px 5px}
+.lt .lt_more {position:absolute;top:15px;right:15px;color:#3a8afd;background:#fff;border:1px solid #d1d7e5;font-size:0.925em;border-radius:3px;padding:4px 5px;z-index:1}
.lt .lt_cmt {background:#e9eff5;color:#3a8afd;font-size:11px;height:16px;line-height:16px;padding:0 5px;border-radius:3px;vertical-align:middle}
.lt .profile_img img {border-radius:50%;vertical-align:top}
diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css
index f36a5a26e..67bbbdc73 100644
--- a/skin/board/gallery/style.css
+++ b/skin/board/gallery/style.css
@@ -103,7 +103,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
#bo_gall #gall_ul {margin:10px -10px 0;padding:0;list-style:none;zoom:1}
#bo_gall #gall_ul:after {display:block;visibility:hidden;clear:both;content:""}
#bo_gall .gall_li {}
-#bo_gall .gall_li .gall_chk {position:absolute;top:0;left:0;padding:5px}
+#bo_gall .gall_li .gall_chk {position:absolute;top:0;left:0;padding:5px;z-index:1}
#bo_gall .gall_box {position:relative;margin:0 0 50px 0;border-radius:0 0 2px 2px}
#bo_gall .gall_con {position:relative}
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}
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'];
diff --git a/theme/basic/mobile/skin/board/basic/list.skin.php b/theme/basic/mobile/skin/board/basic/list.skin.php
index 7a6096ed3..d541890c5 100644
--- a/theme/basic/mobile/skin/board/basic/list.skin.php
+++ b/theme/basic/mobile/skin/board/basic/list.skin.php
@@ -108,7 +108,7 @@ add_stylesheet('', 0
작성자
- 회
+ 회
추천
비추천
diff --git a/theme/basic/mobile/skin/latest/basic/style.css b/theme/basic/mobile/skin/latest/basic/style.css
index bfd2320f4..a4455c61b 100644
--- a/theme/basic/mobile/skin/latest/basic/style.css
+++ b/theme/basic/mobile/skin/latest/basic/style.css
@@ -15,7 +15,7 @@
.lt .lt_date {color:#828282}
.lt .latest-sel{margin-top:1px}
-.lt .lt_more {position:absolute;top:15px;right:15px;color:#3a8afd;background:#fff;border:1px solid #d1d7e5;font-size:0.925em;border-radius:3px;padding:4px 5px}
+.lt .lt_more {position:absolute;top:15px;right:15px;color:#3a8afd;background:#fff;border:1px solid #d1d7e5;font-size:0.925em;border-radius:3px;padding:4px 5px;z-index:1}
.lt .lt_cmt {background:#e9eff5;color:#3a8afd;font-size:11px;height:16px;line-height:16px;padding:0 5px;border-radius:3px;vertical-align:middle}
.lt .profile_img img {border-radius:50%;vertical-align:top}
diff --git a/theme/basic/skin/board/gallery/style.css b/theme/basic/skin/board/gallery/style.css
index f36a5a26e..67bbbdc73 100644
--- a/theme/basic/skin/board/gallery/style.css
+++ b/theme/basic/skin/board/gallery/style.css
@@ -103,7 +103,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
#bo_gall #gall_ul {margin:10px -10px 0;padding:0;list-style:none;zoom:1}
#bo_gall #gall_ul:after {display:block;visibility:hidden;clear:both;content:""}
#bo_gall .gall_li {}
-#bo_gall .gall_li .gall_chk {position:absolute;top:0;left:0;padding:5px}
+#bo_gall .gall_li .gall_chk {position:absolute;top:0;left:0;padding:5px;z-index:1}
#bo_gall .gall_box {position:relative;margin:0 0 50px 0;border-radius:0 0 2px 2px}
#bo_gall .gall_con {position:relative}