Index: trunk/install/perl/foltialib.pl
===================================================================
--- trunk/install/perl/foltialib.pl (リビジョン 50)
+++ trunk/install/perl/foltialib.pl (リビジョン 70)
@@ -227,4 +227,34 @@
 
 
+sub getphpstyleconfig{
+my $key = $_[0];
+my $phpconfigpath = "";
+my $configline = "";
+ # read
+if (-e "$phptoolpath/php/foltia_config2.php"){
+	$phpconfigpath = "$phptoolpath/php/foltia_config2.php";
+}elsif(-e "$toolpath/php/foltia_config2.php"){
+	$phpconfigpath = "$toolpath/php/foltia_config2.php";
+}else{
+	$phpconfigpath = `locate foltia_config2.php | head -1`;
+	chomp($phpconfigpath);
+}
+
+
+if (-r $phpconfigpath ){
+open (CONFIG ,"$phpconfigpath") || die "File canot read.$!";
+while(<CONFIG>){
+	if (/$key/){
+	$configline = $_;
+	$configline =~ s/\/\/.*$//;
+	$configline =~ s/\/\*.*\*\///;
+	}else{
+	}
+}
+close(CONFIG);
+}#end if -r $phpconfigpath 
+return ($configline);
+}#end sub getphpstyleconfig
+
 
 1;
Index: trunk/install/perl/envpolicyupdate.pl
===================================================================
--- trunk/install/perl/envpolicyupdate.pl (リビジョン 70)
+++ trunk/install/perl/envpolicyupdate.pl (リビジョン 70)
@@ -0,0 +1,73 @@
+#!/usr/bin/perl
+#
+# Anime recording system foltia
+# http://www.dcc-jpl.com/soft/foltia/
+#
+#
+# envpolicyupdate.pl
+#
+# 環境ポリシー利用時に.htpasswdを再編する。
+#
+#
+# DCC-JPL Japan/foltia project
+#
+#
+
+use DBI;
+use DBD::Pg;
+
+$path = $0;
+$path =~ s/envpolicyupdate.pl$//i;
+if ($pwd  ne "./"){
+push( @INC, "$path");
+}
+
+require "foltialib.pl";
+
+# 環境ポリシーを使っているかPHPコンフィグファイル解析
+$returnparam = getphpstyleconfig("useenvironmentpolicy");
+eval "$returnparam\n";
+
+if ($useenvironmentpolicy == 1){
+$returnparam = getphpstyleconfig("environmentpolicytoken");
+eval "$returnparam\n";
+
+	my $data_source = sprintf("dbi:%s:dbname=%s;host=%s;port=%d",
+		$DBDriv,$DBName,$DBHost,$DBPort);
+	 $dbh = DBI->connect($data_source,$DBUser,$DBPass) ||die $DBI::error;;
+
+$DBQuery =  "SELECT userclass,name,passwd1 FROM foltia_envpolicy ";
+
+ $envph = $dbh->prepare($DBQuery);
+	$envph->execute();
+
+#なければつくる
+unless (-e "$toolpath/.htpasswd"){
+	$oserr = `touch $toolpath/.htpasswd`;
+}else{
+	$oserr = `mv $toolpath/.htpasswd $toolpath/htpasswd_foltia_old`;
+	$oserr = `touch $toolpath/.htpasswd`;
+}
+
+while (@ref = $envph->fetchrow_array ){
+
+if ($ref[0] == 0){
+#ユーザクラス
+#0:特権管理者
+#1:管理者:予約削除、ファイル削除が出来る
+#2:利用者:EPG追加、予約追加が出来る
+#3:ビュアー:ファイルダウンロードが出来る
+#4:ゲスト:インターフェイスが見れる
+
+	$htpasswd = "$ref[2]";
+}else{
+	$htpasswd = "$ref[2]"."$environmentpolicytoken";
+}
+
+$oserr = `htpasswd -b $toolpath/.htpasswd $ref[1] $htpasswd`;
+
+
+}#end while
+&writelog("envpolicyupdate htpasswd updated.");
+
+}#endif 
Index: trunk/install/perl/foltia_conf1.pl.template
===================================================================
--- trunk/install/perl/foltia_conf1.pl.template (リビジョン 8)
+++ trunk/install/perl/foltia_conf1.pl.template (リビジョン 70)
@@ -25,4 +25,5 @@
 #2:iPod H.264 中画質 24fps 300kbps
 #3:iPod H.264 高画質 30fps 300kbps
+$phptoolpath = $toolpath ;#php版の初期設定の位置。デフォルトではperlと同じ位置
 
 #以下はデフォルトでインストールしてればいじらなくてもいい
