# HG changeset patch
# User yoneda <epgrec@park.mda.or.jp>
# Date 1269012983 -32400
# Node ID 44811bc29179854376c019621d359c4b3718c465
# Parent  a971ef7888b44798ea8236a05b1806dce136db25
fix: 日本語混ざりのファイル名の問題

diff -r a971ef7888b4 -r 44811bc29179 Reservation.class.php
--- a/Reservation.class.php	Fri Mar 19 23:33:03 2010 +0900
+++ b/Reservation.class.php	Sat Mar 20 00:36:23 2010 +0900
@@ -200,10 +200,8 @@
 			$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 @@
 			// %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";