Merge branch 'master' of github.com:gnuboard/g4s

This commit is contained in:
whitedot
2013-06-24 14:42:55 +09:00
3 changed files with 17 additions and 15 deletions

View File

@ -199,7 +199,7 @@ if (count($file_copy)) {
delete_cache_latest($bo_table);
delete_cache_latest($target_table);
//echo "<script>opener.document.location.reload();</script>";
echo "<script>opener.document.location.reload();</script>";
alert("복사에 성공 했습니다.", './board_copy.php?bo_table='.$bo_table.'&amp;'.$qstr);
?>

View File

@ -70,7 +70,7 @@ while ($row=sql_fetch_array($result)) {
$link2 = '';
$key = '직접';
} else {
$link = '<a href="./visit_list.php?$qstr&amp;domain='.$key.'">';
$link = '<a href="./visit_list.php?'.$qstr.'&amp;domain='.$key.'">';
$link2 = '</a>';
}

View File

@ -76,24 +76,26 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
}
// 게시글보기 썸네일 생성
function get_view_thumbnail($contents)
function get_view_thumbnail($contents, $thumb_width=0)
{
global $board, $config;
$dvc_width = intval($_COOKIE['device_width']);
if(G4_IS_MOBILE && $dvc_width) {
// 썸네일 width 설정
$thumb_width = 320;
if (!$thumb_width) {
$dvc_width = intval($_COOKIE['device_width']);
if(G4_IS_MOBILE && $dvc_width) {
// 썸네일 width 설정
$thumb_width = 320;
if($dvc_width >= 1000) {
return $contents;
} else if($dvc_width >= 760 && $dvc_width < 1000) {
$thumb_width = 760;
} else if($dvc_width >= 480 && $dvc_width < 760) {
$thumb_width = 480;
if($dvc_width >= 1000) {
return $contents;
} else if($dvc_width >= 760 && $dvc_width < 1000) {
$thumb_width = 760;
} else if($dvc_width >= 480 && $dvc_width < 760) {
$thumb_width = 480;
}
} else {
$thumb_width = $board['bo_image_width'];
}
} else {
$thumb_width = $board['bo_image_width'];
}
// $contents 중 img 태그 추출