- Diverse kleinere Bugfixes Aufgrund der Errorlog Auswertung

- OE-Beitragsliste zeigt nun nur noch die Studenten an die aktuell den Status Student/Diplomand/Praktikant haben und das BIS-Melden Hackerl gesetzt haben
This commit is contained in:
Andreas Österreicher
2009-11-23 10:31:16 +00:00
parent 1f9b3fe3c3
commit 09c8cd1f7f
13 changed files with 165 additions and 112 deletions
+34
View File
@@ -408,4 +408,38 @@ function intersect($str1, $str2)
return $intersect;
}
function convertProblemChars($str)
{
$enc = 'UTF-8';
$acentos = array(
'A' => '/À|Á|Â|Ã|Å/',
'Ae' => '/Ä/',
'a' => '/à|á|â|ã|å/',
'ae'=> '/ä/',
'C' => '/Ç/',
'c' => '/ç/',
'E' => '/È|É|Ê|Ë/',
'e' => '/è|é|ê|ë/',
'I' => '/Ì|Í|Î|Ï/',
'i' => '/ì|í|î|ï/',
'N' => '/Ñ/',
'n' => '/ñ/',
'O' => '/Ò|Ó|Ô|Õ/',
'Oe' => '/&Ouml/',
'o' => '/ò|ó|ô|õ/',
'oe' => '/&ouml/',
'U' => '/Ù|Ú|Û/',
'Ue' => '/&Uuml/',
'u' => '/ù|ú|û/',
'ue' => '/&uuml/',
'Y' => '/Ý/',
'y' => '/ý|ÿ/',
'a.' => '/ª/',
'o.' => '/º/'
);
return preg_replace($acentos, array_keys($acentos), htmlentities($str,ENT_NOQUOTES, $enc));
}
?>
+1 -1
View File
@@ -523,7 +523,7 @@ class prestudent extends person
break;
case "prestudent":
if($studiensemester_kurzbz=='' || is_null($studiensemester_kurzbz))
$qry = "SELECT *, '' as status_kurzbz, '' as studiensemester_kurzbz, '' as ausbildungssemester, '' as datum FROM public.tbl_prestudent prestudent, public.tbl_person WHERE NOT EXISTS (select * from tbl_prestudentstatus WHERE prestudent_id=prestudent.prestudent_id) AND studiengang_kz='".addslashes($studiengang_kz)."' AND prestudent.person_id=tbl_person.person_id";
$qry = "SELECT *, '' as status_kurzbz, '' as studiensemester_kurzbz, '' as ausbildungssemester, '' as datum, tbl_person.anmerkung as anmerkungen, '' as orgform_kurzbz FROM public.tbl_prestudent prestudent, public.tbl_person WHERE NOT EXISTS (select * from tbl_prestudentstatus WHERE prestudent_id=prestudent.prestudent_id) AND studiengang_kz='".addslashes($studiengang_kz)."' AND prestudent.person_id=tbl_person.person_id";
else
$qry .= " AND a.rolle IN('Interessent', 'Bewerber', 'Aufgenommener', 'Wartender', 'Abgewiesener')";
break;