From f6fd7d0f6e1f8a3563acf7899fcce9854169d089 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 7 Oct 2013 14:09:14 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20get=5Flist=5Ffile()=20=ED=95=A8=EC=88=98?= =?UTF-8?q?=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index ee1bb82ac..cbaf196db 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -287,18 +287,6 @@ function get_file($bo_table, $wr_id) } -// 게시글 리스트에 쓰일 1개의 파일 정보를 얻는다. -function get_list_file($bo_table, $wr_id) -{ - global $g5; - - $sql = " select * from {$g5['board_file_table']} where bo_table = '$bo_table' and wr_id = '$wr_id' order by bf_no "; - $row = sql_fetch($sql); - - return $row; -} - - // 폴더의 용량 ($dir는 / 없이 넘기세요) function get_dirsize($dir) { From 617008f802e3d020601f350c5143a3bb520eb746 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 8 Oct 2013 16:54:42 +0900 Subject: [PATCH 2/3] =?UTF-8?q?html=20=EC=98=B5=EC=85=98=EC=9D=84=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20=EC=95=8A=EC=9D=80=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EB=B3=B5=EC=82=AC=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=EC=8B=9C=20=EB=A1=9C=EA=B7=B8=EC=97=90=20=ED=83=9C?= =?UTF-8?q?=EA=B7=B8=20=ED=8F=AC=ED=95=A8=EB=90=98=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/move_update.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/bbs/move_update.php b/bbs/move_update.php index a6baf8c9e..06293918d 100644 --- a/bbs/move_update.php +++ b/bbs/move_update.php @@ -42,8 +42,17 @@ while ($row = sql_fetch_array($result)) while ($row2 = sql_fetch_array($result2)) { $nick = cut_str($member['mb_nick'], $config['cf_cut_name']); - if (!$row2['wr_is_comment'] && $config['cf_use_copy_log']) - $row2['wr_content'] .= "\n".'
[이 게시물은 '.$nick.'님에 의해 '.G5_TIME_YMDHIS.' '.$board['bo_subject'].'에서 '.($sw == 'copy' ? '복사' : '이동').' 됨]
'; + if (!$row2['wr_is_comment'] && $config['cf_use_copy_log']) { + if(strstr($row2['wr_option'], 'html')) { + $log_tag1 = '
'; + $log_tag2 = '
'; + } else { + $log_tag1 = "\n"; + $log_tag2 = ''; + } + + $row2['wr_content'] .= "\n".$log_tag1.'[이 게시물은 '.$nick.'님에 의해 '.G5_TIME_YMDHIS.' '.$board['bo_subject'].'에서 '.($sw == 'copy' ? '복사' : '이동').' 됨]'.$log_tag2; + } $sql = " insert into $move_write_table set wr_num = '$next_wr_num', From 224dc0679ab807e6a28f70060dbdcd36f134ecfc Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 10 Oct 2013 13:45:52 +0900 Subject: [PATCH 3/3] =?UTF-8?q?canonical=20=EB=B0=8F=20meta=20=EC=B6=9C?= =?UTF-8?q?=EB=A0=A5=20=EC=9C=84=EC=B9=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- head.sub.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/head.sub.php b/head.sub.php index 7609d275b..2b6b47d24 100644 --- a/head.sub.php +++ b/head.sub.php @@ -37,6 +37,9 @@ if (G5_IS_MOBILE) { echo ''.PHP_EOL; echo ''.PHP_EOL; echo ''.PHP_EOL; +} else { + echo ''.PHP_EOL; + echo ''.PHP_EOL; } ?> <?php echo $g5_head_title; ?> @@ -44,16 +47,13 @@ if (G5_IS_MOBILE) { if (defined('G5_IS_ADMIN')) { echo ''.PHP_EOL; } else { + echo ''.PHP_EOL; // canonical 지정 $canonical = ''; - if ($bo_table && $wr_id) $canonical = 'http://'.$_SERVER["HTTP_HOST"].'/bbs/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id; - else $canonical = 'http://'.$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"]; - echo ''; - - echo ''.PHP_EOL; + if ($bo_table && $wr_id) $canonical = 'http://'.$_SERVER['HTTP_HOST'].'/bbs/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id; + else $canonical = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; + echo ''.PHP_EOL; } -echo ''; -echo ''; ?>