diff Reservation.class.php @ 149:5b192e94f49d

fix: 予約済み定数を使ってしまったミスを修正。エラーレベルに警告を追加
author epgrec@park.mda.or.jp <yoneda@recorder.localnet.mda.or.jp>
date Sat, 27 Mar 2010 16:04:54 +0900
parents 481e789605e3
children 3a6ec345ab0c 84220382fea8
line wrap: on
line diff
--- a/Reservation.class.php	Mon Mar 22 22:43:11 2010 +0900
+++ b/Reservation.class.php	Sat Mar 27 16:04:54 2010 +0900
@@ -303,7 +303,7 @@
 			}
 			else {
 				$rrec->delete();
-				reclog( "Reservation::custom at絎茵紊掩罔≧", E_ERROR);
+				reclog( "Reservation::custom at絎茵紊掩罔≧", EPGREC_ERROR);
 				throw new Exception("AT絎茵");
 			}
 			// job垩冴
@@ -323,7 +323,7 @@
 			}
 			// 
 			$rrec->delete();
-			reclog( "Reservation::custom job垩緇紊掩",E_ERROR );
+			reclog( "Reservation::custom job垩緇紊掩",EPGREC_ERROR );
 			throw new Exception( "job垩緇紊掩" );
 		}
 		catch( Exception $e ) {
@@ -356,7 +356,8 @@
 			if( ! $rec->complete ) {
 				// 絎茵篋膣с
 				if( toTimestamp($rec->starttime) < (time() + PADDING_TIME + $settings->former_time) ) {
-					reclog("Reservation::cancel 絎茵篋膣羔絎茵", E_ERROR );
+					reclog("Reservation::cancel 絎茵篋膣羔絎茵", EPGREC_ERROR );
+					throw new Exception("絎茵篋膣с");
 				}
 				exec( $settings->atrm . " " . $rec->job );
 				reclog("Reservation::cancel 吾с".$rec->job."");
@@ -364,7 +365,7 @@
 			$rec->delete();
 		}
 		catch( Exception $e ) {
-			reclog("Reservation::cancel 篋膣c潟祉DB・膓障≪祉鴻紊掩罔≧", E_ERROR );
+			reclog("Reservation::cancel 篋膣c潟祉DB・膓障≪祉鴻紊掩罔≧", EPGREC_ERROR );
 			throw $e;
 		}
 	}