comparison index.php @ 76:69e0dabc765a

fixed: Reservation.class.php modified: config.php.sample modified: index.php modified: install/step1.php modified: install/step3.php install/grscan.php

70:1363ac056197

 $programs = array();
 if( $type == "BS" ) $channel_map = $BS_CHANNEL_MAP;
 else if( $type == "GR" ) $channel_map = $GR_CHANNEL_MAP;
 else if( $type == "CS" ) $channel_map = $CS_CHANNEL_MAP;
 $st = 0;
 $prec = new DBRecord(PROGRAM_TBL);
 foreach( $channel_map as $channel_disc => $channel ) {
	$prev_end = $top_time;
 	try {
		$crec = new DBRecord( CHANNEL_TBL, "channel_disc", $channel_disc );
		$programs[$st]["station_name"]  = $crec->name;

			$programs[$st]['list'][$num]['rec'] = DBRecord::countRecords(RESERVE_TBL, "WHERE complete = '0' AND program_id = '".$prg['id']."'" );
			$num++;
		}
	}
	 catch( exception $e ) {
		exit( $e->getMessage() );
 	}
 	// 空きを埋める
	if( ($last_time - $prev_end) > 0 ) {
		$height = ($last_time - $prev_end) * $settings->height_per_hour / 3600;
		$height = $height;

76:69e0dabc765a

 $programs = array();
 if( $type == "BS" ) $channel_map = $BS_CHANNEL_MAP;
 else if( $type == "GR" ) $channel_map = $GR_CHANNEL_MAP;
 else if( $type == "CS" ) $channel_map = $CS_CHANNEL_MAP;
 $st = 0;
 $prec = null;
 try {
 	$prec = new DBRecord(PROGRAM_TBL);
 }
 catch( Exception $e ) {
	exit('プログラムテーブルが存在しないようです。インストールをやり直してください.');
 }
 foreach( $channel_map as $channel_disc => $channel ) {
	$prev_end = $top_time;
 	try {
		$crec = new DBRecord( CHANNEL_TBL, "channel_disc", $channel_disc );
		$programs[$st]["station_name"]  = $crec->name;

			$programs[$st]['list'][$num]['rec'] = DBRecord::countRecords(RESERVE_TBL, "WHERE complete = '0' AND program_id = '".$prg['id']."'" );
			$num++;
		}
	}
	 catch( exception $e ) {
//		exit( $e->getMessage() );
//		何もしない
 	}
 	// 空きを埋める
	if( ($last_time - $prev_end) > 0 ) {
		$height = ($last_time - $prev_end) * $settings->height_per_hour / 3600;
		$height = $height;