From e58013158435159e8d72e2b07ba512e91ac5e759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 26 Aug 2009 09:23:13 +0000
Subject: [PATCH] =?UTF-8?q?Fehler=20beim=20Reservieren=20von=20R=C3=A4umen?=
 =?UTF-8?q?=20behoben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/private/lvplan/stpl_week.php | 14 ++++++--------
 include/wochenplan.class.php     |  5 ++++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cis/private/lvplan/stpl_week.php b/cis/private/lvplan/stpl_week.php
index b3d7f6a16..b2b1d85be 100644
--- a/cis/private/lvplan/stpl_week.php
+++ b/cis/private/lvplan/stpl_week.php
@@ -162,19 +162,16 @@ if (isset($reserve) && ($user=='lektor' || $raumres))
 
 	$num_rows_std=$db->db_num_rows($erg_std);
 	$count=0;
-	for ($t=1;$t<7;$t++)
+	for ($t=1;$t<=TAGE_PRO_WOCHE;$t++)
+	{
 		for ($j=0;$j<$num_rows_std;$j++)
 		{
 			$stunde=$db->db_result($erg_std,$j,'"stunde"');
 			$var='reserve'.$t.'_'.$stunde;
-			//echo $$var;
-			if (isset($_POST[$var]))
-				$$var=$_POST[$var];
-			else if (isset($_GET[$var]))
-				$$var=$_GET[$var];				
-			if (isset($$var))
+				
+			if (isset($_REQUEST[$var]))
 			{
-				$datum_res=$$var;
+				$datum_res=$_REQUEST[$var];
 				#$datum_res=$datum_obj->formatDatum($datum_res);
 				//echo $datum_res;
 				$query="SELECT * FROM campus.tbl_reservierung where ort_kurzbz='$ort_kurzbz' and datum='$datum_res' and  stunde='$stunde'";
@@ -198,6 +195,7 @@ if (isset($reserve) && ($user=='lektor' || $raumres))
 				$count++;
 			}
 		}
+	}
 }
 
 // Stundenplan erstellen
diff --git a/include/wochenplan.class.php b/include/wochenplan.class.php
index 05c8c3d9e..8fccadea5 100644
--- a/include/wochenplan.class.php
+++ b/include/wochenplan.class.php
@@ -676,7 +676,10 @@ class wochenplan extends basis_db
 				else
 				{
 					echo '				<td align="center"><br>';
-					if (($raumres || $this->user=='lektor') && $this->type=='ort' && ($datum>=$datum_res_lektor_start && $datum<=$datum_res_lektor_ende))
+					$datum_res_lektor_start_m = date('Y-m-d', $datum_res_lektor_start);
+					$datum_res_lektor_ende_m = date('Y-m-d', $datum_res_lektor_ende);
+					$datum_m = date('Y-m-d',$datum);
+					if (($raumres || $this->user=='lektor') && $this->type=='ort' && ($datum_m>=$datum_res_lektor_start_m && $datum_m<=$datum_res_lektor_ende_m))
 						echo '<INPUT type="checkbox" name="reserve'.$i.'_'.$j.'" value="'.date("Y-m-d",$datum).'">'; //&& $datum>=$datum_now
 					echo '</td>'.$this->crlf;
 				}