'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.
'; } -if ($co['co_include_tail']) +if (is_include_path_check($co['co_include_tail'])) @include_once($co['co_include_tail']); else include_once('./_tail.php'); diff --git a/bbs/qahead.php b/bbs/qahead.php index ec332be6d..d4aaa4d6e 100644 --- a/bbs/qahead.php +++ b/bbs/qahead.php @@ -9,7 +9,7 @@ if (G5_IS_MOBILE) { include_once('./_head.php'); echo conv_content($qaconfig['qa_mobile_content_head'], 1); } else { - if($qaconfig['qa_include_head']) + if(is_include_path_check($qaconfig['qa_include_head'])) @include ($qaconfig['qa_include_head']); else include ('./_head.php'); diff --git a/bbs/qatail.php b/bbs/qatail.php index 4ab23b30d..8cc00e1a3 100644 --- a/bbs/qatail.php +++ b/bbs/qatail.php @@ -7,7 +7,7 @@ if (G5_IS_MOBILE) { include_once('./_tail.php'); } else { echo conv_content($qaconfig['qa_content_tail'], 1); - if($qaconfig['qa_include_tail']) + if(is_include_path_check($qaconfig['qa_include_tail'])) @include ($qaconfig['qa_include_tail']); else include ('./_tail.php'); diff --git a/config.php b/config.php index 2518df4b3..1015b03ed 100644 --- a/config.php +++ b/config.php @@ -5,8 +5,8 @@ ********************/ define('G5_VERSION', '그누보드5'); -define('G5_GNUBOARD_VER', '5.2.6'); -define('G5_YOUNGCART_VER', '5.2.6'); +define('G5_GNUBOARD_VER', '5.2.7'); +define('G5_YOUNGCART_VER', '5.2.7'); // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음 define('_GNUBOARD_', true); diff --git a/head.sub.php b/head.sub.php index d218f8d04..159f03ffa 100644 --- a/head.sub.php +++ b/head.sub.php @@ -45,7 +45,7 @@ if (G5_IS_MOBILE) { echo ''.PHP_EOL; } else { echo ''.PHP_EOL; - echo ''.PHP_EOL; + echo ''.PHP_EOL; } if($config['cf_add_meta']) diff --git a/lib/common.lib.php b/lib/common.lib.php index 274ce5117..8ac84112d 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -3274,4 +3274,13 @@ function check_write_token($bo_table) return true; } + +// include 하는 경로에 data file 경로가 포함되어 있는지 체크합니다. +function is_include_path_check($path='') +{ + if( !$path || preg_match('/\/data\/(file|editor)\/[A-Za-z0-9_]{1,20}\//', $path) ){ + return false; + } + return true; +} ?> \ No newline at end of file diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index c3dac55a2..15ff52513 100644 --- a/lib/thumbnail.lib.php +++ b/lib/thumbnail.lib.php @@ -4,7 +4,7 @@ if (!defined('_GNUBOARD_')) exit; @ini_set('memory_limit', '-1'); // 게시글리스트 썸네일 생성 -function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_create=false, $is_crop=true, $crop_mode='center', $is_sharpen=false, $um_value='80/0.5/3') +function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_create=false, $is_crop=false, $crop_mode='center', $is_sharpen=false, $um_value='80/0.5/3') { global $g5, $config; $filename = $alt = ""; @@ -238,10 +238,10 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h $degree = 0; if ($size[2] == 1) { - $src = imagecreatefromgif($source_file); - $src_transparency = imagecolortransparent($src); + $src = @imagecreatefromgif($source_file); + $src_transparency = @imagecolortransparent($src); } else if ($size[2] == 2) { - $src = imagecreatefromjpeg($source_file); + $src = @imagecreatefromjpeg($source_file); if(function_exists('exif_read_data')) { // exif 정보를 기준으로 회전각도 구함 @@ -273,8 +273,8 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h } } } else if ($size[2] == 3) { - $src = imagecreatefrompng($source_file); - imagealphablending($src, true); + $src = @imagecreatefrompng($source_file); + @imagealphablending($src, true); } else { return; } @@ -330,20 +330,52 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h } break; } - } - $dst = imagecreatetruecolor($dst_w, $dst_h); + $dst = imagecreatetruecolor($dst_w, $dst_h); - if($size[2] == 3) { - imagealphablending($dst, false); - imagesavealpha($dst, true); - } else if($size[2] == 1) { - $palletsize = imagecolorstotal($src); - if($src_transparency >= 0 && $src_transparency < $palletsize) { - $transparent_color = imagecolorsforindex($src, $src_transparency); - $current_transparent = imagecolorallocate($dst, $transparent_color['red'], $transparent_color['green'], $transparent_color['blue']); - imagefill($dst, 0, 0, $current_transparent); - imagecolortransparent($dst, $current_transparent); + if($size[2] == 3) { + imagealphablending($dst, false); + imagesavealpha($dst, true); + } else if($size[2] == 1) { + $palletsize = imagecolorstotal($src); + if($src_transparency >= 0 && $src_transparency < $palletsize) { + $transparent_color = imagecolorsforindex($src, $src_transparency); + $current_transparent = imagecolorallocate($dst, $transparent_color['red'], $transparent_color['green'], $transparent_color['blue']); + imagefill($dst, 0, 0, $current_transparent); + imagecolortransparent($dst, $current_transparent); + } + } + } else { // 비율에 맞게 생성 + $dst = imagecreatetruecolor($dst_w, $dst_h); + $bgcolor = imagecolorallocate($dst, 255, 255, 255); // 배경색 + + if($src_w > $src_h) { + $tmp_h = round(($dst_w * $src_h) / $src_w); + $dst_y = round(($dst_h - $tmp_h) / 2); + $dst_h = $tmp_h; + } else { + $tmp_w = round(($dst_h * $src_w) / $src_h); + $dst_x = round(($dst_w - $tmp_w) / 2); + $dst_w = $tmp_w; + } + + if($size[2] == 3) { + $bgcolor = imagecolorallocatealpha($dst, 0, 0, 0, 127); + imagefill($dst, 0, 0, $bgcolor); + imagealphablending($dst, false); + imagesavealpha($dst, true); + } else if($size[2] == 1) { + $palletsize = imagecolorstotal($src); + if($src_transparency >= 0 && $src_transparency < $palletsize) { + $transparent_color = imagecolorsforindex($src, $src_transparency); + $current_transparent = imagecolorallocate($dst, $transparent_color['red'], $transparent_color['green'], $transparent_color['blue']); + imagefill($dst, 0, 0, $current_transparent); + imagecolortransparent($dst, $current_transparent); + } else { + imagefill($dst, 0, 0, $bgcolor); + } + } else { + imagefill($dst, 0, 0, $bgcolor); } } } else { diff --git a/plugin/editor/cheditor5/popup/js/image.html5.js b/plugin/editor/cheditor5/popup/js/image.html5.js index b4ed00b0e..fc97d6cd0 100644 --- a/plugin/editor/cheditor5/popup/js/image.html5.js +++ b/plugin/editor/cheditor5/popup/js/image.html5.js @@ -1064,7 +1064,11 @@ DoUpload.prototype = { if (evt.target.readyState === FileReader.DONE) { blob = new self.MyBlob(self.NewBlob(evt.target.result, filetype)); - orientation = self.getOrientation(evt.target.result.slice(0, 64 * 1024)); + try { + orientation = self.getOrientation(evt.target.result.slice(0, 64 * 1024)); + } catch(err) { + + } image = new Image(); image.onload = function () { diff --git a/plugin/htmlpurifier/safeiframe.txt b/plugin/htmlpurifier/safeiframe.txt index 6484f4ccf..b87696a76 100644 --- a/plugin/htmlpurifier/safeiframe.txt +++ b/plugin/htmlpurifier/safeiframe.txt @@ -4,3 +4,9 @@ www.youtube(?:-nocookie)?.com/ serviceapi.rmcnmv.naver.com/ videofarm.daum.net/ player.vimeo.com/ +maps.google.com/ +play.afreeca.com/ +v.nate.com/ +www.microsoft.com/showcase/video.aspx/ +w.soundcloud.com/ +www.facebook.com/ \ No newline at end of file