fix: 日本語混ざりのファイル名の問題

diff --git a/Reservation.class.php b/Reservation.class.php
index 867d3de..31f8a23 100755 (executable)
--- 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";