From 9d4327908902a02c7bc06122a4aa4bcb099deef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szabo=20M=C3=B3nika?= Date: Tue, 22 Nov 2022 10:03:40 +0100 Subject: [PATCH 1/2] Update studentenexportextended.xls.php mit Anmerkung erweitern --- .../statistik/studentenexportextended.xls.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/content/statistik/studentenexportextended.xls.php b/content/statistik/studentenexportextended.xls.php index e7940946b..1441d4cc9 100644 --- a/content/statistik/studentenexportextended.xls.php +++ b/content/statistik/studentenexportextended.xls.php @@ -179,6 +179,8 @@ $worksheet->write($zeile, ++$i, "RT_PUNKTE2", $format_bold); $maxlength[$i] = 10; $worksheet->write($zeile, ++$i, "RT_GESAMTPUNKTE", $format_bold); $maxlength[$i] = 18; +$worksheet->write($zeile,++$i,"ANMERKUNG", $format_bold); +$maxlength[$i]=30; $worksheet->write($zeile, ++$i, "PRIORITÄT", $format_bold); $maxlength[$i] = 8; @@ -660,6 +662,20 @@ function draw_content($row) $worksheet->write($zeile, $i, $row->rt_gesamtpunkte); $i++; + //Anmerkung + $qry_1 = "SELECT anmerkung FROM public.tbl_prestudent WHERE prestudent_id='".addslashes($row->prestudent_id)."' LIMIT 1"; + + if($db->db_query($qry_1)) + { + if($row_1 = $db->db_fetch_object()) + { + if(mb_strlen($row_1->anmerkung)>$maxlength[$i]) + $maxlength[$i]=mb_strlen($row_1->anmerkung); + + $worksheet->write($zeile,$i, $row_1->anmerkung); + } + } + $i++; //Priorisierung $prio = $prio_relativ.' ('.$row->priorisierung.')'; if (mb_strlen($prio) > $maxlength[$i]) From 817d2842ccd65e8729ab5c95c1a5c28fe419ea90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Tue, 22 Nov 2022 11:17:57 +0100 Subject: [PATCH 2/2] Changed Escaping of Parameter --- content/statistik/studentenexportextended.xls.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/statistik/studentenexportextended.xls.php b/content/statistik/studentenexportextended.xls.php index 1441d4cc9..81e51b53a 100644 --- a/content/statistik/studentenexportextended.xls.php +++ b/content/statistik/studentenexportextended.xls.php @@ -180,7 +180,7 @@ $maxlength[$i] = 10; $worksheet->write($zeile, ++$i, "RT_GESAMTPUNKTE", $format_bold); $maxlength[$i] = 18; $worksheet->write($zeile,++$i,"ANMERKUNG", $format_bold); -$maxlength[$i]=30; +$maxlength[$i]=30; $worksheet->write($zeile, ++$i, "PRIORITÄT", $format_bold); $maxlength[$i] = 8; @@ -661,17 +661,17 @@ function draw_content($row) $maxlength[$i] = mb_strlen($row->rt_gesamtpunkte); $worksheet->write($zeile, $i, $row->rt_gesamtpunkte); $i++; - + //Anmerkung - $qry_1 = "SELECT anmerkung FROM public.tbl_prestudent WHERE prestudent_id='".addslashes($row->prestudent_id)."' LIMIT 1"; + $qry_1 = "SELECT anmerkung FROM public.tbl_prestudent WHERE prestudent_id=".$db->db_add_param($row->prestudent_id)." LIMIT 1"; if($db->db_query($qry_1)) { if($row_1 = $db->db_fetch_object()) - { + { if(mb_strlen($row_1->anmerkung)>$maxlength[$i]) $maxlength[$i]=mb_strlen($row_1->anmerkung); - + $worksheet->write($zeile,$i, $row_1->anmerkung); } }