diff cancelReservation.php @ 161:84220382fea8

mod: 録画中のキャンセルを可能にした（動作確認、まだ不完全かも）

--- a/cancelReservation.php	Tue Mar 30 19:00:39 2010 +0900
+++ b/cancelReservation.php	Sun Apr 04 17:10:17 2010 +0900
@@ -8,6 +8,8 @@
 $program_id = 0;
 $reserve_id = 0;
 $settings = Settings::factory();
+$rec = null;
+$path = "";
 
 if( isset($_GET['program_id'])) {
 	$program_id = $_GET['program_id'];
@@ -17,24 +19,12 @@
 	try {
 		$rec = new DBRecord( RESERVE_TBL, "id" , $reserve_id );
 		$program_id = $rec->program_id;
-		
-		if( isset( $_GET['delete_file'] ) ) {
-			if( $_GET['delete_file'] == 1 ) {
-				// �����＜�ゃ�����������
-				if( file_exists( INSTALL_PATH."/".$settings->spool."/".$rec->path ) ) {
-					@unlink(INSTALL_PATH."/".$settings->spool."/".$rec->path);
-					@unlink(INSTALL_PATH."/".$settings->thumbs."/".$rec->path.".jpg");
-				}
-			}
-		}
 	}
 	catch( Exception $e ) {
 		// ��∴��
 	}
 }
 
-
-
 // ������������羔�������������������������������腟������������牙�糸�乗院������紊����
 if( $program_id ) {
 	try {
@@ -45,10 +35,27 @@
 		// ��∴��
 	}
 }
+if( $rec == null ) exit( "Error: 篋�膣������潟�若��������緇���堺�ャ�障�����" );
+
+if( isset( $_GET['delete_file'] ) ) {
+	if( $_GET['delete_file'] == 1 ) {
+		$path = INSTALL_PATH."/".$settings->spool."/".$rec->path;
+	}
+}
+
 
 // 篋�膣�������羔����絎�茵�
 try {
 	Reservation::cancel( $reserve_id, $program_id );
+	if( isset( $_GET['delete_file'] ) ) {
+		if( $_GET['delete_file'] == 1 ) {
+			// �����＜�ゃ�����������
+			if( file_exists( $path) ) {
+				@unlink($path);
+				@unlink($path.".jpg");
+			}
+		}
+	}
 }
 catch( Exception $e ) {
 	exit( "Error" . $e->getMessage() );