diff --git a/adm/visit_list.php b/adm/visit_list.php index 496e98b95..e2b95d6e5 100644 --- a/adm/visit_list.php +++ b/adm/visit_list.php @@ -63,15 +63,8 @@ $result = sql_query($sql); $referer = get_text(cut_str($row['vi_referer'], 255, '')); $referer = urldecode($referer); - if (strtolower($g4['charset']) == 'utf-8') { - if (!is_utf8($referer)) { - $referer = iconv('euc-kr', 'utf-8', $referer); - } - } - else { - if (is_utf8($referer)) { - $referer = iconv('utf-8', 'euc-kr', $referer); - } + if (!is_utf8($referer)) { + $referer = iconv_utf8($referer); } $title = str_replace(array('<', '>', '&'), array("<", ">", "&"), $referer); diff --git a/bbs/rss.php b/bbs/rss.php index d2478356c..6d12d4347 100644 --- a/bbs/rss.php +++ b/bbs/rss.php @@ -30,15 +30,15 @@ if (!$row['bo_use_rss_view']) { exit; } -Header("Content-type: text/xml"); -header("Cache-Control: no-cache, must-revalidate"); -header("Pragma: no-cache"); +header('Content-type: text/xml'); +header('Cache-Control: no-cache, must-revalidate'); +header('Pragma: no-cache'); $sql = " select gr_subject from {$g4['group_table']} where gr_id = '{$row['gr_id']}' "; $row = sql_fetch($sql); $subj1 = specialchars_replace($row['gr_subject'], 255); -echo ''."\n"; +echo ''."\n"; ?> diff --git a/bbs/syndi/include/include.adm.board_delete.inc.php b/bbs/syndi/include/include.adm.board_delete.inc.php index a419f712d..75e1c05ee 100644 --- a/bbs/syndi/include/include.adm.board_delete.inc.php +++ b/bbs/syndi/include/include.adm.board_delete.inc.php @@ -4,7 +4,7 @@ * @author sol (ngleader@gmail.com) * @brief 게시판 삭제시 Syndication Ping * gnuboard4/adm/board_delete.inc.php 파일에 추가 - * include '../syndi/include/gnuboard4_euckr/include.adm.board_delete.inc.php'; + * include '../syndi/include/include.adm.board_delete.inc.php'; */ if(!defined('_GNUBOARD_')) return; diff --git a/bbs/syndi/include/include.adm.board_form_update.php b/bbs/syndi/include/include.adm.board_form_update.php index f643168be..146188666 100644 --- a/bbs/syndi/include/include.adm.board_form_update.php +++ b/bbs/syndi/include/include.adm.board_form_update.php @@ -4,7 +4,7 @@ * @author sol (ngleader@gmail.com) * @brief 게시판 삭제시 Syndication Ping * gnuboard4/adm/board_form_update.php 파일에 추가 - * include '../syndi/include/gnuboard4_euckr/include.adm.board_form_update.php'; + * include '../syndi/include/include.adm.board_form_update.php'; */ if(!defined('_GNUBOARD_')) return; diff --git a/bbs/syndi/include/include.bbs.delete.php b/bbs/syndi/include/include.bbs.delete.php index 0ddfcc1c8..19aa2c417 100644 --- a/bbs/syndi/include/include.bbs.delete.php +++ b/bbs/syndi/include/include.bbs.delete.php @@ -4,7 +4,7 @@ * @author sol (ngleader@gmail.com) * @brief 글 삭제시 Syndication Ping * gnuboard4/bbs/bbs.delete.php 파일에 추가 - * include '../syndi/include/gnuboard4_euckr/include.bbs.delete.php'; + * include '../syndi/include/include.bbs.delete.php'; */ if(!defined('_GNUBOARD_')) return; diff --git a/bbs/syndi/include/include.bbs.delete_all.php b/bbs/syndi/include/include.bbs.delete_all.php index cb9bc40e2..248e9a7d4 100644 --- a/bbs/syndi/include/include.bbs.delete_all.php +++ b/bbs/syndi/include/include.bbs.delete_all.php @@ -4,7 +4,7 @@ * @author sol (ngleader@gmail.com) * @brief 글 삭제시 Syndication Ping * gnuboard4/bbs/bbs.delete_all.php 파일에 추가 - * include '../syndi/include/gnuboard4_euckr/include.bbs.delete_all.php'; + * include '../syndi/include/include.bbs.delete_all.php'; */ if(!defined('_GNUBOARD_')) return; diff --git a/bbs/syndi/include/include.bbs.move_update.php b/bbs/syndi/include/include.bbs.move_update.php index d29a19b34..dff7522b2 100644 --- a/bbs/syndi/include/include.bbs.move_update.php +++ b/bbs/syndi/include/include.bbs.move_update.php @@ -4,7 +4,7 @@ * @author sol (ngleader@gmail.com) * @brief 글 등록/수정시 Syndication Ping * gnuboard4/bbs/move_update.php 파일에 추가 - * include '../syndi/include/gnuboard4_euckr/include.bbs.move_update.php'; + * include '../syndi/include/include.bbs.move_update.php'; */ if(!defined('_GNUBOARD_')) return; diff --git a/bbs/syndi/include/include.bbs.write_update.php b/bbs/syndi/include/include.bbs.write_update.php index 81655e807..69875f3d8 100644 --- a/bbs/syndi/include/include.bbs.write_update.php +++ b/bbs/syndi/include/include.bbs.write_update.php @@ -4,7 +4,7 @@ * @author sol (ngleader@gmail.com) * @brief 글 등록/수정시 Syndication Ping * gnuboard4/bbs/write_update.php 파일에 추가 - * include '../syndi/include/gnuboard4_euckr/include.bbs.write_update.php'; + * include '../syndi/include/include.bbs.write_update.php'; */ if(!defined('_GNUBOARD_')) return; diff --git a/lib/common.lib.php b/lib/common.lib.php index 9b7fdae8a..116e04152 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -137,19 +137,6 @@ function alert($msg='', $url='', $error=true, $post=false) if (!$msg) $msg = '올바른 방법으로 이용해 주십시오.'; - /* - //header("Content-Type: text/html; charset=$g4['charset']"); - echo ""; - echo ""; - if ($url) - // 4.06.00 : 불여우의 경우 아래의 코드를 제대로 인식하지 못함 - //echo ""; - goto_url($url); - exit; - */ $header = ''; if (isset($g4['title'])) { $header = $g4['title']; @@ -164,11 +151,6 @@ function alert_close($msg, $error=true) { global $g4; - /* - echo ""; - echo ""; - exit; - */ $header = ''; if (isset($g4['title'])) { $header = $g4['title']; @@ -1309,10 +1291,7 @@ function get_table_define($table, $crlf="\n") $schema_create .= implode($columns, ', ') . ')'; } // end while - if (strtolower($g4['charset']) == 'utf-8') - $schema_create .= $crlf . ') DEFAULT CHARSET=utf8'; - else - $schema_create .= $crlf . ')'; + $schema_create .= $crlf . ') DEFAULT CHARSET=utf8'; return $schema_create; } // end of the 'PMA_getTableDef()' function @@ -1517,13 +1496,6 @@ function cut_hangul_last($hangul) } } - // 홀수라면 한글이 반쪽난 상태이므로 - if (strtoupper($g4['charset']) != 'UTF-8') { - if ($cnt%2) { - $hangul = substr($hangul, 0, $cnt-1); - } - } - return $hangul; } diff --git a/lib/mailer.lib.php b/lib/mailer.lib.php index f816a3d7d..3e6aa9985 100644 --- a/lib/mailer.lib.php +++ b/lib/mailer.lib.php @@ -11,11 +11,8 @@ function mailer($fname, $fmail, $to, $subject, $content, $type=0, $file='', $cc= // 메일발송 사용을 하지 않는다면 if (!$config['cf_email_use']) return; - //$fname = "=?$g4[charset]?B?" . base64_encode($fname) . "?="; - //$subject = "=?$g4[charset]?B?" . base64_encode($subject) . "?="; $fname = "=?utf-8?B?" . base64_encode($fname) . "?="; $subject = "=?utf-8?B?" . base64_encode($subject) . "?="; - //$g4[charset] = ($g4[charset] != "") ? "charset=$g4[charset]" : ""; $header = "Return-Path: <$fmail>\n"; $header .= "From: $fname <$fmail>\n";