Index: trunk/install/perl/ipodtranscode.pl
===================================================================
--- trunk/install/perl/ipodtranscode.pl (リビジョン 62)
+++ trunk/install/perl/ipodtranscode.pl (リビジョン 70)
@@ -103,12 +103,13 @@
 $encodeoption = "-y -i $inputmpeg2  -target ipod -profile 51 -level 30 $cropopt  -acodec aac -ab 96 -vcodec h264  -maxrate 700 -minrate 0 -deinterlace -b 300 -ar 32000 -mbd 2 -coder 1 -cmp 2 -subcmp 2 -s 320x240 -r 30000/1001  -flags loop -trellis 2 -partitions parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 $movietitle ${mp4outdir}MAQ${mp4filenamestring}.MP4";
 $mp4file = "${mp4outdir}MAQ${mp4filenamestring}.MP4";
-}elsif($trconqty == 4){ #sample:src 106.6sec encode 334.8sec x3.14 kbps @Celeron2.6GHz 904kbps
 
-$encodeoption = "-y -i $inputmpeg2  -target ipod -profile 51 -level 30 $cropopt -s 480x320 -b 350 -r 24 -acodec aac -ar 32000 -ac 2 $movietitle ${mp4outdir}MAQ${mp4filenamestring}.MP4";
+}elsif($trconqty == 4){ #sample:src 106.6sec encode 239sec x2.24 1036kbps @Celeron2.6GHz
+
+$encodeoption = "-y -i $inputmpeg2  -target ipod -profile 51 -level 30 $cropopt -s 480x360 -b 400 -r 24 -acodec aac -ar 32000 -ac 2 $movietitle ${mp4outdir}MAQ${mp4filenamestring}.MP4";
 $mp4file = "${mp4outdir}MAQ${mp4filenamestring}.MP4";
 
-}elsif($trconqty == 5){ #sample:src 106.6sec encode 684.5sec x6.42 kbps @Celeron2.6GHz 667kbps
+}elsif($trconqty == 5){ #sample:src 106.6sec encode 1012sec x9.49 727kbps @Celeron2.6GHz
 
-$encodeoption = "-y -i $inputmpeg2  -target ipod -profile 51 -level 30 $cropopt  -acodec aac -ab 96 -vcodec h264  -maxrate 700 -minrate 0 -deinterlace -b 350 -ar 32000 -mbd 2 -coder 1 -cmp 2 -subcmp 2 -s 480x320 -r 30000/1001  -flags loop -trellis 2 -partitions parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 $movietitle ${mp4outdir}MAQ${mp4filenamestring}.MP4";
+$encodeoption = "-y -i $inputmpeg2  -target ipod -profile 51 -level 30 $cropopt  -acodec aac -ab 96 -vcodec h264  -maxrate 700 -minrate 0 -deinterlace -b 400 -ar 32000 -mbd 2 -coder 1 -cmp 2 -subcmp 2 -s 480x360 -r 30000/1001  -flags loop -trellis 2 -partitions parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 $movietitle ${mp4outdir}MAQ${mp4filenamestring}.MP4";
 $mp4file = "${mp4outdir}MAQ${mp4filenamestring}.MP4";
 }
Index: trunk/install/perl/recwrap.pl
===================================================================
--- trunk/install/perl/recwrap.pl (リビジョン 60)
+++ trunk/install/perl/recwrap.pl (リビジョン 70)
@@ -278,7 +278,13 @@
 	# 既にトラコンプロセスが走っているなら適当に待機
 	if ($trcnprocesses  >= $cpucores){
-			&writelog("recwrap TRCN WAITING :$trcnprocesses / $cpucores :$outputfilename ");
-		sleep 53;
-		sleep $recch;
+			if (-e "/proc/uptime" ){
+			$loadaverage = `uptime`;
+			chomp($loadaverage);
+			}else{
+			$loadaverage = "";
+			}
+			&writelog("recwrap TRCN WAITING :$trcnprocesses / $cpucores :$outputfilename $loadaverage");
+		sleep 113;
+		sleep ($recch)*5;
 	}
 } until ($trcnprocesses  < $cpucores);
Index: trunk/install/php/reservecomp.php
===================================================================
--- trunk/install/php/reservecomp.php (リビジョン 1)
+++ trunk/install/php/reservecomp.php (リビジョン 70)
@@ -17,4 +17,19 @@
 
 */
+
+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
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
@@ -29,5 +44,4 @@
 <?php
 
-  include("./foltialib.php");
 
 $tid = getgetnumform(tid);
@@ -47,5 +61,4 @@
 
 
-$con = m_connect();
 $now = date("YmdHi");   
 
Index: trunk/install/php/folcast.php
===================================================================
--- trunk/install/php/folcast.php (リビジョン 64)
+++ trunk/install/php/folcast.php (リビジョン 70)
@@ -22,7 +22,18 @@
 header('Content-Disposition: attachment; filename="folcast.xml"');
 
-  include("./foltialib.php");
+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
+*/
 $now = date("YmdHi");   
 $nowrfc822 =  date("r");
