Index: trunk/install/php/reservecomp.php
===================================================================
--- trunk/install/php/reservecomp.php (リビジョン 70)
+++ trunk/install/php/reservecomp.php (リビジョン 83)
@@ -54,5 +54,8 @@
 		$station = 0;
 		}
-
+$usedigital = getgetnumform(usedigital);
+		if ($usedigital == "") {
+		$usedigital = 0;
+		}
 $bitrate = getgetnumform(bitrate);
 		if ($bitrate == "") {
@@ -202,10 +205,9 @@
 
 		if ($maxrows == 0) { //新規追加
-				$query = "INSERT INTO  foltia_tvrecord  values ('$tid','$station','$bitrate')";
+				$query = "INSERT INTO  foltia_tvrecord  values ('$tid','$station','$bitrate','$usedigital')";
 				$rs = m_query($con, $query, "DB書き込みに失敗しました");
 		}else{//修正　(ビットレート)
 			$query = "UPDATE  foltia_tvrecord  SET 
-  bitrate = '$bitrate' WHERE tid = '$tid'  AND stationid = '$station'
-			";
+  bitrate = '$bitrate' , digital = '$usedigital'  WHERE tid = '$tid'  AND stationid = '$station' ";
 			$rs = m_query($con, $query, "DB書き込みに失敗しました");
 		}
Index: trunk/install/php/m.php
===================================================================
--- trunk/install/php/m.php (リビジョン 77)
+++ trunk/install/php/m.php (リビジョン 83)
@@ -35,4 +35,6 @@
 
 $now = date("YmdHi");   
+$today = date("Ymd");
+$nowdate = date("Hi",(mktime(date("G"),date("i")+8,date("s"),date("m"),date("d"),date("Y"))));
 $errflag = 0;
 $pname = "手動録画";
@@ -74,4 +76,6 @@
 $recstid = getgetnumform(recstid);
 $pname = getgetform(pname);
+//$usedigital = getgetnumform(usedigital);
+
 //確認
 $startdatetime = "$startdate"."$starttime";
@@ -105,4 +109,10 @@
 	}
 }
+//デジタル優先
+/*if ($usedigital == 1){
+}else{
+	$usedigital = 0;
+}
+*/
 //正しければ
 if ($errflag == 0){
@@ -193,8 +203,8 @@
   <p>放送日:
     <input name="startdate" type="text" id="startdate" size="9" value="<?=$startdate?>" />
-  年月日 Ex.19800121</p>
+  年月日 Ex.<?=$today?></p>
   <p>録画開始時刻:
     <input name="starttime" type="text" id="starttime" size="5" value="<?=$starttime?>" />
-  時分 Ex.2304  </p>
+  時分 Ex.<?=$nowdate?>  </p>
   <p>
     録画尺:
@@ -205,7 +215,11 @@
 <?php
 $query = "
-SELECT stationid,stationname,stationrecch 
+SELECT stationid,stationname,stationrecch ,digitalch 
 FROM foltia_station 
 WHERE stationrecch > 0 
+UNION 
+SELECT DISTINCT  stationid,stationname,stationrecch ,digitalch 
+FROM  foltia_station 
+WHERE digitalch > 0
 ORDER BY \"stationid\" ASC";
 
@@ -248,5 +262,17 @@
 	}
 }
-
+/*
+print "<p>デジタル録画を優先:";
+
+if ($usedigital == 1){
+print "<input name="useditial" type="radio" value="1" selected />  する　
+<input name="useditial" type="radio" value="0" />  しない　
+";
+}else{
+print "<input name="useditial" type="radio" value="1" />  する　
+<input name="useditial" type="radio" value="0" selected />  しない　
+";
+}
+*/
 ?>
   <p>番組名:
