changeset 56:be9e4520cfec

change: GEN_THUMBNAIL
author yoneda <yoneda@recorder.localnet.mda.or.jp>
date Tue, 28 Jul 2009 23:35:31 +0900
parents 7a4050545d98
children 73350e16077a
files Reservation.class.php install/step1.php
diffstat 2 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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]);
 				// 標準エラーを取る
--- 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 "<p><b>ディレクトリのパーミッションチェック(777)</b></p>";