# HG changeset patch # User yoneda # Date 1248791731 -32400 # Node ID be9e4520cfec8f36b7668807b19ec21e9a3ff25b # Parent 7a4050545d9819c7552bab9fa424de7b6d598a2b change: GEN_THUMBNAIL diff -r 7a4050545d98 -r be9e4520cfec Reservation.class.php --- a/Reservation.class.php Tue Jul 28 23:21:19 2009 +0900 +++ b/Reservation.class.php Tue Jul 28 23:35:31 2009 +0900 @@ -237,6 +237,11 @@ $filename .= $RECORD_MODE[$mode]['suffix']; $thumbname = $filename.".jpg"; + // サムネール + $gen_thumbnail = INSTALL_PATH."/gen-thumbnail.sh"; + if( defined("GEN_THUMBNAIL") ) + $gen_thumbnail = GEN_THUMBNAIL; + // ファイル名生成終了 // 予約レコードを埋める @@ -280,7 +285,7 @@ fwrite($pipes[0], DO_RECORD . "\n" ); fwrite($pipes[0], COMPLETE_CMD." ".$rrec->id."\n" ); if( $settings->use_thumbs == 1 ) { - fwrite($pipes[0], GEN_THUMBNAIL."\n" ); + fwrite($pipes[0], $gen_thumbnail."\n" ); } fclose($pipes[0]); // 標準エラーを取る diff -r 7a4050545d98 -r be9e4520cfec install/step1.php --- a/install/step1.php Tue Jul 28 23:21:19 2009 +0900 +++ b/install/step1.php Tue Jul 28 23:35:31 2009 +0900 @@ -38,12 +38,16 @@ INSTALL_PATH."/cache", ); +$gen_thumbnail = INSTALL_PATH."/gen-thumbnail.sh"; +if( defined("GEN_THUMBNAIL") ) + $gen_thumbnail = GEN_THUMBNAIL; + $exec_files = array( DO_RECORD, COMPLETE_CMD, INSTALL_PATH."/getepg.php", - GEN_THUMBNAIL, + $gen_thumbnail, ); echo "

ディレクトリのパーミッションチェック(777)

";