Index: trunk/install/php/foltia_config2.php.template
===================================================================
--- trunk/install/php/foltia_config2.php.template (リビジョン 70)
+++ trunk/install/php/foltia_config2.php.template (リビジョン 83)
@@ -17,5 +17,5 @@
 		$recfolderpath = '/home/foltia/php/tv';	//録画ファイルの保存先のパス。
 		$httpmediamappath = '/tv'; //ブラウザから見える録画ファイルのある位置。
-		$recunits = '4';					//搭載エンコーダの数
+		$recunits = '4';					//搭載アナログキャプチャカードチャンネル数
 
 		$protectmode = 0; //未使用:(ブラウザからの予約削除を禁止するなどの保護モードで動作します)
@@ -24,4 +24,5 @@
 		$environmentpolicytoken = "";//環境ポリシーのパスワードに連結されるセキュリティコード
 		$perltoolpath = $toolpath ;//perl版の初期設定の位置。デフォルトではphpと同じ位置
+		$usedigital = 1;//Friioなどでデジタル録画をするか 1:する 0:しない
 
 // データベース接続設定
Index: trunk/install/php/showplaylist.php
===================================================================
--- trunk/install/php/showplaylist.php (リビジョン 70)
+++ trunk/install/php/showplaylist.php (リビジョン 83)
@@ -14,5 +14,5 @@
 　省略時、録画順にソートされる。
 　titleのときに、番組順ソートされる。
-　rawのときに、DBに記録されている番組録画情報ではなくディレクトリにあるm2pファイルを全て表示する。
+　rawのときに、DBに記録されている番組録画情報ではなくディレクトリにあるm2p/m2tファイルを全て表示する。
 
  DCC-JPL Japan/foltia project
@@ -97,5 +97,5 @@
 //旧仕様
 if($list == "raw"){
-exec ("ls -t  $recfolderpath/*.m2p", $m2pfiles);
+exec ("ls -t  $recfolderpath/*.m2?", $m2pfiles);
 
 
@@ -106,5 +106,5 @@
 
         if(($fName == ".") or ($fName == "..") ){ continue; }
-	if (ereg(".m2p", $fName)){
+	if (ereg(".m2.+", $fName)){
 		$filesplit = split("-",$fName);
 	
@@ -230,5 +230,5 @@
 }
 	if (file_exists("./selectcaptureimage.php") ) {
-	$capimgpath = preg_replace("/.m2p/", "", $fName);
+	$capimgpath = preg_replace("/.m2.+/", "", $fName);
 	print "			<td align=\"left\"><a href=\"./selectcaptureimage.php?pid=$pid\">キャプ</a></td>\n";
 	}
Index: trunk/install/php/reserveprogram.php
===================================================================
--- trunk/install/php/reserveprogram.php (リビジョン 70)
+++ trunk/install/php/reserveprogram.php (リビジョン 83)
@@ -89,5 +89,6 @@
   <tr>
     <td>放送局</td>
-    <td>ビットレート</td>
+    <td>デジタル録画優先</td>
+    <td>アナログビットレート</td>
   </tr>
   <tr>
@@ -128,4 +129,23 @@
 
 	</td>
+	
+	<td>
+	<select name="usedigital">
+	<?php
+	 if ($usedigital == 1){
+	 	print "
+		<option value=\"1\" selected>する</option>
+		<option value=\"0\">しない</option>
+		";
+		}else{
+	 	print "
+		<option value=\"1\">する</option>
+		<option value=\"0\" selected>しない</option>
+		";
+		}
+	?>
+	</select>
+	</td>
+
     <td><select name="bitrate">
         <option value="14">最高画質</option>
Index: trunk/install/php/selectcaptureimage.php
===================================================================
--- trunk/install/php/selectcaptureimage.php (リビジョン 70)
+++ trunk/install/php/selectcaptureimage.php (リビジョン 83)
@@ -116,5 +116,5 @@
 	$tid = ereg_replace("[^0-9]", "", $tid);
 
-$path = ereg_replace("\.m2p$", "", $m2pfilename);
+$path = ereg_replace("\.m2p$|\.m2t$", "", $m2pfilename);
 $serveruri = getserverfqdn ();
 
@@ -124,7 +124,7 @@
 
 if (file_exists("./sb-edit.php") ) {
-print "<a href=\"./sb-edit.php?pid=$pid&f=$filetid\"><img src='http://$serveruri$httpmediamappath/$tid.localized/img/$path/$filetid' width='160' height='120' alt='$tid:$countno:$filetid'></a>\n";
+print "<a href=\"./sb-edit.php?pid=$pid&f=$filetid\"><img src='http://$serveruri$httpmediamappath/$tid.localized/img/$path/$filetid' alt='$tid:$countno:$filetid'></a>\n";
 }else{
-print "<img src='http://$serveruri$httpmediamappath/$tid.localized/img/$path/$filetid' width='160' height='120' alt='$tid:$countno:$filetid'>\n";
+print "<img src='http://$serveruri$httpmediamappath/$tid.localized/img/$path/$filetid'  alt='$tid:$countno:$filetid'>\n";
 }
 }//foreach
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
Index: trunk/install/php/index.php
===================================================================
--- trunk/install/php/index.php (リビジョン 70)
+++ trunk/install/php/index.php (リビジョン 83)
@@ -13,4 +13,5 @@
 オプション
 mode:"new"を指定すると、新番組(第1話)のみの表示となる。
+now:YmdHi形式で日付を指定するとその日からの番組表が表示される。
 
  DCC-JPL Japan/foltia project
@@ -32,6 +33,8 @@
 }//end if login
 
