mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-24 02:12:17 +00:00
- Freifaecher Anpassung an neue DB
- News/Pinboard Aktualisierung - Bibliotheksseite Aktualisiert - Sync Anpassungen - etc
This commit is contained in:
@@ -161,9 +161,10 @@ class lehrveranstaltung
|
||||
function load_lva($studiengang_kz, $semester=null, $lehreverzeichnis=null, $lehre=null)
|
||||
{
|
||||
//Variablen pruefen
|
||||
if(!is_numeric($studiengang_kz) || $studiengang_kz =='')
|
||||
|
||||
if(!is_numeric($studiengang_kz) || $studiengang_kz=='')
|
||||
{
|
||||
$this->errormsg = 'studiengang_id muss eine gueltige Zahl sein';
|
||||
$this->errormsg = 'studiengang_kz muss eine gueltige Zahl sein';
|
||||
return false;
|
||||
}
|
||||
if($semester!=null && (!is_numeric($semester) || $semester==''))
|
||||
@@ -187,7 +188,7 @@ class lehrveranstaltung
|
||||
if($lehre!=null)
|
||||
$qry .= " AND lehre=".($lehre?'true':'false');
|
||||
|
||||
$qry .= " ORDER BY bezeichnung";
|
||||
$qry .= " AND lehreverzeichnis<>'' ORDER BY bezeichnung";
|
||||
|
||||
//Datensaetze laden
|
||||
if(!$res = pg_query($this->conn, $qry))
|
||||
|
||||
@@ -115,7 +115,7 @@ class news
|
||||
$datum = 'AND datum<=now()';
|
||||
|
||||
if($studiengang_kz==0)
|
||||
$qry = "SELECT * FROM campus.tbl_news WHERE $interval studiengang_kz=".$studiengang_kz." AND semester".($semester!=''?"='$semester'":' is null')." $datum ORDER BY datum DESC, updateamum DESC;";
|
||||
$qry = "SELECT * FROM campus.tbl_news WHERE $interval studiengang_kz=".$studiengang_kz." ".($semester!=''?"":'AND semester is null')." $datum ORDER BY datum DESC, updateamum DESC;";
|
||||
else
|
||||
$qry = "SELECT * FROM campus.tbl_news WHERE $interval ((studiengang_kz=$studiengang_kz AND semester=$semester) OR (studiengang_kz=$studiengang_kz AND semester=0) OR (studiengang_kz=0 AND semester=$semester) OR (studiengang_kz=0 and semester is null)) $datum ORDER BY datum DESC, updateamum DESC";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user