diff --git a/sys0-code/app/print.php b/sys0-code/app/print.php
index a2320f0..b845c18 100644
--- a/sys0-code/app/print.php
+++ b/sys0-code/app/print.php
@@ -72,6 +72,7 @@ function is_time_between($startTime, $endTime, $checkTime) {
 
 	<?php 
 		$color=$_SESSION["color"]; 
+		$class=$_SESSION["class_id"];
 		include "../assets/components.php";
 	?>
 	<script src="/assets/js/load_page.js"></script>
@@ -318,21 +319,27 @@ function is_time_between($startTime, $endTime, $checkTime) {
 					date_default_timezone_set('Europe/Zurich');
 					$reservation_conflict=false;
 					$today=date("Y-m-d");
-					$sql="select time_from, time_to from reservations where day='$today';";
+					$sql="select time_from, time_to, for_class from reservations where day='$today';";
 					$stmt = $link->prepare($sql);
         				$stmt->execute();
         				$result = $stmt->get_result();
         				//$row = $result->fetch_assoc();
         				$time_now=date("H:i");
+					
         				while ($row = $result->fetch_assoc()) {
 					    if (is_time_between($row["time_from"], $row["time_to"], $time_now)) {
 						$reservation_conflict = true;
+						$for_class[]=$row["for_class"];
 						break;
 					    }
 					}
-
-					if ($reservation_conflict) {
-					    echo "<center><div style='width:50%' class='alert alert-danger' role='alert'>Die Drucker sind zurzeit reserviert! Bitte drucke nur, wenn du gerade im Informatik Unterricht bist!</div></center>";
+					if(!isset($for_class))
+						$for_class[]=0;
+					if ($reservation_conflict && !in_array($class,$for_class)) {
+					    echo "<center><div style='width:50%' class='alert alert-danger' role='alert'>Die Drucker sind zurzeit reserviert! Bitte versuche es später erneut!</div></center>";
+						$block=true;
+					}else{
+						$block=false;
 					}
 
 				?>
@@ -495,17 +502,27 @@ function is_time_between($startTime, $endTime, $checkTime) {
 					}
 					
 					?>
-					<input type="submit" class="btn btn-dark mb-5" value="Datei drucken" onclick="show_loader();" id="button">
-					<div class="d-flex align-items-center">
- 					 <strong role="status" style="display:none" id="spinner">Hochladen...</strong>
- 					 <div class="spinner-border ms-auto" aria-hidden="true" style="display:none" id="spinner2"></div>
-					</div>
+						<?php
+							if($block==false){
+								echo('<input type="submit" class="btn btn-dark mb-5" value="Datei drucken" onclick="show_loader();" id="button">');
+								echo('<div class="d-flex align-items-center">');
+ 					 				echo('<strong role="status" style="display:none" id="spinner">Hochladen...</strong>');
+ 					 				echo('<div class="spinner-border ms-auto" aria-hidden="true" style="display:none" id="spinner2"></div>');
+								echo('</div>');
+							}else{
+								echo "<center><div style='width:50%' class='alert alert-danger' role='alert'>Die Drucker sind zurzeit reserviert! Bitte versuche es später erneut!</div></center>";
+							}
+						?>
+					
+					
 					<?php
- 					 	if(isset($_GET["send_to_queue"])){
- 					 		echo('<center><a href="print.php">Nur freie Drucker anzeigen.</a></center>');	
- 					 	}else{
- 					 		echo(' <center><a href="print.php?send_to_queue">Auf einem Drucker Drucken, welcher besetzt ist.</a></center>');	
- 					 	}
+						if($block==false){
+ 					 		if(isset($_GET["send_to_queue"])){
+ 					 			echo('<center><a href="print.php">Nur freie Drucker anzeigen.</a></center>');	
+ 					 		}else{
+ 					 			echo(' <center><a href="print.php?send_to_queue">Auf einem Drucker Drucken, welcher besetzt ist.</a></center>');	
+ 					 		}
+						}
  					 ?>	
 					
 				</form>