diff Keyword.class.php @ 87:36ac7c416bd7

merged with upstream

--- a/Keyword.class.php	Sun Feb 14 17:01:02 2010 +0900
+++ b/Keyword.class.php	Mon Mar 01 20:51:36 2010 +0900
@@ -43,6 +43,10 @@
 			$options .= " AND channel_id = '".$this->channel_id."'";
 		}
 		
+		if( $this->weekofday != 7 ) {
+			$options .= " AND WEEKDAY(starttime) = '".$this->weekofday."'";
+		}
+		
 		$options .= " ORDER BY starttime ASC";
 		
 		$recs = array();
@@ -72,7 +76,7 @@
 			foreach( $precs as $rec ) {
 				try {
 					if( $rec->autorec ) {
-						Reservation::simple( $rec->id, $this->id, $this->settings->autorec_mode );
+						Reservation::simple( $rec->id, $this->id, $this->autorec_mode );
 						usleep( 100 );		// あんまり時間を空けないのもどう?
 					}
 				}