From 4213de67b2d197e161eeee670693854f83b29427 Mon Sep 17 00:00:00 2001
From: yoneda <epgrec@park.mda.or.jp>
Date: Sat, 20 Mar 2010 00:36:23 +0900
Subject: [PATCH] =?utf8?q?fix:=20=E6=97=A5=E6=9C=AC=E8=AA=9E=E6=B7=B7?=
 =?utf8?q?=E3=81=96=E3=82=8A=E3=81=AE=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?=
 =?utf8?q?=E5=90=8D=E3=81=AE=E5=95=8F=E9=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Reservation.class.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Reservation.class.php b/Reservation.class.php
index 867d3de..31f8a23 100755
--- a/Reservation.class.php
+++ b/Reservation.class.php
@@ -200,10 +200,8 @@ class Reservation {
 			$day_of_week = array( "日","月","火","水","木","金","土" );
 			$filename = $settings->filename_format;
 			
-			// あると面倒くさそうな文字を全部_に
-			$fn_title = mb_ereg_replace("[ \./\*:<>\?\\|()\'\"&]","_", trim($title) );
 			// %TITLE%
-			$filename = mb_str_replace("%TITLE%", $fn_title, $filename);
+			$filename = mb_str_replace("%TITLE%", trim($title), $filename);
 			// %ST%	開始日時
 			$filename = mb_str_replace("%ST%",date("YmdHis", $start_time), $filename );
 			// %ET%	終了日時
@@ -231,10 +229,14 @@ class Reservation {
 			// %DURATION%	録画時間（秒）
 			$filename = mb_str_replace("%DURATION%","".$duration, $filename );
 			
+			// あると面倒くさそうな文字を全部_に
+			$filename = preg_replace("/[ \./\*:<>\?\\|()\'\"&]/u","_", trim($filename) );
+			
 			// 文字コード変換
 			if( defined("FILESYSTEM_ENCODING") ) {
 				$filename = mb_convert_encoding( $filename, FILESYSTEM_ENCODING, "UTF-8" );
 			}
+			
 			$filename .= $RECORD_MODE["$mode"]['suffix'];
 			$thumbname = $filename.".jpg";
 			
-- 
2.11.0