From 40be032b613dd5475fbfd6ff9e276834445c8af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Fri, 19 Jan 2007 14:36:41 +0000 Subject: [PATCH] Diverse Bugfixes --- cis/private/freifaecher/pinboard_show.php | 3 ++- cis/private/lehre/pinboard.php | 18 ++++++++++-------- cis/private/lehre/pinboard_show.php | 2 +- cis/private/lehre/upload.php | 5 ++--- cis/private/mailverteiler.php | 6 +++--- cis/private/tools/news_show.php | 2 +- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/cis/private/freifaecher/pinboard_show.php b/cis/private/freifaecher/pinboard_show.php index 3bdf22541..29e3f2751 100644 --- a/cis/private/freifaecher/pinboard_show.php +++ b/cis/private/freifaecher/pinboard_show.php @@ -37,8 +37,9 @@ if(isset($remove_id) && $remove_id != "") { $news_obj = new news($sql_conn); - if($news_obj->delete($remote_id)) + if($news_obj->delete($remove_id)) { + writeCISlog('DELETE PINBOARD',''); echo ""; diff --git a/cis/private/lehre/pinboard.php b/cis/private/lehre/pinboard.php index a7dd8953b..ac70eeba9 100644 --- a/cis/private/lehre/pinboard.php +++ b/cis/private/lehre/pinboard.php @@ -122,8 +122,9 @@

Studiengangsleiter:
"; if(isset($row_course_leader) && $row_course_leader != "") @@ -193,7 +194,7 @@ echo "

Stellvertreter:
"; //Studiengangsleiter Stellvertreter auselesen - $sql_query = "SELECT * FROM campus.vw_mitarbeiter JOIN public.tbl_benutzerfunktion using(uid) WHERE studiengang_kz='$course_id' AND funktion_kurzbz='stglstv'"; + $sql_query = "SELECT * FROM campus.vw_mitarbeiter WHERE uid=(SELECT uid FROM public.tbl_benutzerfunktion WHERE studiengang_kz='$course_id' AND funktion_kurzbz='stglstv')"; if($result_course_leader_deputy = pg_query($sql_conn, $sql_query)) { @@ -264,7 +265,7 @@ echo "

Sekretariat:
"; //Sektritariat auslesen - $sql_query = "SELECT * FROM campus.vw_mitarbeiter JOIN public.tbl_benutzerfunktion using(uid) WHERE studiengang_kz='$course_id' AND funktion_kurzbz='ass'"; + $sql_query = "SELECT * FROM campus.vw_mitarbeiter WHERE uid=(SELECT uid FROM public.tbl_benutzerfunktion WHERE studiengang_kz='$course_id' AND funktion_kurzbz='ass' LIMIT 1)"; if($result_course_secretary = pg_query($sql_conn, $sql_query)) { @@ -332,9 +333,9 @@ } echo "

Studentenvertreter:
"; - - $sql_query = "SELECT * FROM campus.vw_benutzer JOIN public.tbl_benutzerfunktion using(uid) WHERE studiengang_kz='$course_id' AND funktion_kurzbz='stdv'"; - + + $sql_query = "SELECT tbl_person.vorname, tbl_person.nachname, tbl_person.titelpre, tbl_person.titelpost, tbl_benutzer.uid FROM public.tbl_person, public.tbl_benutzer,public.tbl_benutzerfunktion WHERE studiengang_kz='$course_id' AND funktion_kurzbz='stdv' AND tbl_person.person_id=public.tbl_benutzer.person_id AND tbl_benutzerfunktion.uid=tbl_benutzer.uid"; + if($result_course_stdv = pg_query($sql_conn, $sql_query)) { $num_rows_course_stdv = pg_numrows($result_course_stdv); @@ -351,7 +352,7 @@ echo "Nicht vorhanden"; } } - ?> +?> @@ -432,6 +433,7 @@ { echo ' Allgemeiner Download'; } + ?> diff --git a/cis/private/lehre/pinboard_show.php b/cis/private/lehre/pinboard_show.php index 2215c9528..cb82b5116 100644 --- a/cis/private/lehre/pinboard_show.php +++ b/cis/private/lehre/pinboard_show.php @@ -41,7 +41,7 @@ $news_obj = new news($conn); if($news_obj->delete($remove_id)) { - writeCISlog('DELETE','PINBOARD'); + writeCISlog('DELETE PINBOARD',''); echo ''; diff --git a/cis/private/lehre/upload.php b/cis/private/lehre/upload.php index f86e44d71..f2f454ef9 100644 --- a/cis/private/lehre/upload.php +++ b/cis/private/lehre/upload.php @@ -477,9 +477,8 @@ A:hover { if(!($num_rows_path_elements > 0)) { - echo ""; - die('

Es konnten keine Pfadeinträge gefunden werden.

'); - echo ""; + echo "
"; + die('

Sie haben keine Berechtigung für diesen Bereich

'); } $row = pg_fetch_object($result_path_elements, 0); diff --git a/cis/private/mailverteiler.php b/cis/private/mailverteiler.php index b09c98f1c..9cef37ec1 100644 --- a/cis/private/mailverteiler.php +++ b/cis/private/mailverteiler.php @@ -85,7 +85,7 @@ $stg_obj = new studiengang($conn); if(!$stg_obj->getAll('studiengang_kz')) echo $stg_obj->errormsg; - + foreach($stg_obj->result as $row) { // Kopfzeile hinausschreiben @@ -154,7 +154,7 @@ // ffe, 20060508: Display the opening link for department dispatchers only for students of the particular department $std_obj = new student($conn, $user); - $qry_stud = "SELECT count(*) as anzahl FROM campus.vw_student WHERE studiengang_kz='$row->studiengang_kz'"; + $qry_stud = "SELECT count(*) as anzahl FROM public.tbl_student WHERE studiengang_kz='$row->studiengang_kz' AND student_uid NOT LIKE '_Dummy%'"; if(!$row_stud=pg_fetch_object(pg_query($conn, $qry_stud))) echo 'Fehler beim laden der Studenten'; @@ -196,7 +196,7 @@ { if((!is_null($row1->semester)) AND ($row1->semester != "") AND ($row1->semester<=$row->max_semester)) //($row1->semester<'10')) { - $qry_cnt = "SELECT count(*) as anzahl FROM campus.vw_student WHERE studiengang_kz='$row1->studiengang_kz' AND semester='$row1->semester'"; + $qry_cnt = "SELECT count(*) as anzahl FROM public.tbl_student WHERE studiengang_kz='$row1->studiengang_kz' AND semester='$row1->semester' AND student_uid NOT LIKE '_Dummy%'"; if(trim($row1->verband)!='') $qry_cnt .= " AND verband='$row1->verband'"; if(trim($row1->gruppe)!='') diff --git a/cis/private/tools/news_show.php b/cis/private/tools/news_show.php index b24a11649..c84ed54f7 100644 --- a/cis/private/tools/news_show.php +++ b/cis/private/tools/news_show.php @@ -78,7 +78,7 @@ $news = new news($sql_conn); if($news->delete($remove_id)) { - writeCISlog("DELETE","NEWS"); + writeCISlog('DELETE NEWS',''); echo '';