Index: trunk/install/php/m.php
===================================================================
--- trunk/install/php/m.php (リビジョン 46)
+++ trunk/install/php/m.php (リビジョン 70)
@@ -23,7 +23,17 @@
 
 <?php
-  include("./foltialib.php");
-
+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
+
 $now = date("YmdHi");   
 $errflag = 0;
@@ -187,4 +197,5 @@
       <input name="lengthmin" type="text" id="lengthmin" size="4" value="<?=$lengthmin?>"/> 
     分 (最長360分) </p>
+
   <p>録画局:
 <?php
@@ -238,4 +249,15 @@
     <input name="pname" type="text" id="pname" value="<?=$pname ?>" />
   </p>
+<p  style='background-color: #DDDDFF'>
+繰り返し指定-毎週以下の曜日に録画:
+<input name="weeklyloop" type="radio" value="128" />  日曜　
+<input name="weeklyloop" type="radio" value="64" />  月曜　
+<input name="weeklyloop" type="radio" value="32" />  火曜　
+<input name="weeklyloop" type="radio" value="16" />  水曜　
+<input name="weeklyloop" type="radio" value="8" />  木曜　
+<input name="weeklyloop" type="radio" value="4" />  金曜　
+<input name="weeklyloop" type="radio" value="2" />  土曜　
+ </p>
+ 
 <input type="submit" value="予約">　
 </form>
Index: trunk/install/php/foltia_config2.php.template
===================================================================
--- trunk/install/php/foltia_config2.php.template (リビジョン 51)
+++ trunk/install/php/foltia_config2.php.template (リビジョン 70)
@@ -21,4 +21,7 @@
 		$protectmode = 0; //未使用:(ブラウザからの予約削除を禁止するなどの保護モードで動作します)
 		$demomode = 0; //未使用:(ユーザインターフェイスだけ動作するデモモードで動作します)
+		$useenvironmentpolicy = 0 ;//環境ポリシーを使うかどうか
+		$environmentpolicytoken = "";//環境ポリシーのパスワードに連結されるセキュリティコード
+		$perltoolpath = $toolpath ;//perl版の初期設定の位置。デフォルトではphpと同じ位置
 
 // データベース接続設定
Index: trunk/install/php/delreserve.php
===================================================================
--- trunk/install/php/delreserve.php (リビジョン 1)
+++ trunk/install/php/delreserve.php (リビジョン 70)
@@ -17,4 +17,19 @@
 
 */
+
+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
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
@@ -29,5 +44,4 @@
 <?php
 
-  include("./foltialib.php");
 
 $tid = getgetnumform(tid);
@@ -40,5 +54,4 @@
 		}
 
-$con = m_connect();
 $now = date("YmdHi");   
 ?>
Index: trunk/install/php/deletemovie.php
===================================================================
--- trunk/install/php/deletemovie.php (リビジョン 17)
+++ trunk/install/php/deletemovie.php (リビジョン 70)
@@ -15,4 +15,19 @@
 
 */
+
+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
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
@@ -26,6 +41,4 @@
 
 <?php
-  include("./foltialib.php");
-$con = m_connect();
 $now = date("YmdHi");   
 
@@ -41,21 +54,22 @@
   <p align="left"><font color="#494949" size="6">録画番組削除</font></p>
   <hr size="4">
-<p align="left">次の番組を削除しました。</p>
+<?php
+$userclass = getuserclass($con);
+if ( $userclass <= 1){
+
+print "<p align=\"left\">次の番組を削除しました。</p>
+  <table BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"2\" WIDTH=\"100%\">
+	<thead>
+		<tr>
+			<th align=\"left\">ファイル名</th>
+			<th align=\"left\">タイトル</th>
+			<th align=\"left\">話数</th>
+			<th align=\"left\">サブタイ</th>
+		</tr>
+	</thead>
+	<tbody>";
 
 
-  <table BORDER="0" CELLPADDING="0" CELLSPACING="2" WIDTH="100%">
-	<thead>
-		<tr>
-			<th align="left">ファイル名</th>
-			<th align="left">タイトル</th>
-			<th align="left">話数</th>
-			<th align="left">サブタイ</th>
-		</tr>
-	</thead>
 
-	<tbody>
-<?
-
-//--
 
 foreach ($delete as $fName) {
@@ -129,7 +143,11 @@
 }//foreach
 
+print "	</tbody></table>\n";
+
+}else{//権限なし
+	print "<p align=\"left\">ファイル削除権限がありません。</p>";
+}
+
 ?>
-	</tbody>
-</table>
 
 </body>
Index: trunk/install/php/showplaylist.php
===================================================================
--- trunk/install/php/showplaylist.php (リビジョン 59)
+++ trunk/install/php/showplaylist.php (リビジョン 70)
@@ -19,4 +19,20 @@
 
 */
+
+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
+
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
@@ -27,5 +43,4 @@
 <link rel="stylesheet" type="text/css" href="graytable.css"> 
 <?php
