comparison Reservation.class.php @ 170:1c4558d1a449

merged with upstream
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sun, 18 Apr 2010 22:48:48 +0900
parents 3d4df1fe4166 e379552d084c
children 3474a501f802
comparison
equal deleted inserted replaced
168:4dee3368df63 170:1c4558d1a449
236 $filename = mb_str_replace("%SEC%",date("s", $start_time), $filename ); 236 $filename = mb_str_replace("%SEC%",date("s", $start_time), $filename );
237 // %DURATION% 録画時間(秒) 237 // %DURATION% 録画時間(秒)
238 $filename = mb_str_replace("%DURATION%","".$duration, $filename ); 238 $filename = mb_str_replace("%DURATION%","".$duration, $filename );
239 239
240 // あると面倒くさそうな文字を全部_に 240 // あると面倒くさそうな文字を全部_に
241 $filename = preg_replace("/[ \.\/\*:<>\?\\|()\'\"&]/u","_", trim($filename) ); 241 // $filename = preg_replace("/[ \.\/\*:<>\?\\|()\'\"&]/u","_", trim($filename) );
242
243 // preg_replaceがUTF-8に対応できない環境があるようなのでmb_ereg_replaceに戻す
244 $filename = mb_ereg_replace("[ \./\*:<>\?\\|()\'\"&]","_", trim($filename) );
242 245
243 // 文字コード変換 246 // 文字コード変換
244 if( defined("FILESYSTEM_ENCODING") ) { 247 if( defined("FILESYSTEM_ENCODING") ) {
245 $filename = mb_convert_encoding( $filename, FILESYSTEM_ENCODING, "UTF-8" ); 248 $filename = mb_convert_encoding( $filename, FILESYSTEM_ENCODING, "UTF-8" );
246 } 249 }