diff --git a/content/pdfExport.php b/content/pdfExport.php index 58382b0b4..057992a02 100644 --- a/content/pdfExport.php +++ b/content/pdfExport.php @@ -57,7 +57,7 @@ function clean_string($string) "ß" => "ss"); $string = strtr($string, $trans); - return ereg_replace("[^a-zA-Z0-9]", "", $string); + return mb_ereg_replace("[^a-zA-Z0-9]", "", $string); //[:space:] } diff --git a/include/tw/abgabe_lektor_benotung.php b/include/tw/abgabe_lektor_benotung.php index 9d7ce637e..68deb26ae 100644 --- a/include/tw/abgabe_lektor_benotung.php +++ b/include/tw/abgabe_lektor_benotung.php @@ -125,6 +125,7 @@ else $titel=mb_convert_encoding(trim($titel),'ISO-8859-15','UTF-8'); $titelpre=mb_convert_encoding(trim($titelpre),'ISO-8859-15','UTF-8'); $titelpost=mb_convert_encoding(trim($titelpost),'ISO-8859-15','UTF-8'); + $studiengang=mb_convert_encoding(trim($studiengang),'ISO-8859-15','UTF-8'); //Ausdruck generieren @@ -479,7 +480,7 @@ else -$sql_query = "SELECT * FROM (SELECT DISTINCT ON(tbl_projektarbeit.projektarbeit_id) tbl_studiengang.bezeichnung as stgbezeichnung, tbl_studiengang.typ as stgtyp, * +$sql_query = "SELECT *,(SELECT abgabedatum FROM campus.tbl_paabgabe WHERE projektarbeit_id='$projektarbeit_id' ORDER BY abgabedatum DESC LIMIT 1) as abgabedatum FROM (SELECT DISTINCT ON(tbl_projektarbeit.projektarbeit_id) tbl_studiengang.bezeichnung as stgbezeichnung, tbl_studiengang.typ as stgtyp, * FROM lehre.tbl_projektarbeit LEFT JOIN lehre.tbl_projektbetreuer using(projektarbeit_id) LEFT JOIN public.tbl_benutzer on(uid=student_uid) LEFT JOIN public.tbl_student on(tbl_benutzer.uid=tbl_student.student_uid) @@ -699,7 +700,7 @@ else $htmlstr .= "\n"; $htmlstr .= "\n"; $htmlstr .= "\n"; - $htmlstr .= "\n"; + $htmlstr .= "\n"; if($row->stgtyp=='b') { $stgtyp='Bachelor'; diff --git a/include/xslfo2pdf/fpdf/fpdf.php b/include/xslfo2pdf/fpdf/fpdf.php index 9bbffe4f6..034ff462e 100644 --- a/include/xslfo2pdf/fpdf/fpdf.php +++ b/include/xslfo2pdf/fpdf/fpdf.php @@ -907,7 +907,7 @@ if(!class_exists('FPDF')) } $type=strtolower($type); $mqr=get_magic_quotes_runtime(); - set_magic_quotes_runtime(0); + //set_magic_quotes_runtime(0); if($type=='jpg' || $type=='jpeg') $info=$this->_parsejpg($file); elseif($type=='png') @@ -920,7 +920,7 @@ if(!class_exists('FPDF')) $this->Error('Unsupported image type: '.$type); $info=$this->$mtd($file); } - set_magic_quotes_runtime($mqr); + //set_magic_quotes_runtime($mqr); $info['i']=count($this->images)+1; $this->images[$file]=$info; } @@ -1163,7 +1163,7 @@ if(!class_exists('FPDF')) $this->_out('endobj'); } $mqr=get_magic_quotes_runtime(); - set_magic_quotes_runtime(0); + //set_magic_quotes_runtime(0); foreach($this->FontFiles as $file=>$info) { //Font file embedding @@ -1201,7 +1201,7 @@ if(!class_exists('FPDF')) $this->_putstream($font); $this->_out('endobj'); } - set_magic_quotes_runtime($mqr); + //set_magic_quotes_runtime($mqr); foreach($this->fonts as $k=>$font) { //Font objects