-include("./foltialib.php");
 
 // Syabas 判定
@@ -38,5 +53,4 @@
 </head>";
 
-$con = m_connect();
 $now = date("YmdHi");   
 ?>
Index: trunk/install/php/reserveprogram.php
===================================================================
--- trunk/install/php/reserveprogram.php (リビジョン 31)
+++ trunk/install/php/reserveprogram.php (リビジョン 70)
@@ -15,4 +15,19 @@
 
 */
+
+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
+
 ?>
 
@@ -28,5 +43,4 @@
 <?php
 
-  include("./foltialib.php");
 
 $tid = getgetnumform(tid);
@@ -36,5 +50,4 @@
 
 
-$con = m_connect();
 $now = date("YmdHi");   
 
Index: trunk/install/php/foltialib.php
===================================================================
--- trunk/install/php/foltialib.php (リビジョン 67)
+++ trunk/install/php/foltialib.php (リビジョン 70)
@@ -261,7 +261,15 @@
 function printhtmlpageheader(){
 
+global $useenvironmentpolicy;
+
 $serveruri = getserveruri();
-
-print "<p align='left'><font color='#494949'><A HREF = 'http://www.dcc-jpl.com/soft/foltia/' target=\"_blank\">foltia</A>　| <A HREF = './index.php'>放映予定</A> | <A HREF = './index.php?mode=new'>新番組</A> | <A HREF = './listreserve.php'>予約一覧</A> | <A HREF = './titlelist.php'>番組一覧</A> | <A HREF = './viewepg.php'>番組表</A> | 録画一覧(<A HREF = './showplaylist.php'>録画順</A>・<A HREF = './showplaylist.php?list=title'>番組順</A>・<A HREF = './showplaylist.php?list=raw'>全</A>) | <A HREF = './showlib.php'>録画ライブラリ</A> |  <A HREF = './folcast.php'>Folcast(RSS)</A>[<a href=\"itpc://$serveruri/folcast.php\">iTunesにFolcastを登録</a>] |</font></p>\n";
+$username = $_SERVER['PHP_AUTH_USER'];
+
+print "<p align='left'><font color='#494949'><A HREF = 'http://www.dcc-jpl.com/soft/foltia/' target=\"_blank\">foltia</A>　| <A HREF = './index.php'>放映予定</A> | <A HREF = './index.php?mode=new'>新番組</A> | <A HREF = './listreserve.php'>予約一覧</A> | <A HREF = './titlelist.php'>番組一覧</A> | <A HREF = './viewepg.php'>番組表</A> | 録画一覧(<A HREF = './showplaylist.php'>録画順</A>・<A HREF = './showplaylist.php?list=title'>番組順</A>・<A HREF = './showplaylist.php?list=raw'>全</A>) | <A HREF = './showlib.php'>録画ライブラリ</A> |  <A HREF = './folcast.php'>Folcast</A>[<a href=\"itpc://$serveruri/folcast.php\">iTunesに登録</a>] | ";
+if ($useenvironmentpolicy == 1){
+	print "【 $username 】";
+}
+
+print "</font></p>\n";
 
 }