-$now = date("YmdHi");   
-
+$now = getgetnumform(date);
+if(($now < 200001010000 ) || ($now > 209912342353 )){ 
+	$now = date("YmdHi");   
+}
 function printtitle(){
 
@@ -64,6 +67,7 @@
 WHERE foltia_tvrecord.tid = foltia_program.tid 
 AND foltia_program.tid = foltia_subtitle.tid 
-AND foltia_subtitle.enddatetime >= '$now'
- ORDER BY \"startdatetime\" ASC
+AND foltia_subtitle.enddatetime >= '$now' 
+ORDER BY \"startdatetime\" ASC 
+LIMIT 1000
 	";
 	$reservedrssametid = m_query($con, $query, "DBクエリに失敗しました");
@@ -112,5 +116,6 @@
 LEFT OUTER JOIN foltia_station on (foltia_subtitle.stationid = foltia_station.stationid )
 WHERE foltia_tvrecord.stationid = 0 AND
-foltia_subtitle.enddatetime >= '$now' ORDER BY \"startdatetime\" ASC
+foltia_subtitle.enddatetime >= '$now' ORDER BY \"startdatetime\" ASC 
+LIMIT 1000
 	";
 
@@ -145,5 +150,6 @@
 WHERE foltia_program.tid = foltia_subtitle.tid AND foltia_station.stationid = foltia_subtitle.stationid 
  AND foltia_subtitle.enddatetime >= '$now'  AND foltia_subtitle.countno = '1' 
-ORDER BY foltia_subtitle.startdatetime  ASC
+ORDER BY foltia_subtitle.startdatetime  ASC 
+LIMIT 1000
 	";
 	$rs = m_query($con, $query, "DBクエリに失敗しました");
@@ -166,5 +172,6 @@
 WHERE foltia_program.tid = foltia_subtitle.tid AND foltia_station.stationid = foltia_subtitle.stationid 
  AND foltia_subtitle.enddatetime >= '$now'  
-ORDER BY foltia_subtitle.startdatetime  ASC
+ORDER BY foltia_subtitle.startdatetime  ASC 
+LIMIT 1000
 	";
 	$rs = m_query($con, $query, "DBクエリに失敗しました");
Index: trunk/install/php/showlib.php
===================================================================
--- trunk/install/php/showlib.php (リビジョン 70)
+++ trunk/install/php/showlib.php (リビジョン 83)
@@ -36,24 +36,43 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=EUC-JP">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="stylesheet" type="text/css" href="graytable.css"> 
-<link rel="alternate" type="application/rss+xml" title="RSS" href="./folcast.php" />
+<?php
+if (file_exists  ( "./iui/iui.css"  )){
+	$useragent = $_SERVER['HTTP_USER_AGENT'];
+}
+if(ereg("iPhone",$useragent)){
+print "<meta name=\"viewport\" content=\"width=320; initial-scale=1.0; maximum-scale=1.0; user-scalable=no;\"/>
+<link rel=\"apple-touch-icon\" type=\"image/png\" href=\"./img/icon.png\" />
+
+<style type=\"text/css\" media=\"screen\">@import \"./iui/iui.css\";</style>
+<script type=\"application/x-javascript\" src=\"./iui/iui.js\"></script>";
+}else{
+print "<meta http-equiv=\"Content-Style-Type\" content=\"text/css\">
+<link rel=\"stylesheet\" type=\"text/css\" href=\"graytable.css\"> 
+<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"./folcast.php\" />";
+}
+?>
 <title>foltia:MP4 Lib</title>
 </head>
 
 <?php
-$now = date("YmdHi");   
+$now = date("YmdHi");  
+if(ereg("iPhone",$useragent)){
+	print "<body onclick=\"console.log('Hello', event.target);\">
+    <div class=\"toolbar\">
+        <h1 id=\"pageTitle\"></h1>
+        <a id=\"backButton\" class=\"button\" href=\"#\"></a>
+    </div>
+";
+}else{
+	print "<body BGCOLOR=\"#ffffff\" TEXT=\"#494949\" LINK=\"#0047ff\" VLINK=\"#000000\" ALINK=\"#c6edff\" >
+<div align=\"center\">
+";
+	printhtmlpageheader();
+print "  <p align=\"left\"><font color=\"#494949\" size=\"6\">録画ライブラリ表示</font></p>
+  <hr size=\"4\">
+<p align=\"left\">再生可能ライブラリを表示します。<br>
+";
+} 
 
-?>
-<body BGCOLOR="#ffffff" TEXT="#494949" LINK="#0047ff" VLINK="#000000" ALINK="#c6edff" >
-<div align="center">
-<?php 
-	printhtmlpageheader();
-?>
-  <p align="left"><font color="#494949" size="6">録画ライブラリ表示</font></p>
-  <hr size="4">
-<p align="left">再生可能ライブラリを表示します。<br>
-
-<?
 //新仕様 /* 2006/10/26 */
 $query = "
@@ -70,4 +89,7 @@
 
 if ($maxrows > 0 ){
+if(ereg("iPhone",$useragent)){
+	print "<ul id=\"home\" title=\"録画ライブラリ表示\" selected=\"true\">";
+}else{
 print "
   <table BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"2\" WIDTH=\"100%\">
@@ -82,4 +104,5 @@
 	<tbody>
 ";
+}
 for ($row = 0; $row < $maxrows; $row++) {
 	$rowdata = pg_fetch_row($rs, $row);
@@ -90,4 +113,7 @@
 $counts = htmlspecialchars($counts);
 
+if(ereg("iPhone",$useragent)){
+print "<li><a href=\"showlibc.php?tid=$tid\" target=\"_self\">$title</a></li>\n";
+}else{
 print "
 <tr>
@@ -98,5 +124,10 @@
 </tr>\n
 ";
+}
 }//for
+
+if(ereg("iPhone",$useragent)){
+	print "</ul>\n</body>\n</html>\n";
+}else{
 print "
 	</tbody>
@@ -105,4 +136,6 @@
 </html>
 ";
+}
+
 }else{
 print "録画ファイルが存在しません。</body></html>";
Index: trunk/install/php/showlibc.php
===================================================================
--- trunk/install/php/showlibc.php (リビジョン 74)
+++ trunk/install/php/showlibc.php (リビジョン 83)
@@ -41,16 +41,26 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=EUC-JP">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="stylesheet" type="text/css" href="graytable.css">
-<script src="http://images.apple.com/main/js/ac_quicktime.js" language="JavaScript" type="text/javascript"></script> 
 <?php
-print "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"./folcast.php?tid=$tid\" />
-";
-		if ($tid == "") {
+if (file_exists  ( "./iui/iui.css"  )){
+	$useragent = $_SERVER['HTTP_USER_AGENT'];
+}
+if(ereg("iPhone",$useragent)){
+print "<meta name=\"viewport\" content=\"width=320; initial-scale=1.0; maximum-scale=1.0; user-scalable=no;\"/>
+<link rel=\"apple-touch-icon\" type=\"image/png\" href=\"./img/icon.png\" />
+<style type=\"text/css\" media=\"screen\">@import \"./iui/iui.css\";</style>
+<script type=\"application/x-javascript\" src=\"./iui/iui.js\"></script>";
+}else{
+print "<meta http-equiv=\"Content-Style-Type\" content=\"text/css\">
+<link rel=\"stylesheet\" type=\"text/css\" href=\"graytable.css\">
+<script src=\"http://images.apple.com/main/js/ac_quicktime.js\" language=\"JavaScript\" type=\"text/javascript\"></script> 
+<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"./folcast.php?tid=$tid\" />
+";
+}
+if ($tid == "") {
 	print "<title>foltia:Lib</title>
 </head><body BGCOLOR=\"#ffffff\" TEXT=\"#494949\" LINK=\"#0047ff\" VLINK=\"#000000\" ALINK=\"#c6edff\" > \n";
 		printhtmlpageheader();
 		die_exit("再生可能番組がありません<BR>");
-		}
+	}
 $now = date("YmdHi");   
 
@@ -75,7 +85,17 @@
 }
 //ヘッダ続き
-print "<title>foltia:Lib $tid:$title</title>
-</head>
-<body BGCOLOR=\"#ffffff\" TEXT=\"#494949\" LINK=\"#0047ff\" VLINK=\"#000000\" ALINK=\"#c6edff\" >
+print "<title>foltia:Lib $tid:$title</title></head>";
+$serveruri = getserveruri();
+
+if(ereg("iPhone",$useragent)){
+	print "<body onclick=\"console.log('Hello', event.target);\">
+    <div class=\"toolbar\">
+        <h1 id=\"pageTitle\"></h1>
+        <a id=\"backButton\" class=\"button\" href=\"#\"></a>
+    </div>
+";
+}else{
+
+print "<body BGCOLOR=\"#ffffff\" TEXT=\"#494949\" LINK=\"#0047ff\" VLINK=\"#000000\" ALINK=\"#c6edff\" >
 <div align=\"center\">
 ";
@@ -84,6 +104,4 @@
   <hr size=\"4\">
 <p align=\"left\">再生可能ムービーを表示します。<br>";
-
-$serveruri = getserveruri();
 if ($tid == 0){
 print "$title 【<A HREF = \"./folcast.php?tid=$tid\">この番組のFolcast</A> [<a href=\"itpc://$serveruri/folcast.php?tid=$tid\">iTunesに登録</a>】 <br>\n";
@@ -93,4 +111,6 @@
 				     htmlspecialchars($tid)  . "\" target=\"_blank\">$title</a> 【<A HREF = \"./folcast.php?tid=$tid\">この番組のFolcast</A> [<a href=\"itpc://$serveruri/folcast.php?tid=$tid\">iTunesに登録</a>]】 <br>\n";
 }
+}// endif if(ereg("iPhone",$useragent))
+
 //確認
 if (file_exists ("$recfolderpath/$tid.localized")){
@@ -101,6 +121,4 @@
 	exit;
 }					 
-
-
 
 //新仕様/* 2006/10/26 */
@@ -133,9 +151,12 @@
 $maxrows = pg_num_rows($rs);
 if ($maxrows > 0 ){
+if(ereg("iPhone",$useragent)){
+	print "<ul id=\"home\" title=\"$title\" selected=\"true\">";
+}else{
 print "
   <table BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"2\" WIDTH=\"100%\">
 	<tbody>
 ";
-
+}
 for ($row = 0; $row < $maxrows; $row++) {
 	$rowdata = pg_fetch_row($rs, $row);
@@ -178,5 +199,6 @@
 
 if (($sbpluginexist == 1) && (pg_num_rows ($rs ) > 0)){
- $capimgpath = htmlspecialchars(preg_replace("/.m2p/", "", $rowdata[5]));
+ //$capimgpath = htmlspecialchars(preg_replace("/.m2p/", "", $rowdata[5]));
+ $capimgpath = htmlspecialchars(preg_replace("/.m2./", "", $rowdata[5]));
  	
 	if (($capimgpath != "") && (file_exists("$recfolderpath/$tid.localized/img/$capimgpath") )){
@@ -195,5 +217,9 @@
 }
 
-
+if(ereg("iPhone",$useragent)){
+
+print "<li><a href=\"http://$serverfqdn/$httpmediamappath/$tid.localized/mp4/$fName\" target=\"_self\">$count $subtitle $onairdate</a></li>\n";
+
+}else{
 print "  <tr>
     <td rowspan=\"4\" width=\"170\"><a href = \"$httpmediamappath/$tid.localized/mp4/$fName\" target=\"_blank\"><img src = \"$imgsrcuri\" width=\"160\" height=\"120\"></a></td>
@@ -202,9 +228,9 @@
   <tr>
 ";
-if ($tid == 0){
-print "\n    <td>$subtitle</td>";
-}else{
-print "\n    <td><a href = \"http://cal.syoboi.jp/tid/$tid/time#$pid\" target=\"_blank\">$subtitle</a></td>";
-}//if
+	if ($tid == 0){
+	print "\n    <td>$subtitle</td>";
+	}else{
+	print "\n    <td><a href = \"http://cal.syoboi.jp/tid/$tid/time#$pid\" target=\"_blank\">$subtitle</a></td>";
+	}//if
 print "  </tr>
   <tr>
@@ -216,12 +242,20 @@
 ";
 
+}//endif iPhone
+
 }//for
 }else{
 print "録画ファイルがありません<br>\n";
 }//if
+
+if(ereg("iPhone",$useragent)){
+	print "<li><a href=\"http://$serveruri/showlib.php\" target=\"_self\">一覧へ戻る</a></li>\n";
+	print "</ul>\n";
+}else{
+	print "</tbody></table>\n";
+}
 ?>
-	</tbody>
-</table>
-
 </body>
 </html>
+
+	
Index: trunk/install/php/reserveepgcomp.php
===================================================================
--- trunk/install/php/reserveepgcomp.php (リビジョン 70)
+++ trunk/install/php/reserveepgcomp.php (リビジョン 83)
@@ -78,6 +78,11 @@
 	}else{
 	$rowdata = pg_fetch_row($rs, 0);
+	
 	$insertpid = $rowdata[0];
-	$insertpid-- ;
+		if ($insertpid > 0){
+		$insertpid = -1;
+		}else{
+		$insertpid-- ;
+		}
 	}
 // next 話数を探す
@@ -121,5 +126,4 @@
 values ( '$insertpid','0','$stationid',
 	'$nextcno','$subtitle','$startdatetime','$enddatetime','0' ,'$lengthmin' , '$memberid')";
-
 	$rs = m_query($con, $query, "DBクエリに失敗しました");
 
@@ -143,8 +147,5 @@
 }
 
-?>
 
-
-<?php
 print "<table width=\"100%\" border=\"0\">
     <tr><td>放送開始</td><td>$startdatetime</td></tr>