From faddc9238483b220a37cb7798495cfcf60a8e02c Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 15 Feb 2013 14:01:51 +0900
Subject: [PATCH 1/3] =?UTF-8?q?#269=20=EC=97=90=EB=94=94=ED=84=B0=20?=
 =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/mail_form.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adm/mail_form.php b/adm/mail_form.php
index 6badcb79f..439e80f02 100644
--- a/adm/mail_form.php
+++ b/adm/mail_form.php
@@ -1,7 +1,7 @@
 <?
 $sub_menu = "200300";
-define('G4_EDITOR', 1);
 include_once('./_common.php');
+include_once(G4_CKEDITOR_PATH.'/ckeditor.lib.php');
 
 auth_check($auth[$sub_menu], 'r');
 
@@ -40,7 +40,7 @@ include_once('./admin.head.php');
         <th scope="row"><label for="ma_content">메일 내용<strong class="sound_only">필수</strong></label></th>
         <td>
             <?=help('{이름} , {별명} , {회원아이디} , {이메일} 처럼 내용에 삽입하면 해당 내용에 맞게 변환하여 메일 발송합니다.')?>
-            <?=editor_html("ma_content", $ma['ma_content'], '400');?>
+            <?=editor_html("ma_content", $ma['ma_content']);?>
         </td>
     </tr>
     </tbody>

From 5215d285cff1de8c0bc09c1377db923bb635df95 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 15 Feb 2013 14:09:36 +0900
Subject: [PATCH 2/3] =?UTF-8?q?select=20field=20=EB=A5=BC=20*=20=EB=A1=9C?=
 =?UTF-8?q?=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/latest.lib.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/latest.lib.php b/lib/latest.lib.php
index 51b71edb3..b8e536e16 100644
--- a/lib/latest.lib.php
+++ b/lib/latest.lib.php
@@ -14,21 +14,17 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40)
     if (!G4_USE_CACHE || !file_exists($cache_file)) {
         $list = array();
 
-        $sql = " select * from {$g4['board_table']} where bo_table = '$bo_table'";
+        $sql = " select * from {$g4['board_table']} where bo_table = '{$bo_table}' ";
         $board = sql_fetch($sql);
 
         $tmp_write_table = $g4['write_prefix'] . $bo_table; // 게시판 테이블 전체이름
-        $sql = " select wr_id, ca_name, wr_subject, wr_comment, wr_hit, wr_datetime, wr_name, mb_id, wr_singo, wr_good, wr_nogood from $tmp_write_table where wr_is_comment = 0 ";
-        if ($ca_name) {
-            $sql .= " and ca_name in ('', '공지', '$ca_name') ";
-        }
-        $sql .= " order by wr_num limit 0, $rows ";
+        $sql = " select * from {$tmp_write_table} where wr_is_comment = 0 order by wr_num limit 0, {$rows} ";
         $result = sql_query($sql);
         for ($i=0; $row = sql_fetch_array($result); $i++) {
             $list[$i] = get_list($row, $board, $latest_skin_path, $subject_len);
         }
 
-        $handle = fopen($cache_file, "w");
+        $handle = fopen($cache_file, 'w');
         $cache_content = "<?php\nif (!defined('_GNUBOARD_')) exit;\n\$bo_subject=\"".get_text($board['bo_subject'])."\";\n\$list=".var_export($list, true)."?>";
         fwrite($handle, $cache_content);
         fclose($handle);
@@ -37,7 +33,7 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40)
     include_once($cache_file);
 
     ob_start();
-    include "$latest_skin_path/latest.skin.php";
+    include $latest_skin_path.'/latest.skin.php';
     $content = ob_get_contents();
     ob_end_clean();
 

From 55ea3e4b7ae391c0759b6a09faf3f12c6dd47293 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 15 Feb 2013 15:41:07 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=EB=9F=AC?=
 =?UTF-8?q?=EB=A6=AC=20=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/mail_select_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adm/mail_select_update.php b/adm/mail_select_update.php
index 7ca236102..373c0731a 100644
--- a/adm/mail_select_update.php
+++ b/adm/mail_select_update.php
@@ -11,7 +11,7 @@ check_demo();
 check_token();
 
 include_once('./admin.head.php');
-include_once($g4['path'].'/lib/mailer.lib.php');
+include_once(G4_LIB_PATH.'/mailer.lib.php');
 
 $countgap = 10; // 몇건씩 보낼지 설정
 $maxscreen = 500; // 몇건씩 화면에 보여줄건지?