Index: trunk/install/php/listreserve.php
===================================================================
--- trunk/install/php/listreserve.php (リビジョン 70)
+++ trunk/install/php/listreserve.php (リビジョン 83)
@@ -46,4 +46,7 @@
 $mymemberid = getmymemberid($con);
 $now = getgetnumform(startdate);
+*if ($now == ""){
+$now = getgetnumform(date);
+}
 
 if ($now > 200501010000){
@@ -63,5 +66,6 @@
 foltia_subtitle.startoffset , 
 foltia_subtitle.pid , 
-foltia_subtitle.epgaddedby 
+foltia_subtitle.epgaddedby , 
+foltia_tvrecord.digital 
 FROM foltia_subtitle , foltia_program ,foltia_station ,foltia_tvrecord
 WHERE foltia_tvrecord.tid = foltia_program.tid AND foltia_tvrecord.stationid = foltia_station .stationid AND foltia_program.tid = foltia_subtitle.tid AND foltia_station.stationid = foltia_subtitle.stationid
@@ -79,5 +83,6 @@
 foltia_subtitle.startoffset , 
 foltia_subtitle.pid , 
-foltia_subtitle.epgaddedby 
+foltia_subtitle.epgaddedby , 
+foltia_tvrecord.digital 
 FROM foltia_tvrecord
 LEFT OUTER JOIN foltia_subtitle on (foltia_tvrecord.tid = foltia_subtitle.tid )
@@ -127,7 +132,8 @@
 			<th align="left">話数</th>
 			<th align="left">サブタイトル</th>
-			<th align="left">開始時刻</th>
+			<th align="left">開始時刻(ズレ)</th>
 			<th align="left">総尺</th>
 			<th align="left">画質</th>
+			<th align="left">デジタル優先</th>
 
 		</tr>
@@ -165,5 +171,6 @@
 foltia_tvrecord.bitrate  , 
 foltia_subtitle.startoffset , 
-foltia_subtitle.pid  
+foltia_subtitle.pid  , 
+foltia_tvrecord.digital 
 FROM foltia_subtitle , foltia_program ,foltia_station ,foltia_tvrecord
 WHERE foltia_tvrecord.tid = foltia_program.tid AND foltia_tvrecord.stationid = foltia_station .stationid AND foltia_program.tid = foltia_subtitle.tid AND foltia_station.stationid = foltia_subtitle.stationid
@@ -181,5 +188,6 @@
 foltia_tvrecord.bitrate  , 
 foltia_subtitle.startoffset , 
-foltia_subtitle.pid  
+foltia_subtitle.pid , 
+foltia_tvrecord.digital 
 FROM foltia_tvrecord
 LEFT OUTER JOIN foltia_subtitle on (foltia_tvrecord.tid = foltia_subtitle.tid )
@@ -218,5 +226,6 @@
 foltia_tvrecord.bitrate  , 
 foltia_subtitle.startoffset , 
-foltia_subtitle.pid  
+foltia_subtitle.pid  , 
+foltia_tvrecord.digital 
 FROM foltia_subtitle , foltia_program ,foltia_station ,foltia_tvrecord
 WHERE foltia_tvrecord.tid = foltia_program.tid AND foltia_tvrecord.stationid = foltia_station .stationid AND foltia_program.tid = foltia_subtitle.tid AND foltia_station.stationid = foltia_subtitle.stationid
@@ -235,5 +244,6 @@
 foltia_tvrecord.bitrate  , 
 foltia_subtitle.startoffset , 
-foltia_subtitle.pid  
+foltia_subtitle.pid , 
+foltia_tvrecord.digital 
 FROM foltia_tvrecord
 LEFT OUTER JOIN foltia_subtitle on (foltia_tvrecord.tid = foltia_subtitle.tid )
@@ -277,4 +287,5 @@
 					}else{
 					print "<a href=\"http://cal.syoboi.jp/tid/$tid\" target=\"_blank\">$title</a>";
+
 					}
 					print "</td>\n";
@@ -305,4 +316,13 @@
 					//録画レート
 					echo("<td>".htmlspecialchars($rowdata[7])."<br></td>\n");
+					
+					//デジタル優先
+					echo("<td>");
+					if (htmlspecialchars($rowdata[11]) == 1){
+					print "する";
+					}else{
+					print "しない";
+					}
+					echo("<br></td>\n");
 				echo("</tr>\n");
 			}
@@ -313,4 +333,5 @@
 
 <table>
+	<tr><td>アナログ重複表示</td><td><br /></td></tr>
 	<tr><td>エンコーダ数</td><td><?=$recunits ?></td></tr>
 	<tr class="overwraped"><td>チューナー重複</td><td><br /></td></tr>
@@ -329,7 +350,8 @@
 foltia_program .title ,
 foltia_tvrecord.bitrate ,
-foltia_tvrecord.stationid  
+foltia_tvrecord.stationid , 
+foltia_tvrecord.digital   
 FROM  foltia_tvrecord , foltia_program , foltia_station 
-WHERE foltia_tvrecord.tid = foltia_program.tid  AND foltia_tvrecord.stationid = foltia_station .stationid   
+WHERE foltia_tvrecord.tid = foltia_program.tid  AND foltia_tvrecord.stationid = foltia_station .stationid 
 ORDER BY foltia_program.tid  DESC
 ";
@@ -354,4 +376,6 @@
 			<th align="left">録画リスト</th>
 			<th align="left">画質</th>
+			<th align="left">デジタル優先</th>
+
 		</tr>
 	</thead>
@@ -385,7 +409,13 @@
 					//MP4
 					echo("<td><a href=\"showlibc.php?tid=$tid\">mp4</a></td>\n");
-
+					//画質(アナログビットレート)
 					echo("<td>".htmlspecialchars($rowdata[3])."<br></td>\n");
-	
+					//デジタル優先
+					echo("<td>");
+					if (htmlspecialchars($rowdata[5]) == 1){
+					print "する";
+					}else{
+					print "しない";
+					}
 				echo("</tr>\n");
 				}else{
@@ -395,5 +425,13 @@
 				<td>EPG録画</td>
 				<td><a href=\"showlibc.php?tid=0\">mp4</a></td>";
-				echo("<td>".htmlspecialchars($rowdata[3])."<br></td>\n</tr>");
+				echo("<td>".htmlspecialchars($rowdata[3])."<br></td>");
+					//デジタル優先
+					echo("<td>");
+					if (htmlspecialchars($rowdata[5]) == 1){
+					print "する";
+					}else{
+					print "しない";
+					}
+				echo("\n</tr>");
 				}//if tid 0
 			}//for