@@ -529,15 +537,161 @@
 
 
-
-
-
-
-
-
-
-
-
-
-
+function login($con,$name,$passwd){
+global $environmentpolicytoken;
+
+//入力内容確認
+ if (((mb_ereg('[^0-9a-zA-Z]', $name)) ||(mb_ereg('[^0-9a-zA-Z]', $passwd) ))){
+	
+	//print "エラー処理\n";
+	//print "<!-- DEBUG name/passwd format error-->";
+	redirectlogin();
+	
+}else{
+//print "正常処理\n";
+//db検索
+escape_string($name);
+escape_string($passwd);
+
+$query = "
+SELECT memberid ,userclass,name,passwd1 
+FROM foltia_envpolicy 
+WHERE foltia_envpolicy.name  = '$name'  
+	";
+	$useraccount = m_query($con, $query, "DBクエリに失敗しました");
+	$useraccountrows = pg_num_rows($useraccount);
+	
+	if ($useraccountrows == 1 ){
+		$rowdata = pg_fetch_row($useraccount, 0);
+		$memberid = $rowdata[0];
+		$userclass = $rowdata[1];
+		$username =  $rowdata[2];
+		$dbpasswd = $rowdata[3];
+	}else{
+		header("HTTP/1.0 401 Unauthorized");
+		//print "<!-- DEBUG DB record error ($useraccountrows)-->";
+		redirectlogin();
+	}//end if
+
+
+// passwdをdbから取りだし
+if ($userclass == 0){
+$dbpasswd = "$dbpasswd";
+}else{
+// db passwdとトークンを連結し
+$dbpasswd = "$dbpasswd"."$environmentpolicytoken";
+}
+//それが入力と一致すれば認証
+if ($passwd == $dbpasswd) {
+//print "認証成功<br>$dbpasswd  $passwd\n";
+}else{
+//print "認証失敗<br>$dbpasswd  $passwd\n";
+		header("HTTP/1.0 401 Unauthorized");
+		//print "<!-- DEBUG passwd unmatch error>";
+		redirectlogin();
+}
+}//end if mb_ereg
+}//end function login
+
+
+
+
+function redirectlogin(){
+
+print "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n";
+print "<html><head>\n";
+print "<title>foltia:Invalid login</title>\n";
+print "</head><body>\n";
+print "<h1>Invalid login</h1>";
+print "<p>foltiaヘのアクセスにはログインが必要です。新規アカウント登録は<a href=\"./accountregist.php\">こちらから。</a></p><hr>\n";
+print "<address>foltia by DCC-JPL Japan/foltia Project.  <a href = \"http://www.dcc-jpl.com/soft/foltia/\">http://www.dcc-jpl.com/soft/foltia/</a></address>\n";
+print "</body></html>\n";
+
+
+
+exit;
+}//end function redirectlogin
+
+function getuserclass($con){
+global $useenvironmentpolicy;
+$username = $_SERVER['PHP_AUTH_USER'];
+
+if ($useenvironmentpolicy == 1){
+$query = "
+SELECT memberid ,userclass,name,passwd1 
+FROM foltia_envpolicy 
+WHERE foltia_envpolicy.name  = '$username'  
+	";
+		$useraccount = m_query($con, $query, "DBクエリに失敗しました");
+	$useraccountrows = pg_num_rows($useraccount);
+	
+	if ($useraccountrows == 1 ){
+		$rowdata = pg_fetch_row($useraccount, 0);
+		//$userclass = $rowdata[1];
+		return ($rowdata[1]);
+	}else{
+	return (99);//エラー
+	}//end if
+	
+}else{
+	return (0);//環境ポリシー使わないときはつねに特権モード
+}//end if
+}//end function getuserclass
+
+
+
+function getmymemberid($con){
+global $useenvironmentpolicy;
+$username = $_SERVER['PHP_AUTH_USER'];
+
+if ($useenvironmentpolicy == 1){
+$query = "
+SELECT memberid ,userclass,name,passwd1 
+FROM foltia_envpolicy 
+WHERE foltia_envpolicy.name  = '$username'  
+	";
+		$useraccount = m_query($con, $query, "DBクエリに失敗しました");
+	$useraccountrows = pg_num_rows($useraccount);
+	
+	if ($useraccountrows == 1 ){
+		$rowdata = pg_fetch_row($useraccount, 0);
+		//$userclass = $rowdata[1];
+		return ($rowdata[0]);
+	}else{
+	return (-1);//エラー
+	}//end if
+	
+}else{
+	return (0);//環境ポリシー使わないときはつねに特権モード
+}//end if
+}//end function getuserclass
+
+
+function getmemberid2name($con,$memberid){
+global $useenvironmentpolicy;
+//$username = $_SERVER['PHP_AUTH_USER'];
+
+if ($useenvironmentpolicy == 1){
+$query = "
+SELECT memberid ,userclass,name,passwd1 
+FROM foltia_envpolicy 
+WHERE foltia_envpolicy.memberid  = '$memberid'  
+	";
+		$useraccount = m_query($con, $query, "DBクエリに失敗しました");
+	$useraccountrows = pg_num_rows($useraccount);
+	
+	if ($useraccountrows == 1 ){
+		$rowdata = pg_fetch_row($useraccount, 0);
+		return ($rowdata[2]);
+	}else{
+	return ("");//エラー
+	}//end if
+	
+}else{
+	return ("");
+}//end if
+
+
+
+}//end function getmemberid2name
 
 ?>
Index: trunk/install/php/selectcaptureimage.php
===================================================================
--- trunk/install/php/selectcaptureimage.php (リビジョン 56)
+++ trunk/install/php/selectcaptureimage.php (リビジョン 70)
@@ -18,4 +18,17 @@
 
 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
+
 
 $pid = getgetform(pid);
@@ -47,5 +60,4 @@
 
 
-$con = m_connect();
 $query = "
 SELECT 
Index: trunk/install/php/viewepg.php
===================================================================
--- trunk/install/php/viewepg.php (リビジョン 46)
+++ trunk/install/php/viewepg.php (リビジョン 70)
@@ -16,4 +16,18 @@
 
 */
+
+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
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
@@ -26,7 +40,4 @@
 </head>
 <?php
-include("./foltialib.php");
-  
-$con = m_connect();
 $start = getgetnumform(start);
 
Index: trunk/install/php/reserveepg.php
===================================================================
--- trunk/install/php/reserveepg.php (リビジョン 41)
+++ trunk/install/php/reserveepg.php (リビジョン 70)
@@ -15,4 +15,18 @@
 
 */
+
+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
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
@@ -25,5 +39,4 @@
 <?php
 
