diff --git a/cis/private/lehre/abgabe_student.php b/cis/private/lehre/abgabe_student.php index 20311ea90..5935ad69c 100644 --- a/cis/private/lehre/abgabe_student.php +++ b/cis/private/lehre/abgabe_student.php @@ -88,11 +88,16 @@ $htmlstr = ''; $htmlstr1 = ''; $vorname=''; $nachname=''; +$zweitbetreuer = ''; $sql_query = "SELECT (SELECT nachname FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS bnachname, (SELECT vorname FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS bvorname, (SELECT titelpre FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS btitelpre, (SELECT titelpost FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS btitelpost, + (SELECT person_id FROM lehre.tbl_projektbetreuer WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id + AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_person_id, + (SELECT betreuerart_kurzbz FROM lehre.tbl_projektbetreuer WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id + AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_betreuerart_kurzbz, tbl_projektbetreuer.person_id AS betreuer_person_id, tbl_projekttyp.bezeichnung AS prjbez, * FROM lehre.tbl_projektarbeit @@ -127,18 +132,25 @@ else ".$p->t('abgabetool/betreuer')." ".$p->t('abgabetool/typ')." ".$p->t('abgabetool/titel')." - ".$p->t('abgabetool/betreuerart').""; + "; $htmlstr .= "\n"; $i = 0; while($row=$db->db_fetch_object($erg)) { - $htmlstr1=''; + $htmlstr1 = ''; + $zweitbetreuer_obj = new person(); + if ($zweitbetreuer_obj->load($row->zweitbetreuer_person_id)) + { + $zweitbetreuer = ', '.$db->convert_html_chars($row->zweitbetreuer_betreuerart_kurzbz).': '.$zweitbetreuer_obj->titelpre.' '.$zweitbetreuer_obj->vorname.' '.$zweitbetreuer_obj->nachname.' '.$zweitbetreuer_obj->titelpost; + } + $htmlstr1 = ''.$db->convert_html_chars($row->betreuerart_kurzbz).': '; $vorname=$row->vorname; $nachname=$row->nachname; $uid=$row->uid; - ($row->btitelpre!=''?$htmlstr1 = $row->btitelpre.' ':$htmlstr1 .= ''); + ($row->btitelpre!=''?$htmlstr1 .= $row->btitelpre.' ':$htmlstr1 .= ''); $htmlstr1 .= $row->bvorname.' '.$row->bnachname; ($row->btitelpost!=''?$htmlstr1 .= ' '.$row->btitelpost:$htmlstr1 .= ''); + $htmlstr1 .= $zweitbetreuer; $htmlstr .= " \n"; //class='liste".($i%2)."' $htmlstr .= " ".$p->t('abgabetool/upload')."\n"; $htmlstr .= " ".$row->studiensemester_kurzbz."\n"; @@ -164,7 +176,7 @@ else $htmlstr .= " ".$htmlstr1." \n"; $htmlstr .= " ".$db->convert_html_chars($row->prjbez)."\n"; $htmlstr .= " ".$db->convert_html_chars($row->titel)."\n"; - $htmlstr .= " ".$db->convert_html_chars($row->betreuerart_kurzbz)."\n"; +// $htmlstr .= " ".$db->convert_html_chars($row->betreuerart_kurzbz)."\n"; $htmlstr .= " \n"; $i++; } diff --git a/skin/images/TWLogo_klein.png b/skin/images/TWLogo_klein.png deleted file mode 100644 index 0b834921b..000000000 Binary files a/skin/images/TWLogo_klein.png and /dev/null differ diff --git a/skin/images/ampel_rot.gif b/skin/images/ampel_rot.gif deleted file mode 100644 index b3a0b95b5..000000000 Binary files a/skin/images/ampel_rot.gif and /dev/null differ diff --git a/skin/images/blank.png b/skin/images/blank.png deleted file mode 100644 index 75435d3b8..000000000 Binary files a/skin/images/blank.png and /dev/null differ diff --git a/skin/images/bullet_arrow_bottom.png b/skin/images/bullet_arrow_bottom.png deleted file mode 100644 index 1a28d8250..000000000 Binary files a/skin/images/bullet_arrow_bottom.png and /dev/null differ diff --git a/skin/images/bullet_arrow_top.png b/skin/images/bullet_arrow_top.png deleted file mode 100644 index 0ce86d2b2..000000000 Binary files a/skin/images/bullet_arrow_top.png and /dev/null differ diff --git a/skin/images/bullet_black.png b/skin/images/bullet_black.png deleted file mode 100644 index 57619706d..000000000 Binary files a/skin/images/bullet_black.png and /dev/null differ diff --git a/skin/images/bullet_blue.png b/skin/images/bullet_blue.png deleted file mode 100644 index a7651ec8a..000000000 Binary files a/skin/images/bullet_blue.png and /dev/null differ diff --git a/skin/images/bullet_orange.png b/skin/images/bullet_orange.png deleted file mode 100644 index fa63024e5..000000000 Binary files a/skin/images/bullet_orange.png and /dev/null differ diff --git a/skin/images/button_dl.jpg b/skin/images/button_dl.jpg deleted file mode 100644 index 6e6f3b4df..000000000 Binary files a/skin/images/button_dl.jpg and /dev/null differ diff --git a/skin/images/button_endnote.jpg b/skin/images/button_endnote.jpg deleted file mode 100644 index 8e963be95..000000000 Binary files a/skin/images/button_endnote.jpg and /dev/null differ diff --git a/skin/images/button_fb.jpg b/skin/images/button_fb.jpg deleted file mode 100644 index 1dce09417..000000000 Binary files a/skin/images/button_fb.jpg and /dev/null differ diff --git a/skin/images/button_i.jpg b/skin/images/button_i.jpg deleted file mode 100644 index 26477534d..000000000 Binary files a/skin/images/button_i.jpg and /dev/null differ diff --git a/skin/images/button_kt.jpg b/skin/images/button_kt.jpg deleted file mode 100644 index 1751fc504..000000000 Binary files a/skin/images/button_kt.jpg and /dev/null differ diff --git a/skin/images/button_lb.jpg b/skin/images/button_lb.jpg deleted file mode 100644 index 02c3e24e6..000000000 Binary files a/skin/images/button_lb.jpg and /dev/null differ diff --git a/skin/images/button_lv-info.jpg b/skin/images/button_lv-info.jpg deleted file mode 100644 index f9b15ea14..000000000 Binary files a/skin/images/button_lv-info.jpg and /dev/null differ diff --git a/skin/images/button_lv.jpg b/skin/images/button_lv.jpg deleted file mode 100644 index 5f7aa0cb6..000000000 Binary files a/skin/images/button_lv.jpg and /dev/null differ diff --git a/skin/images/button_moodle.jpg b/skin/images/button_moodle.jpg deleted file mode 100644 index 8e228a0a0..000000000 Binary files a/skin/images/button_moodle.jpg and /dev/null differ diff --git a/skin/images/button_ng.jpg b/skin/images/button_ng.jpg deleted file mode 100644 index d8b97e8f6..000000000 Binary files a/skin/images/button_ng.jpg and /dev/null differ diff --git a/skin/images/button_semplan.jpg b/skin/images/button_semplan.jpg deleted file mode 100644 index ee7307120..000000000 Binary files a/skin/images/button_semplan.jpg and /dev/null differ diff --git a/skin/images/button_termplan.jpg b/skin/images/button_termplan.jpg deleted file mode 100644 index 02c3e24e6..000000000 Binary files a/skin/images/button_termplan.jpg and /dev/null differ diff --git a/skin/images/button_test.jpg b/skin/images/button_test.jpg deleted file mode 100644 index a4ef3fc65..000000000 Binary files a/skin/images/button_test.jpg and /dev/null differ diff --git a/skin/images/button_ul.jpg b/skin/images/button_ul.jpg deleted file mode 100644 index 0fcf74f38..000000000 Binary files a/skin/images/button_ul.jpg and /dev/null differ diff --git a/skin/images/cis-screenshot.png b/skin/images/cis-screenshot.png deleted file mode 100644 index b005fe163..000000000 Binary files a/skin/images/cis-screenshot.png and /dev/null differ diff --git a/skin/images/crossline_l.gif b/skin/images/crossline_l.gif deleted file mode 100644 index de48e8041..000000000 Binary files a/skin/images/crossline_l.gif and /dev/null differ diff --git a/skin/images/crossline_r.gif b/skin/images/crossline_r.gif deleted file mode 100644 index c0c94fca2..000000000 Binary files a/skin/images/crossline_r.gif and /dev/null differ diff --git a/skin/images/csv-symbol.gif b/skin/images/csv-symbol.gif deleted file mode 100644 index a4891ad5e..000000000 Binary files a/skin/images/csv-symbol.gif and /dev/null differ diff --git a/skin/images/csv.gif b/skin/images/csv.gif deleted file mode 100644 index 8579a565d..000000000 Binary files a/skin/images/csv.gif and /dev/null differ diff --git a/skin/images/csv.ico b/skin/images/csv.ico deleted file mode 100644 index 9100c46bc..000000000 Binary files a/skin/images/csv.ico and /dev/null differ diff --git a/skin/images/docxpic.gif b/skin/images/docxpic.gif deleted file mode 100644 index efc768b5a..000000000 Binary files a/skin/images/docxpic.gif and /dev/null differ diff --git a/skin/images/dotpic.gif b/skin/images/dotpic.gif deleted file mode 100644 index a090d6a4c..000000000 Binary files a/skin/images/dotpic.gif and /dev/null differ diff --git a/skin/images/dummy.gif b/skin/images/dummy.gif deleted file mode 100644 index d36072c6a..000000000 Binary files a/skin/images/dummy.gif and /dev/null differ diff --git a/skin/images/edit-clear.png b/skin/images/edit-clear.png deleted file mode 100644 index 5542948bc..000000000 Binary files a/skin/images/edit-clear.png and /dev/null differ diff --git a/skin/images/edit-metadata.png b/skin/images/edit-metadata.png deleted file mode 100644 index 9b64d2163..000000000 Binary files a/skin/images/edit-metadata.png and /dev/null differ diff --git a/skin/images/edit.gif b/skin/images/edit.gif deleted file mode 100644 index a37821c20..000000000 Binary files a/skin/images/edit.gif and /dev/null differ diff --git a/skin/images/edit_trash.png b/skin/images/edit_trash.png deleted file mode 100644 index 88b2ddfe0..000000000 Binary files a/skin/images/edit_trash.png and /dev/null differ diff --git a/skin/images/emblem-system.png b/skin/images/emblem-system.png deleted file mode 100644 index abac7e910..000000000 Binary files a/skin/images/emblem-system.png and /dev/null differ diff --git a/skin/images/error_go.png b/skin/images/error_go.png deleted file mode 100644 index caa1838d7..000000000 Binary files a/skin/images/error_go.png and /dev/null differ diff --git a/skin/images/false-27.png b/skin/images/false-27.png deleted file mode 100644 index a0426d553..000000000 Binary files a/skin/images/false-27.png and /dev/null differ diff --git a/skin/images/false.gif b/skin/images/false.gif deleted file mode 100644 index 6b4b0f920..000000000 Binary files a/skin/images/false.gif and /dev/null differ diff --git a/skin/images/false_red.png b/skin/images/false_red.png deleted file mode 100644 index ca31b0aea..000000000 Binary files a/skin/images/false_red.png and /dev/null differ diff --git a/skin/images/fas-screenshot.png b/skin/images/fas-screenshot.png deleted file mode 100644 index 7da4e25fd..000000000 Binary files a/skin/images/fas-screenshot.png and /dev/null differ diff --git a/skin/images/fas_logo_weiss.png b/skin/images/fas_logo_weiss.png deleted file mode 100644 index 052885ddd..000000000 Binary files a/skin/images/fas_logo_weiss.png and /dev/null differ diff --git a/skin/images/fas_online_logo.png b/skin/images/fas_online_logo.png deleted file mode 100644 index 9a05b22df..000000000 Binary files a/skin/images/fas_online_logo.png and /dev/null differ diff --git a/skin/images/fentry.gif b/skin/images/fentry.gif deleted file mode 100644 index 3f6f6b679..000000000 Binary files a/skin/images/fentry.gif and /dev/null differ diff --git a/skin/images/fhcomplete.bmp b/skin/images/fhcomplete.bmp deleted file mode 100644 index 7ecd1e432..000000000 Binary files a/skin/images/fhcomplete.bmp and /dev/null differ diff --git a/skin/images/fhcomplete_250px.png b/skin/images/fhcomplete_250px.png deleted file mode 100644 index a224de8c9..000000000 Binary files a/skin/images/fhcomplete_250px.png and /dev/null differ diff --git a/skin/images/flagge-aut.gif b/skin/images/flagge-aut.gif deleted file mode 100644 index 7d93a9a07..000000000 Binary files a/skin/images/flagge-aut.gif and /dev/null differ diff --git a/skin/images/flagge-eng.gif b/skin/images/flagge-eng.gif deleted file mode 100644 index 54ce4508a..000000000 Binary files a/skin/images/flagge-eng.gif and /dev/null differ diff --git a/skin/images/folder.png b/skin/images/folder.png deleted file mode 100644 index 0171b09fa..000000000 Binary files a/skin/images/folder.png and /dev/null differ diff --git a/skin/images/header_left.png b/skin/images/header_left.png deleted file mode 100644 index c4223e69d..000000000 Binary files a/skin/images/header_left.png and /dev/null differ diff --git a/skin/images/header_right.png b/skin/images/header_right.png deleted file mode 100644 index 3971aa272..000000000 Binary files a/skin/images/header_right.png and /dev/null differ diff --git a/skin/images/hourglass.png b/skin/images/hourglass.png deleted file mode 100644 index 61b4018cf..000000000 Binary files a/skin/images/hourglass.png and /dev/null differ diff --git a/skin/images/house_go.png b/skin/images/house_go.png deleted file mode 100644 index 5457dbd3c..000000000 Binary files a/skin/images/house_go.png and /dev/null differ diff --git a/skin/images/icon-minus.png b/skin/images/icon-minus.png deleted file mode 100644 index 04b217c9f..000000000 Binary files a/skin/images/icon-minus.png and /dev/null differ diff --git a/skin/images/icon-plus.png b/skin/images/icon-plus.png deleted file mode 100644 index b87a0e3cb..000000000 Binary files a/skin/images/icon-plus.png and /dev/null differ diff --git a/skin/images/icon-plus_light.png b/skin/images/icon-plus_light.png deleted file mode 100644 index 4ef5407d9..000000000 Binary files a/skin/images/icon-plus_light.png and /dev/null differ diff --git a/skin/images/icon_delete.gif b/skin/images/icon_delete.gif deleted file mode 100644 index cdbc15a69..000000000 Binary files a/skin/images/icon_delete.gif and /dev/null differ diff --git a/skin/images/icon_voransicht.gif b/skin/images/icon_voransicht.gif deleted file mode 100644 index b213f90ee..000000000 Binary files a/skin/images/icon_voransicht.gif and /dev/null differ diff --git a/skin/images/image_legend0.gif b/skin/images/image_legend0.gif deleted file mode 100644 index e6fac5a12..000000000 Binary files a/skin/images/image_legend0.gif and /dev/null differ diff --git a/skin/images/imgpic.gif b/skin/images/imgpic.gif deleted file mode 100644 index c2f786daf..000000000 Binary files a/skin/images/imgpic.gif and /dev/null differ diff --git a/skin/images/ko.gif b/skin/images/ko.gif deleted file mode 100644 index 16075a465..000000000 Binary files a/skin/images/ko.gif and /dev/null differ diff --git a/skin/images/latex.png b/skin/images/latex.png deleted file mode 100644 index 5287e6664..000000000 Binary files a/skin/images/latex.png and /dev/null differ diff --git a/skin/images/logo2.jpg b/skin/images/logo2.jpg deleted file mode 100644 index db432e716..000000000 Binary files a/skin/images/logo2.jpg and /dev/null differ diff --git a/skin/images/logo_sfu.jpg b/skin/images/logo_sfu.jpg deleted file mode 100644 index 160645f65..000000000 Binary files a/skin/images/logo_sfu.jpg and /dev/null differ diff --git a/skin/images/logo_sfu.png b/skin/images/logo_sfu.png deleted file mode 100644 index bae0b5da6..000000000 Binary files a/skin/images/logo_sfu.png and /dev/null differ diff --git a/skin/images/logout.gif b/skin/images/logout.gif deleted file mode 100644 index b538d8ef0..000000000 Binary files a/skin/images/logout.gif and /dev/null differ diff --git a/skin/images/lorry.png b/skin/images/lorry.png deleted file mode 100644 index 8f95f5a5d..000000000 Binary files a/skin/images/lorry.png and /dev/null differ diff --git a/skin/images/lorry_go.png b/skin/images/lorry_go.png deleted file mode 100644 index 1c296a6aa..000000000 Binary files a/skin/images/lorry_go.png and /dev/null differ diff --git a/skin/images/lorry_link.png b/skin/images/lorry_link.png deleted file mode 100644 index 5e6663e5c..000000000 Binary files a/skin/images/lorry_link.png and /dev/null differ diff --git a/skin/images/mailverteiler.jpg b/skin/images/mailverteiler.jpg deleted file mode 100644 index 15dcfbc51..000000000 Binary files a/skin/images/mailverteiler.jpg and /dev/null differ diff --git a/skin/images/menu_bg.jpg b/skin/images/menu_bg.jpg deleted file mode 100644 index f75787dbe..000000000 Binary files a/skin/images/menu_bg.jpg and /dev/null differ diff --git a/skin/images/moreleft.gif b/skin/images/moreleft.gif deleted file mode 100644 index 6be286ead..000000000 Binary files a/skin/images/moreleft.gif and /dev/null differ diff --git a/skin/images/moreright.gif b/skin/images/moreright.gif deleted file mode 100644 index cfa6d2c80..000000000 Binary files a/skin/images/moreright.gif and /dev/null differ diff --git a/skin/images/musik.gif b/skin/images/musik.gif deleted file mode 100644 index 76f861ea7..000000000 Binary files a/skin/images/musik.gif and /dev/null differ diff --git a/skin/images/nein.png b/skin/images/nein.png deleted file mode 100644 index 1514d51a3..000000000 Binary files a/skin/images/nein.png and /dev/null differ diff --git a/skin/images/network-workgroup.png b/skin/images/network-workgroup.png deleted file mode 100644 index 4137b3c3b..000000000 Binary files a/skin/images/network-workgroup.png and /dev/null differ diff --git a/skin/images/ok.gif b/skin/images/ok.gif deleted file mode 100644 index 9315b8f9e..000000000 Binary files a/skin/images/ok.gif and /dev/null differ diff --git a/skin/images/outlook.gif b/skin/images/outlook.gif deleted file mode 100644 index e75ff495a..000000000 Binary files a/skin/images/outlook.gif and /dev/null differ diff --git a/skin/images/outlook.ico b/skin/images/outlook.ico deleted file mode 100644 index bc136896c..000000000 Binary files a/skin/images/outlook.ico and /dev/null differ diff --git a/skin/images/pdfs.jpg b/skin/images/pdfs.jpg deleted file mode 100644 index 32d0fc6c0..000000000 Binary files a/skin/images/pdfs.jpg and /dev/null differ diff --git a/skin/images/phone.png b/skin/images/phone.png deleted file mode 100644 index c39f162f8..000000000 Binary files a/skin/images/phone.png and /dev/null differ diff --git a/skin/images/picpic.gif b/skin/images/picpic.gif deleted file mode 100644 index 4ee3202d6..000000000 Binary files a/skin/images/picpic.gif and /dev/null differ diff --git a/skin/images/potpic.gif b/skin/images/potpic.gif deleted file mode 100644 index 328ca8ddb..000000000 Binary files a/skin/images/potpic.gif and /dev/null differ diff --git a/skin/images/pptpic.gif b/skin/images/pptpic.gif deleted file mode 100644 index 54cd11d26..000000000 Binary files a/skin/images/pptpic.gif and /dev/null differ diff --git a/skin/images/printbutton.gif b/skin/images/printbutton.gif deleted file mode 100644 index e9bafc20e..000000000 Binary files a/skin/images/printbutton.gif and /dev/null differ diff --git a/skin/images/ps_logo_weiss.png b/skin/images/ps_logo_weiss.png deleted file mode 100644 index 6d01bb0d8..000000000 Binary files a/skin/images/ps_logo_weiss.png and /dev/null differ diff --git a/skin/images/question_mark.png b/skin/images/question_mark.png deleted file mode 100644 index 1d670e4c2..000000000 Binary files a/skin/images/question_mark.png and /dev/null differ diff --git a/skin/images/simulate.gif b/skin/images/simulate.gif deleted file mode 100644 index cd3615a68..000000000 Binary files a/skin/images/simulate.gif and /dev/null differ diff --git a/skin/images/superfish-arrows-ffffff.png b/skin/images/superfish-arrows-ffffff.png deleted file mode 100644 index 995df5206..000000000 Binary files a/skin/images/superfish-arrows-ffffff.png and /dev/null differ diff --git a/skin/images/superfish-shadow.png b/skin/images/superfish-shadow.png deleted file mode 100644 index c04d21b76..000000000 Binary files a/skin/images/superfish-shadow.png and /dev/null differ diff --git a/skin/images/system-software-update.png b/skin/images/system-software-update.png deleted file mode 100644 index 470b5d46f..000000000 Binary files a/skin/images/system-software-update.png and /dev/null differ diff --git a/skin/images/system-users.png b/skin/images/system-users.png deleted file mode 100644 index 749c825e0..000000000 Binary files a/skin/images/system-users.png and /dev/null differ diff --git a/skin/images/tab_blue.png b/skin/images/tab_blue.png deleted file mode 100644 index 48f78b5d4..000000000 Binary files a/skin/images/tab_blue.png and /dev/null differ diff --git a/skin/images/table_row_delete.png b/skin/images/table_row_delete.png deleted file mode 100644 index 54c69691e..000000000 Binary files a/skin/images/table_row_delete.png and /dev/null differ diff --git a/skin/images/table_row_insert.png b/skin/images/table_row_insert.png deleted file mode 100644 index ff5925efd..000000000 Binary files a/skin/images/table_row_insert.png and /dev/null differ diff --git a/skin/images/telephone.png b/skin/images/telephone.png deleted file mode 100644 index cecc436fb..000000000 Binary files a/skin/images/telephone.png and /dev/null differ diff --git a/skin/images/tempus-screenshot.png b/skin/images/tempus-screenshot.png deleted file mode 100644 index d4543aa8f..000000000 Binary files a/skin/images/tempus-screenshot.png and /dev/null differ diff --git a/skin/images/texpic.jpg b/skin/images/texpic.jpg deleted file mode 100644 index 542235972..000000000 Binary files a/skin/images/texpic.jpg and /dev/null differ diff --git a/skin/images/true-27.png b/skin/images/true-27.png deleted file mode 100644 index db8cdaa76..000000000 Binary files a/skin/images/true-27.png and /dev/null differ diff --git a/skin/images/true.gif b/skin/images/true.gif deleted file mode 100644 index 9787addd0..000000000 Binary files a/skin/images/true.gif and /dev/null differ diff --git a/skin/images/true_green.png b/skin/images/true_green.png deleted file mode 100644 index b1628ee7f..000000000 Binary files a/skin/images/true_green.png and /dev/null differ diff --git a/skin/images/tw_logo_01.jpg b/skin/images/tw_logo_01.jpg deleted file mode 100644 index 096cb6539..000000000 Binary files a/skin/images/tw_logo_01.jpg and /dev/null differ diff --git a/skin/images/tw_logo_weiss.png b/skin/images/tw_logo_weiss.png deleted file mode 100644 index 59214d96b..000000000 Binary files a/skin/images/tw_logo_weiss.png and /dev/null differ diff --git a/skin/images/uebung_copy.jpg b/skin/images/uebung_copy.jpg deleted file mode 100644 index ce9791db8..000000000 Binary files a/skin/images/uebung_copy.jpg and /dev/null differ diff --git a/skin/images/upload.jpg b/skin/images/upload.jpg deleted file mode 100644 index 8c28e33ea..000000000 Binary files a/skin/images/upload.jpg and /dev/null differ diff --git a/skin/images/user-trash-full.png b/skin/images/user-trash-full.png deleted file mode 100644 index 462ef399d..000000000 Binary files a/skin/images/user-trash-full.png and /dev/null differ diff --git a/skin/images/user_add.png b/skin/images/user_add.png deleted file mode 100644 index deae99bcf..000000000 Binary files a/skin/images/user_add.png and /dev/null differ diff --git a/skin/images/viewdok.gif b/skin/images/viewdok.gif deleted file mode 100644 index 8b31a78c5..000000000 Binary files a/skin/images/viewdok.gif and /dev/null differ diff --git a/skin/images/vilesci-screenshot.png b/skin/images/vilesci-screenshot.png deleted file mode 100644 index c3ec87ccf..000000000 Binary files a/skin/images/vilesci-screenshot.png and /dev/null differ diff --git a/skin/images/word2007.jpg b/skin/images/word2007.jpg deleted file mode 100644 index 7c387bf26..000000000 Binary files a/skin/images/word2007.jpg and /dev/null differ diff --git a/skin/images/x-office-presentation.png b/skin/images/x-office-presentation.png deleted file mode 100644 index 047355c7d..000000000 Binary files a/skin/images/x-office-presentation.png and /dev/null differ diff --git a/skin/images/xlspic.gif b/skin/images/xlspic.gif deleted file mode 100644 index 6c8b2afed..000000000 Binary files a/skin/images/xlspic.gif and /dev/null differ diff --git a/skin/images/xml.png b/skin/images/xml.png deleted file mode 100644 index b823f8013..000000000 Binary files a/skin/images/xml.png and /dev/null differ diff --git a/skin/images/zippic.gif b/skin/images/zippic.gif deleted file mode 100644 index 3af93f229..000000000 Binary files a/skin/images/zippic.gif and /dev/null differ diff --git a/skin/images/zippic.jpg b/skin/images/zippic.jpg deleted file mode 100644 index 09608727a..000000000 Binary files a/skin/images/zippic.jpg and /dev/null differ diff --git a/vilesci/lehre/einheit_det.php b/vilesci/lehre/einheit_det.php index 3487bfa2a..5966e0af1 100644 --- a/vilesci/lehre/einheit_det.php +++ b/vilesci/lehre/einheit_det.php @@ -47,27 +47,33 @@ if(empty($kurzbz)) if (isset($_POST['new'])) { - if(!$rechte->isBerechtigt('lehre/gruppe',null,'sui')) - die($rechte->errormsg); - - $e = new benutzergruppe(); - $uid = $_POST['uid']; - if (!$e->load($uid, $kurzbz)) - { - $e->new=true; - $e->gruppe_kurzbz = $kurzbz; - $e->updateamum = date('Y-m-d H:i:s'); - $e->updatevon = $user; - $e->insertamum = date('Y-m-d H:i:s'); - $e->insertvon = $user; - $e->uid = $uid; - if(!$e->save()) - die($e->errormsg); + $benutzer = new benutzer(); + if ($benutzer->load($_POST['uid'])) + { + if(!$rechte->isBerechtigt('lehre/gruppe',null,'sui')) + die($rechte->errormsg); + + $e = new benutzergruppe(); + $uid = $_POST['uid']; + if (!$e->load($uid, $kurzbz)) + { + $e->new=true; + $e->gruppe_kurzbz = $kurzbz; + $e->updateamum = date('Y-m-d H:i:s'); + $e->updatevon = $user; + $e->insertamum = date('Y-m-d H:i:s'); + $e->insertvon = $user; + $e->uid = $uid; + if(!$e->save()) + die($e->errormsg); + } + else + { + $errormsg = 'Diese Person ist bereits der Gruppe zugeteilt'; + } } else - { - $errormsg = 'Diese Person ist bereits der Gruppe zugeteilt'; - } + $errormsg = 'UID '.$_POST['uid'].' wurde nicht gefunden'; } else if (isset($_GET['type']) && $_GET['type']=='delete') { @@ -80,7 +86,7 @@ else if (isset($_GET['type']) && $_GET['type']=='delete') $gruppe = new gruppe(); if(!$gruppe->load($kurzbz)) - die('Gruppe wurde nicht gefunden:'+$kurzbz); + die('Gruppe wurde nicht gefunden:'+$kurzbz); ?> @@ -109,7 +115,7 @@ if(!$gruppe->generiert) echo '
Name: - + diff --git a/vilesci/stammdaten/dokumentvorlagen_verwaltung.php b/vilesci/stammdaten/dokumentvorlagen_verwaltung.php index f21e4d802..51e1e54b8 100644 --- a/vilesci/stammdaten/dokumentvorlagen_verwaltung.php +++ b/vilesci/stammdaten/dokumentvorlagen_verwaltung.php @@ -55,25 +55,16 @@ if(!$rechte->isBerechtigt('basis/dokumente')) die($rechte->errormsg); } -echo ' - +echo ' Dokumentvorlagen Verwaltung + + - - - - - - - - - - - +