mod: 積み残しを修正

diff --git a/cancelReservation.php b/cancelReservation.php
index f0570a8..68dcfb3 100755 (executable)
--- a/cancelReservation.php
+++ b/cancelReservation.php
@@ -23,6 +23,7 @@ else if(isset($_GET['reserve_id'])) {
                                // ファイルを削除
                                if( file_exists( INSTALL_PATH."/".$settings->spool."/".$rec->path ) ) {
                                        @unlink(INSTALL_PATH."/".$settings->spool."/".$rec->path);
+                                       @unlink(INSTALL_PATH."/".$settings->thumbs."/".$rec->path.".jpg");
                                }
                        }
                }

diff --git a/config.php.sample b/config.php.sample
index 052522d..01ff3ec 100755 (executable)
--- a/config.php.sample
+++ b/config.php.sample
@@ -93,6 +93,15 @@ if( file_exists( INSTALL_PATH."/settings/gr_channel.php" ) ) {
        include_once( INSTALL_PATH."/settings/gr_channel.php" );
 }
 
+//
+// settings/site_conf.phpがあればそれを優先する
+//
+if( file_exists( INSTALL_PATH."/settings/site_conf.php" ) ) {
+       unset($GR_CHANNEL_MAP);
+       unset($RECORD_MODE);
+       include_once( INSTALL_PATH."/settings/site_conf.php" );
+}
+
 
 // 全国用BSデジタルチャンネルマップ
 $BS_CHANNEL_MAP = array(