-  include("./foltialib.php");
   
 $epgid = getgetnumform(epgid);
@@ -36,5 +49,4 @@
 
 
-$con = m_connect();
 $now = date("YmdHi");   
 
Index: trunk/install/php/listreserve.php
===================================================================
--- trunk/install/php/listreserve.php (リビジョン 63)
+++ trunk/install/php/listreserve.php (リビジョン 70)
@@ -17,4 +17,20 @@
 
 */
+
+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
+$userclass = getuserclass($con);
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
@@ -28,10 +44,7 @@
 
 <?php
-
-  include("./foltialib.php");
-
-$con = m_connect();
-
+$mymemberid = getmymemberid($con);
 $now = getgetnumform(startdate);
+
 if ($now > 200501010000){
 }else{
@@ -49,5 +62,6 @@
 foltia_tvrecord.bitrate  , 
 foltia_subtitle.startoffset , 
-foltia_subtitle.pid  
+foltia_subtitle.pid , 
+foltia_subtitle.epgaddedby 
 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
@@ -64,5 +78,6 @@
 foltia_tvrecord.bitrate , 
 foltia_subtitle.startoffset , 
-foltia_subtitle.pid  
+foltia_subtitle.pid , 
+foltia_subtitle.epgaddedby 
 FROM foltia_tvrecord
 LEFT OUTER JOIN foltia_subtitle on (foltia_tvrecord.tid = foltia_subtitle.tid )
@@ -130,5 +145,7 @@
 $tid = htmlspecialchars($rowdata[0]);
 $title = htmlspecialchars($rowdata[2]);
-$subtitle =  htmlspecialchars($rowdata[4]);
+$subtitle = htmlspecialchars($rowdata[4]);
+$dbepgaddedby = htmlspecialchars($rowdata[10]);
+
 //重複検出
 //開始時刻 $rowdata[5]
@@ -268,8 +285,15 @@
 					print "<td><a href=\"http://cal.syoboi.jp/tid/$tid/time#$pid\" target=\"_blank\">$subtitle<br></td>\n";
 					}else{
-					if ($protectmode) {
-					print "<td>$subtitle<br></td>\n";
+					//if ( $userclass <= 2){
+					if (($mymemberid == $dbepgaddedby)||($userclass <= 1)){
+						if ($userclass <= 1 ){//管理者なら
+							$membername = getmemberid2name($con,$dbepgaddedby);
+							$membername = ":" . $membername ;
+						}else{
+						$membername = "";
+						}
+					print "<td>$subtitle [<a href=\"delepgp.php?pid=$pid\">予約解除</a>$membername]<br></td>\n";
 					}else{
-					print "<td>$subtitle [<a href=\"delepgp.php?pid=$pid\">予約解除</a>]<br></td>\n";
+					print "<td>$subtitle [解除不能]<br></td>\n";
 					}
 					}
@@ -345,9 +369,9 @@
 				echo("<tr>\n");
 				//予約解除
-				if ($protectmode) {
-					echo("<td>−</td>");				
+				if ( $userclass <= 1){
+					echo("<td><a href=\"delreserve.php?tid=$tid&sid=" .
+					htmlspecialchars($rowdata[4])  . "\">解除</a></td>\n");
 				}else{
-					echo("<td><a href=\"delreserve.php?tid=$tid&sid=" .
-					 htmlspecialchars($rowdata[4])  . "\">解除</a></td>\n");
+				echo("<td>−</td>");		
 				}
 				//TID
Index: trunk/install/php/index.php
===================================================================
--- trunk/install/php/index.php (リビジョン 32)
+++ trunk/install/php/index.php (リビジョン 70)
@@ -17,12 +17,20 @@
 
 */
-?>
-
-<?php
-  include("./foltialib.php");
-
+
+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
+
 $now = date("YmdHi");   
-
 
 function printtitle(){
Index: trunk/install/php/showlib.php
===================================================================
--- trunk/install/php/showlib.php (リビジョン 68)
+++ trunk/install/php/showlib.php (リビジョン 70)
@@ -15,4 +15,19 @@
 
 */
+
+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
+
 ?>
 
@@ -28,7 +43,4 @@
 
 <?php
-include("./foltialib.php");
-
-$con = m_connect();
 $now = date("YmdHi");   
 
Index: trunk/install/php/accountregist.php
===================================================================
--- trunk/install/php/accountregist.php (リビジョン 70)
+++ trunk/install/php/accountregist.php (リビジョン 70)
@@ -0,0 +1,152 @@
+<?php
+/*
+ Anime recording system foltia
+ http://www.dcc-jpl.com/soft/foltia/
+
+accountregist.php
+
+目的
+　環境ポリシーのためのユーザ新規登録
+
+
+引数
+
+
+ DCC-JPL Japan/foltia project
+
+*/
+?>
+
+<?php
+  include("./foltialib.php");
+
+$con = m_connect();
+$now = date("YmdHi");   
+$errflag = 0;
+$errmsg = "";
+
+
+function printtitle(){
+print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">
+<html lang=\"ja\">
+<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\"> ";
+
+print "<title>foltia:新規アカウント登録</title>
+</head>";
+}//end function printtitle()
+
+printtitle();
+?>
+<body BGCOLOR="#ffffff" TEXT="#494949" LINK="#0047ff" VLINK="#000000" ALINK="#c6edff" >
+
+<p align="left"><font color="#494949" size="6">
+新規アカウント登録
+</font></p>
+<hr size="4">
+<?php
+//値取得
+$username = getform(username);
+$userpasswd = getform(userpasswd);
+if ($username == "") {
+	print "<p align=\"left\">新規アカウント登録をします。</p>\n";
+
+}else{
+//すでにそのユーザが存在しているかどうか確認
+if ($username != ""){
+$query = "
+SELECT memberid ,userclass,name,passwd1 
+FROM foltia_envpolicy 
+WHERE foltia_envpolicy.name  = '$username'  
+";
+	$isaccountexist = m_query($con, $query, "DBクエリに失敗しました");
+	$isaccountexistncount = pg_num_rows($isaccountexist);
+
+	if ($isaccountexistncount == 0){
+	//valid
+	}else{
+		$errflag = 1;
+		$errmsg = "そのユーザ名は既に使われています。";
+	}
+}
+if ($userpasswd == ""){
+		$errflag = 2;
+		$errmsg = "パスワードが不適切です。半角英数を指定して下さい。";
+}
+
+
+if ($errflag == 0){
+// next midを探す
+$query = "
+SELECT max(memberid) 
+FROM  foltia_envpolicy 
+";
+	$rs = m_query($con, $query, "DBクエリに失敗しました");
+	$maxrows = pg_num_rows($rs);
+	if ($maxrows == 0){
+	$nextcno = 1 ;
+	}else{
+	$rowdata = pg_fetch_row($rs, 0);
+	$nextcno = $rowdata[0];
+	$nextcno++ ;
+	}
+
+//登録
+//INSERT
+if ($demomode){
+}else{
+/*
+ユーザクラス
+0:特権管理者
+1:管理者:予約削除、ファイル削除が出来る
+2:利用者:EPG追加、予約追加が出来る
+3:ビュアー:ファイルダウンロードが出来る
+4:ゲスト:インターフェイスが見れる
+*/
+$remotehost = gethostbyaddr($_SERVER['REMOTE_ADDR']);
+
+$query = "
+insert into foltia_envpolicy  
+values ( '$nextcno','2','$username','$userpasswd',now(),'$remotehost')";
+//print "$query <br>\n";
+	$rs = m_query($con, $query, "DBクエリに失敗しました");
+
+print "次のアカウントを登録しました。<br>
+ログイン名:$username<br>
+パスワード:$userpasswd";
+
+if ($environmentpolicytoken != ""){
+	print "＋セキュリティコード<br>\n";
+}
+print "<a href=\"./index.php\">ログイン</a><br>\n";
+
+print "</body>
+</html>
+";
+	$oserr = system("$toolpath/perl/envpolicyupdate.pl");
+exit;
+
+}//endif デモモード
+}else{//errorフラグあったら
+print "$errmsg / $errflag<br>\n";
+
+}//end if エラーじゃなければ
+
+}//end if ""
+?>
+
+<form id="account" name="account" method="post" action="./accountregist.php">
+  <p>登録ユーザ名:
+    <input name="username" type="text" id="username" size="19" value="" />
+  (半角英数のみ)</p>
+  <p>登録パスワード:
+    <input name="userpasswd" type="text" id="userpasswd" size="19" value="" />
+  (半角英数のみ)</p>
+
+<input type="submit" value="新規登録">　
+</form>
+
+</body>
+</html>
Index: trunk/install/php/showlibc.php
===================================================================
--- trunk/install/php/showlibc.php (リビジョン 65)
+++ trunk/install/php/showlibc.php (リビジョン 70)
@@ -16,5 +16,17 @@
 */
 
-  include("./foltialib.php");
+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
 
 $tid = getgetnumform(tid);
@@ -41,5 +53,4 @@
 		die_exit("再生可能番組がありません<BR>");
 		}
-$con = m_connect();
 $now = date("YmdHi");   
 
Index: trunk/install/php/view_syabas.php
===================================================================
--- trunk/install/php/view_syabas.php (リビジョン 59)
+++ trunk/install/php/view_syabas.php (リビジョン 70)
@@ -21,21 +21,25 @@
 
 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
+
 
 $pid = getgetform(pid);
 
-if ($pid == "") {
-		exit;
-}
 
-?>
-
-
-<?php
 if ($pid == "") {
 	exit;
 }
 
-
-$con = m_connect();
 $query = "
 SELECT 
Index: trunk/install/php/titlelist.php
===================================================================
--- trunk/install/php/titlelist.php (リビジョン 1)
+++ trunk/install/php/titlelist.php (リビジョン 70)
@@ -16,4 +16,19 @@
 
 */
+
+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
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
@@ -27,9 +42,4 @@
 
 <?php
-
-  include("./foltialib.php");
-
-$con = m_connect();
-
 $now = date("YmdHi");   
 
Index: trunk/install/php/delepgp.php
===================================================================
--- trunk/install/php/delepgp.php (リビジョン 1)
+++ trunk/install/php/delepgp.php (リビジョン 70)
@@ -16,4 +16,20 @@
 
 */
+
+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
+
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
@@ -28,5 +44,4 @@
 <?php
 
-  include("./foltialib.php");
 
 $pid = getgetform(pid);
@@ -35,5 +50,4 @@
 		}
 
-$con = m_connect();
 $now = date("YmdHi");   
 ?>
Index: trunk/install/php/myfoltia.php
===================================================================
--- trunk/install/php/myfoltia.php (リビジョン 70)
+++ trunk/install/php/myfoltia.php (リビジョン 70)
@@ -0,0 +1,19 @@
+<?php
+/*
+ Anime recording system foltia
+ http://www.dcc-jpl.com/soft/foltia/
+
+myfoltia.php
+
+目的
+環境ポリシーでの自分の設定を変更します。
+
+オプション
+
+ DCC-JPL Japan/foltia project
+
+*/
+include("./foltialib.php");
+$con = m_connect();
+
+?>
Index: trunk/install/php/reserveepgcomp.php
===================================================================
--- trunk/install/php/reserveepgcomp.php (リビジョン 1)
+++ trunk/install/php/reserveepgcomp.php (リビジョン 70)
@@ -19,4 +19,20 @@
 
 */
+
+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
+
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
@@ -29,5 +45,4 @@
 
 <?php 
-  include("./foltialib.php");
 
 	printhtmlpageheader();
@@ -49,5 +64,4 @@
 print "	<title>foltia:EPG予約:完了</title>
 </head>\n";
-$con = m_connect();
 $now = date("YmdHi");   
 // - DB登録作業
@@ -81,23 +95,46 @@
 //INSERT
 if ($demomode){
+	print "下記予約を完了いたしました。<br>";
 }else{
+$userclass = getuserclass($con);
+if ( $userclass <= 2){
+/*
+pid 
+tid 
+stationid  
+countno 
+subtitle
+startdatetime  
+enddatetime  
+startoffset  
+lengthmin  
+m2pfilename 
+pspfilename 
+epgaddedby  
 
-$query = "
-insert into foltia_subtitle  
+*/
+
+$memberid = getmymemberid($con);
+	$query = "
+insert into foltia_subtitle  (pid ,tid ,stationid , countno ,subtitle ,
+startdatetime ,enddatetime ,startoffset , lengthmin , epgaddedby ) 
 values ( '$insertpid','0','$stationid',
-	'$nextcno','$subtitle','$startdatetime','$enddatetime','0' ,'$lengthmin')";
+	'$nextcno','$subtitle','$startdatetime','$enddatetime','0' ,'$lengthmin' , '$memberid')";
 
 	$rs = m_query($con, $query, "DBクエリに失敗しました");
 
-//addatq.pl
-//キュー入れプログラムをキック
-//引数　TID チャンネルID
-//echo("$toolpath/perl/addatq.pl $tid $station");
+	//addatq.pl
+	//キュー入れプログラムをキック
+	//引数　TID チャンネルID
+	//echo("$toolpath/perl/addatq.pl $tid $station");
 
 	$oserr = system("$toolpath/perl/addatq.pl 0 0");
-
+	print "下記予約を完了いたしました。<br>";
+}else{
+	print "EPG予約を行う権限がありません。";
+}// end if $userclass <= 2
 }//end if demomode
 
-print "下記予約を完了いたしました。<br>";
+
 
 }else{
Index: trunk/install/mktable.txt
===================================================================
--- trunk/install/mktable.txt (リビジョン 69)
+++ trunk/install/mktable.txt (リビジョン 70)
@@ -32,5 +32,6 @@
 lengthmin int8,
 m2pfilename text ,
-PSPfilename text 
+PSPfilename text ,
+epgaddedby int8
 );
 create unique index foltia_subtitle_pid_index on foltia_subtitle (pid);
@@ -226,16 +227,2 @@
 
 
-drop table  foltia_weeklytimer ;
-create table foltia_weeklytimer (
-timerid int8  PRIMARY KEY,
-recpattern int8, 
-stationid int8,
-startdatetime int8,
-enddatetime int8,
-subtitle text,
-addeddate timestamp
-);
-REVOKE ALL on "foltia_weeklytimer" from PUBLIC;
-GRANT UPDATE,SELECT,INSERT on "foltia_weeklytimer" to "foltia";
-
-