Index: trunk/install/php/reserveprogram.php
===================================================================
--- trunk/install/php/reserveprogram.php (リビジョン 128)
+++ trunk/install/php/reserveprogram.php (リビジョン 1)
@@ -15,19 +15,4 @@
 
 */
-
-include("./foltialib.php");
-$con = m_connect();
-
-if ($useenvironmentpolicy == 1){
-	if (!isset($_SERVER['PHP_AUTH_USER'])) {
-	    header("WWW-Authenticate: Basic realm=\"foltia\"");
-	    header("HTTP/1.0 401 Unauthorized");
-		redirectlogin();
-	    exit;
-	} else {
-	login($con,$_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']);
-	}
-}//end if login
-
 ?>
 
@@ -43,4 +28,5 @@
 <?php
 
+  include("./foltialib.php");
 
 $tid = getgetnumform(tid);
@@ -50,15 +36,16 @@
 
 
+$con = m_connect();
 $now = date("YmdHi");   
 
 //タイトル取得
-	$query = "select title from foltia_program where tid = ? ";
-//	$rs = m_query($con, $query, "DBクエリに失敗しました");
-$rs = sql_query($con, $query, "DBクエリに失敗しました",array($tid));
-$rowdata = $rs->fetch();
-if (! $rowdata) {
+	$query = "select title from foltia_program where tid='$tid'";
+	$rs = m_query($con, $query, "DBクエリに失敗しました");
+	$maxrows = pg_num_rows($rs);
+			
+		if ($maxrows == 0) {
 		die_exit("登録番組がありません<BR>");
 		}
-
+		$rowdata = pg_fetch_row($rs, 0);
 		$title = htmlspecialchars($rowdata[0]);
 ?>
@@ -80,5 +67,5 @@
 ?>
 
-「<?php print "$title"; ?>」を番組予約モードで録画予約します。 <br>
+「<?=$title?>」を番組予約モードで録画予約します。 <br>
 
   
@@ -89,6 +76,5 @@
   <tr>
     <td>放送局</td>
-    <td>デジタル録画優先</td>
-    <td>アナログビットレート</td>
+    <td>ビットレート</td>
   </tr>
   <tr>
@@ -100,19 +86,22 @@
 FROM foltia_subtitle , foltia_program ,foltia_station  
 WHERE foltia_program.tid = foltia_subtitle.tid AND foltia_station.stationid = foltia_subtitle.stationid 
- AND foltia_program.tid = ? 
+ AND foltia_program.tid ='$tid' 
 ORDER BY stationrecch DESC
 ";
-//	$rs = m_query($con, $query, "DBクエリに失敗しました");
-$rs = sql_query($con, $query, "DBクエリに失敗しました",array($tid));
-$rowdata = $rs->fetch();
-if (! $rowdata) {
+
+	$rs = m_query($con, $query, "DBクエリに失敗しました");
+	$maxrows = pg_num_rows($rs);
+			
+		if ($maxrows == 0) {
 		echo("放映局情報がまだはいってません<BR>");
 		}
 		else{
-	$maxcols = $rs->columnCount();
+		$maxcols = pg_num_fields($rs);
 		
 			echo("<select name=\"station\">\n");
 			/* テーブルのデータを出力 */
-	do {
+			for ($row = 0; $row < $maxrows; $row++) { /* 行に対応 */
+				/* pg_fetch_row で一行取り出す */
+				$rowdata = pg_fetch_row($rs, $row);
 				echo("<option value=\"");
 				echo(htmlspecialchars($rowdata[0]));
@@ -120,5 +109,5 @@
 				echo(htmlspecialchars($rowdata[1]));
 				echo("</option>\n");
-	} while ($rowdata = $rs->fetch());
+			}//for
 			echo("<option value=\"0\">全局</option>\n</select>\n");
 		}//endif		
@@ -126,23 +115,4 @@
 
 	</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>
@@ -162,5 +132,5 @@
   </tr>
 </table>
-<input type="hidden" name="tid" value="<?php print "$tid"; ?>">
+<input type="hidden" name="tid" value="<?=$tid?>">
 </form>
 <p>&nbsp; </p>
@@ -179,15 +149,15 @@
 FROM foltia_subtitle , foltia_program ,foltia_station  
 WHERE foltia_program.tid = foltia_subtitle.tid AND foltia_station.stationid = foltia_subtitle.stationid 
- AND foltia_subtitle.startdatetime >= ?  AND foltia_program.tid = ? 
+ AND foltia_subtitle.startdatetime >=  '$now'  AND foltia_program.tid ='$tid' 
 ORDER BY foltia_subtitle.startdatetime  ASC
 ";
-//	$rs = m_query($con, $query, "DBクエリに失敗しました");
-$rs = sql_query($con, $query, "DBクエリに失敗しました",array($now,$tid));
-$rowdata = $rs->fetch();
-if (! $rowdata) {
+	$rs = m_query($con, $query, "DBクエリに失敗しました");
+	$maxrows = pg_num_rows($rs);
+			
+		if ($maxrows == 0) {
 		echo("放映予定はありません<BR>");
 		}
 		else{
-	$maxcols = $rs->columnCount();
+		$maxcols = pg_num_fields($rs);		
 ?>
   <table BORDER="0" CELLPADDING="0" CELLSPACING="2" WIDTH="100%" BGCOLOR="#bcf1be">
@@ -207,15 +177,14 @@
 		<?php
 			/* テーブルのデータを出力 */
-       do {
+			for ($row = 0; $row < $maxrows; $row++) { /* 行に対応 */
 				echo("<tr>\n");
+				/* pg_fetch_row で一行取り出す */
+				$rowdata = pg_fetch_row($rs, $row);
+
 				for ($col = 0; $col < $maxcols; $col++) { /* 列に対応 */
-					if ($col == 3){
-					echo("<td>".htmlspecialchars(foldate2print($rowdata[$col]))."<br></td>\n");
-					}else{
 					echo("<td>".htmlspecialchars($rowdata[$col])."<br></td>\n");
-					}
 				}
 				echo("</tr>\n");
-       } while ($rowdata = $rs->fetch());
+			}
 		}//end if
 		?>