From 012e7b9691536d2d46e3255f3cd69cd8779782c8 Mon Sep 17 00:00:00 2001 From: ma0048 Date: Mon, 27 Feb 2023 11:35:04 +0100 Subject: [PATCH] - kollision bei ganztaetigen zeitsperren --- include/lehreinheit.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/lehreinheit.class.php b/include/lehreinheit.class.php index 5c4854966..6bf1f7282 100644 --- a/include/lehreinheit.class.php +++ b/include/lehreinheit.class.php @@ -663,10 +663,10 @@ class lehreinheit extends basis_db $sql_lkt=mb_substr($sql_lkt,3); $sql_query="SELECT * FROM campus.tbl_zeitsperre WHERE ($sql_lkt) AND - ( (vondatum<".$this->db_add_param($datum)." AND bisdatum>".$this->db_add_param($datum).") - OR (vondatum=".$this->db_add_param($datum)." AND bisdatum=".$this->db_add_param($datum)." AND vonstunde<=".$this->db_add_param($stunde)." AND bisstunde>=".$this->db_add_param($stunde).") - OR (vondatum=".$this->db_add_param($datum)." AND bisdatum>".$this->db_add_param($datum)." AND vonstunde<=".$this->db_add_param($stunde).") - OR (vondatum<".$this->db_add_param($datum)." AND bisdatum=".$this->db_add_param($datum)." AND bisstunde>=".$this->db_add_param($stunde).") )"; + (vondatum <= ".$this->db_add_param($datum)." AND + bisdatum >= ".$this->db_add_param($datum)." AND + (vonstunde <= ". $this->db_add_param($stunde)." OR vonstunde IS NULL) AND + (bisstunde >= ". $this->db_add_param($stunde)." OR bisstunde IS NULL))"; //echo $sql_query.'
'; if (!$this->db_query($sql_query)) {