From f8df0c54d9ed54a4f816d51456b966401899bc02 Mon Sep 17 00:00:00 2001 From: Christian Paminger Date: Thu, 20 Mar 2008 09:49:57 +0000 Subject: [PATCH] --- include/lehrstunde.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/lehrstunde.class.php b/include/lehrstunde.class.php index acac715b8..e0f179c99 100644 --- a/include/lehrstunde.class.php +++ b/include/lehrstunde.class.php @@ -528,7 +528,7 @@ class lehrstunde $sql_query="SELECT $stpl_id AS id, lektor, stg_kurzbz, ort_kurzbz, semester, verband, gruppe, gruppe_kurzbz, datum, stunde FROM $stpl_table WHERE datum='$this->datum' AND stunde=$this->stunde AND (ort_kurzbz='$this->ort_kurzbz' OR "; if ($this->lektor_uid!='_DummyLektor') - $sql_query.="(uid='$this->lektor_uid') AND uid!='_DummyLektor' OR "; + $sql_query.="(uid='$this->lektor_uid' AND uid!='_DummyLektor') OR "; $sql_query.="(studiengang_kz=$this->studiengang_kz AND semester=$this->sem"; if ($this->ver!=null && $this->ver!='' && $this->ver!=' ') $sql_query.=" AND (verband='$this->ver' OR verband IS NULL OR verband='' OR verband=' ')"; @@ -580,7 +580,7 @@ class lehrstunde FROM lehre.vw_reservierung WHERE datum='$this->datum' AND stunde=$this->stunde AND (ort_kurzbz='$this->ort_kurzbz' OR "; if ($this->lektor_uid!='_DummyLektor') - $sql_query.="(uid='$this->lektor_uid') AND uid!='_DummyLektor' OR "; + $sql_query.="(uid='$this->lektor_uid' AND uid!='_DummyLektor') OR "; $sql_query.="(studiengang_kz=$this->studiengang_kz AND semester=$this->sem"; if ($this->ver!=null && $this->ver!='' && $this->ver!=' ') $sql_query.=" AND (verband='$this->ver' OR verband IS NULL OR verband='' OR verband=' ')"; @@ -613,7 +613,7 @@ class lehrstunde else { $row=pg_fetch_object($erg_stpl); - $this->errormsg="Kollision ($stpl_table): $row->id|$row->lektor|$row->ort_kurzbz|$row->stg_kurzbz-$row->semester$row->verband$row->gruppe$row->gruppe_kurzbz - $row->datum/$row->stunde"; + $this->errormsg="Kollision ($stpl_table): $row->id|$row->lektor|$row->ort_kurzbz|$row->stg_kurzbz-$row->semester$row->verband$row->gruppe$row->gruppe_kurzbz - $row->datum/$row->stunde"; //\n".$sql_query return true; } }