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
2014-02-28 09:41:53 +09:00
parent 15765afcb9 df9a0086d5
commit 3b5de1b6af
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/thumbnail.lib.php
View File

@ -29,14 +29,11 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
{ {
// 이미지 path 구함 // 이미지 path 구함
$p = parse_url($matches[1][$i]); $p = parse_url($matches[1][$i]);
if(strpos($p['path'], "/data/") != 0) if(strpos($p['path'], '/'.G5_DATA_DIR.'/') != 0)
$data_path = preg_replace("/^\/.*\/data/", "/data", $p['path']); $data_path = preg_replace('/^\/.*\/'.G5_DATA_DIR.'/', '/'.G5_DATA_DIR, $p['path']);
else else
$data_path = $p['path']; $data_path = $p['path'];
if(!preg_match('/^\/'.G5_DATA_DIR.'/', $data_path))
continue;
$srcfile = G5_PATH.$data_path; $srcfile = G5_PATH.$data_path;
if(preg_match("/\.({$config['cf_image_extension']})$/i", $srcfile) && is_file($srcfile)) { if(preg_match("/\.({$config['cf_image_extension']})$/i", $srcfile) && is_file($srcfile)) {
@ -105,14 +102,11 @@ function get_view_thumbnail($contents, $thumb_width=0)
// 이미지 path 구함 // 이미지 path 구함
$p = parse_url($src); $p = parse_url($src);
if(strpos($p['path'], "/data/") != 0) if(strpos($p['path'], '/'.G5_DATA_DIR.'/') != 0)
$data_path = preg_replace("/^\/.*\/data/", "/data", $p['path']); $data_path = preg_replace('/^\/.*\/'.G5_DATA_DIR.'/', '/'.G5_DATA_DIR, $p['path']);
else else
$data_path = $p['path']; $data_path = $p['path'];
if(!preg_match('/^\/'.G5_DATA_DIR.'/', $data_path))
continue;
$srcfile = G5_PATH.$data_path; $srcfile = G5_PATH.$data_path;
if(is_file($srcfile)) { if(is_file($srcfile)) {