From 43c8dfa3c6aa0d1f9dae6786fb3a5ad1e54d4b7b Mon Sep 17 00:00:00 2001 From: Andreas Oesterreicher Date: Wed, 19 Dec 2018 15:43:26 +0100 Subject: [PATCH 1/7] =?UTF-8?q?Problem=20behoben=20bei=20DropAufLehrstunde?= =?UTF-8?q?=20wodruch=20die=20Blockung=20nicht=20immer=20korrekt=20=C3=BCb?= =?UTF-8?q?ernommen=20wurde?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/dragboard.js.php | 46 ++++++++++++------------ content/lvplanung/timetable-week.xul.php | 4 +-- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/content/dragboard.js.php b/content/dragboard.js.php index 06ac6bd70..18a8d6186 100644 --- a/content/dragboard.js.php +++ b/content/dragboard.js.php @@ -89,7 +89,7 @@ var studentDDObserver= { onDragStart: function (evt,transferData,action) { - + var tree = document.getElementById('student-tree') var row = { } var col = { } @@ -106,7 +106,7 @@ var studentDDObserver= var end = new Object(); var numRanges = tree.view.selection.getRangeCount(); var paramList= ''; - + for (var t = 0; t < numRanges; t++) { tree.view.selection.getRangeAt(t,start,end); @@ -122,7 +122,7 @@ var studentDDObserver= paramList += ';'+uid; } } - + transferData.data=new TransferData(); transferData.data.addDataForFlavour("application/tempus-student",paramList); } @@ -298,7 +298,7 @@ var LektorFunktionDDObserver= alert('Mitarbeiter kann nur auf einen Studiengang gezogen werden'); return false; } - + uid=dropdata.data; var req = new phpRequest('tempusDBDML.php','',''); @@ -421,11 +421,11 @@ var listObserver= var paramList="?dragtype="+type+"&dragdatum="+dragdatum+"&pers_uid="+pers_uid+"&stg_kz="+stg_kz+"&sem="+sem+"&ver="+ver+"&grp="+grp+"&einheit="+einheit+"&old_ort="+old_ort+idList+"&aktion="+aktion; idList = TimeTableWeekGetMarkedIdList(); paramList = paramList+idList; - + //die Buttons die verschoben werden grau einfaerben var styleNow=evt.target.getAttribute("style"); evt.target.setAttribute("style",styleNow+"color:gray;"); - + var items = document.getElementsByTagName('button'); for each(var button in items) { @@ -439,8 +439,8 @@ var listObserver= } } } - - + + transferData.data=new TransferData(); transferData.data.addDataForFlavour("application/tempus-lehrstunde",paramList); } @@ -545,7 +545,7 @@ var boardObserver= } else if(evt.target.tagName=="button") { - + if(getvariable('allow_lehrstunde_drop')=='true') { // Wenn direkt auf die Stunde gezogen wird, wird der Raum uebernommen und die unr gleich gesetzt @@ -579,7 +579,7 @@ var boardObserver= url+="&new_ort="+new_ort+"&kollisionsanzahl="+kollisionsanzahl; else url+="&aktion=stpl_move"; - + if(new_unr) url+="&new_unr="+new_unr; if(new_blockung) @@ -617,8 +617,8 @@ function getNewBlockung(item) buttonunr=button.getAttribute('unr'); buttonwochentag=button.getAttribute('wochentag'); buttonstunde=button.getAttribute('stunde'); - - if(buttonunr==unr && buttonwochentag==wochentag && buttonstunde>stunde) + + if(buttonunr==unr && buttonwochentag==wochentag && parseInt(buttonstunde)>parseInt(stunde)) { blockung=blockung+1; } @@ -666,40 +666,40 @@ var verbandtreeDDObserver= var row = { } var col = { } var child = { } - + tree.treeBoxObject.getCellAt(evt.pageX, evt.pageY, row, col, child) - + if(row.value!=-1) //Drop on Row { //Ziel holen col = tree.columns ? tree.columns["gruppe"] : "gruppe"; gruppe_kurzbz=tree.view.getCellText(row.value,col); - + col = tree.columns ? tree.columns["stg_kz"] : "stg_kz"; stg_kz=tree.view.getCellText(row.value,col); - + col = tree.columns ? tree.columns["sem"] : "sem"; sem=tree.view.getCellText(row.value,col); - + col = tree.columns ? tree.columns["ver"] : "ver"; ver=tree.view.getCellText(row.value,col); - + col = tree.columns ? tree.columns["grp"] : "grp"; grp=tree.view.getCellText(row.value,col); } else return false; - + if(gruppe_kurzbz=='' && sem=='') { alert('Zuteilung ist nur zu Spezial- oder Lehrverbandsgruppen moeglich'); return false; } - + uid=dropdata.data; - + var req = new phpRequest('student/studentDBDML.php','',''); - + req.add('type','gruppenzuteilung'); req.add('uid', uid); @@ -708,7 +708,7 @@ var verbandtreeDDObserver= req.add('semester', sem); req.add('verband', ver); req.add('gruppe', grp); - + var response = req.executePOST(); var val = new ParseReturnValue(response) diff --git a/content/lvplanung/timetable-week.xul.php b/content/lvplanung/timetable-week.xul.php index 59b889e83..fdbf24e32 100644 --- a/content/lvplanung/timetable-week.xul.php +++ b/content/lvplanung/timetable-week.xul.php @@ -595,7 +595,7 @@ elseif ($aktion=='lva_stpl_del_multi' || $aktion=='lva_stpl_del_single') { if($rechte->isBerechtigt('lehre/lvplan',null,'uid')) { - $result_semester = $db->db_query("SELECT start,ende FROM public.tbl_studiensemester WHERE studiensemester_kurzbz='".addslashes($semester_aktuell)."';"); + $result_semester = $db->db_query("SELECT start,ende FROM public.tbl_studiensemester WHERE studiensemester_kurzbz=".$db->db_add_param($semester_aktuell).";"); if ($db->db_num_rows()>0) { $start=date('Y-m-d',$datum); @@ -643,7 +643,7 @@ if (!isset($semesterplan) || !$semesterplan) $begin=$ende=$datum; else { - $db->db_query("SELECT start,ende FROM public.tbl_studiensemester WHERE studiensemester_kurzbz='".addslashes($semester_aktuell)."';"); + $db->db_query("SELECT start,ende FROM public.tbl_studiensemester WHERE studiensemester_kurzbz=".$db->db_add_param($semester_aktuell).";"); if ($db->db_num_rows()>0) { $row = $db->db_fetch_object(); From b97f540fc1cb45a20428d91c60062356e748dca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Wed, 19 Dec 2018 16:44:22 +0100 Subject: [PATCH 2/7] =?UTF-8?q?Fehler=20beim=20Zusammenlegen=20von=20Perso?= =?UTF-8?q?nen=20behoben=20der=20dazu=20f=C3=BChrte,=20dass=20nach=20dem?= =?UTF-8?q?=20Zusammenlegen=20kein=20Profilfoto=20mehr=20vorhanden=20ist.?= =?UTF-8?q?=20Das=20Problem=20trat=20nur=20auf,=20wenn=20bei=20beiden=20Pe?= =?UTF-8?q?rsonen=20ein=20Foto=20vorhanden=20ist.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vilesci/stammdaten/personen_wartung.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vilesci/stammdaten/personen_wartung.php b/vilesci/stammdaten/personen_wartung.php index 12f13ed12..9f695f718 100644 --- a/vilesci/stammdaten/personen_wartung.php +++ b/vilesci/stammdaten/personen_wartung.php @@ -207,14 +207,14 @@ if (isset($personToDelete) && isset($personToKeep) && $personToDelete >= 0 && $p elseif ($personToDelete_obj->foto != '' && $personToKeep_obj->foto != '') { $akte1 = new akte(); - $akte1->getAkten($personToDelete, 'Lichtbil'); + $akte1->getAkten($personToDelete, 'Lichtbil', null, null, true); if (isset($akte1->result[0]->insertamum)) $insertamum1 = $akte1->result[0]->insertamum; else $insertamum1 = 0; $akte2 = new akte(); - $akte2->getAkten($personToKeep, 'Lichtbil'); + $akte2->getAkten($personToKeep, 'Lichtbil', null, null, true); if (isset($akte2->result[0]->insertamum)) $insertamum2 = $akte2->result[0]->insertamum; else From 0b0355fba0337043218bf4cf67bf26ee845c2faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Wed, 19 Dec 2018 19:14:56 +0100 Subject: [PATCH 3/7] Removed Legacy Scripts --- system/mlists/mlists_copy.php | 30 ----- system/mlists/mlists_create.php | 163 ------------------------- system/mlists/student_lists_copy.php | 31 ----- system/mlists/student_lists_create.php | 138 --------------------- 4 files changed, 362 deletions(-) delete mode 100644 system/mlists/mlists_copy.php delete mode 100644 system/mlists/mlists_create.php delete mode 100644 system/mlists/student_lists_copy.php delete mode 100644 system/mlists/student_lists_create.php diff --git a/system/mlists/mlists_copy.php b/system/mlists/mlists_copy.php deleted file mode 100644 index 36b9000cc..000000000 --- a/system/mlists/mlists_copy.php +++ /dev/null @@ -1,30 +0,0 @@ - - -Copy mLists - - - - -

Copy mLists

-&1","r"))) - { - return 126; - } - - while (!feof($p)) - { - $line=fgets($p,1000); - $out .= $line; - } - pclose($p); - return $out; - } - $var="../../../mlists/copymlists.sh"; - echo mysystem($var); -?> -Verarbeitung erledigt! - - \ No newline at end of file diff --git a/system/mlists/mlists_create.php b/system/mlists/mlists_create.php deleted file mode 100644 index 776134b65..000000000 --- a/system/mlists/mlists_create.php +++ /dev/null @@ -1,163 +0,0 @@ -, - * Andreas Oesterreicher and - * Rudolf Hangl . - */ -/** - * Gerneriert die Textfiles fuer die Mailverteiler - * der Gruppen und das Textfile fuer die Aliase - */ - require_once('../../config/vilesci.config.inc.php'); - require_once('../../include/functions.inc.php'); - require_once('../../include/globals.inc.php'); - require_once('../../include/studiensemester.class.php'); - - $db = new basis_db(); - - if(!($result_stg = $db->db_query("SELECT studiengang_kz, bezeichnung, lower(typ::varchar(1) || kurzbz) as kurzbz FROM public.tbl_studiengang ORDER BY kurzbz ASC"))) - die($db->db_last_error()); - $num_rows=$db->db_num_rows($result_stg); - $ss=new studiensemester(); - $ss_nearest=$ss->getaktorNearest(); - $ss_nearest_to_akt=$ss->getNearestFrom($ss_nearest); - -?> - - -Mailinglisten - - - - - -

MailingListen

- -studiengang_kz; - $stg_kzbz=$row->kurzbz; - $sql_query="SELECT * FROM public.tbl_gruppe WHERE studiengang_kz='".addslashes($stg_id)."' AND mailgrp=true ORDER BY gruppe_kurzbz"; - - if(!($result_mg = $db->db_query($sql_query))) - die($db->db_last_error()); - $nr_mg=$db->db_num_rows($result_mg); - - // Mailgroups - for ($j=0; $j<$nr_mg; $j++) - { - $row_mg = $db->db_fetch_object($result_mg, $j); - $mg_kurzbz=$row_mg->gruppe_kurzbz; - if($row_mg->studiengang_kz==10005 && mb_stripos($mg_kurzbz,'EWU')===0) - { - echo "EWU Gruppe $mg_kurzbz wird fuer STSEM ".$ss_nearest." und ".$ss_nearest_to_akt." erstellt"; - // FHTW Warm Up Kurse enthaelt die Teilnehmer des SS auch wenn das WS schon gestartet hat - $sql_query='SELECT tbl_benutzergruppe.uid, nachname, vorname '. - 'FROM campus.vw_benutzer, public.tbl_benutzergruppe '. - 'WHERE vw_benutzer.uid=tbl_benutzergruppe.uid AND '. - "UPPER(gruppe_kurzbz)=UPPER('$mg_kurzbz') AND tbl_benutzergruppe.uid NOT LIKE '\\\\_%' ". - "AND (studiensemester_kurzbz IS NULL OR studiensemester_kurzbz in(".$db->db_add_param($ss_nearest).",".$db->db_add_param($ss_nearest_to_akt).")) AND aktiv ORDER BY nachname;"; - } - else - { - $sql_query='SELECT tbl_benutzergruppe.uid, nachname, vorname '. - 'FROM campus.vw_benutzer, public.tbl_benutzergruppe '. - 'WHERE vw_benutzer.uid=tbl_benutzergruppe.uid AND '. - "UPPER(gruppe_kurzbz)=UPPER('$mg_kurzbz') AND tbl_benutzergruppe.uid NOT LIKE '\\\\_%' ". - "AND (studiensemester_kurzbz IS NULL OR studiensemester_kurzbz='$ss_nearest') AND aktiv ORDER BY nachname;"; - } - if(!($result_person = $db->db_query($sql_query))) - die($db->db_last_error()); - - // File Operations - $name=$mg_kurzbz.'.txt'; - $name=mb_strtolower($name); - if($fp=fopen('../../../mlists/'.$name,"w")) - { - - $nr_person=$db->db_num_rows($result_person); - for ($p=0; $p<$nr_person; $p++) - { - $row = $db->db_fetch_object($result_person, $p); - fwrite($fp, '#'.$row->nachname.' '.$row->vorname.$crlf.$row->uid.$crlf); - } - fclose($fp); - echo $name.' created
'; - } - else - { - echo "Failed to Create $name"; - } - flush(); - } - } - - //Zusammenbauen der Studiengaenge die keine Alias Adressen bekommen - $noalias_kz=''; - foreach($noalias as $var) - { - if($noalias_kz!='') - $noalias_kz.=','; - $noalias_kz.=$var; - } - - //$qry = "SELECT vornamen, nachname, uid, alias FROM tbl_person where alias<>'' ORDER BY nachname, vornamen"; - $qry = "SELECT vorname, nachname, uid, alias FROM (public.tbl_person JOIN public.tbl_benutzer USING(person_id)) LEFT JOIN public.tbl_student on(uid=student_uid) - WHERE - alias<>''"; - if($noalias_kz!='') - $qry.=" AND (studiengang_kz NOT IN($noalias_kz) OR studiengang_kz is null)"; - - $qry.=" AND (tbl_benutzer.aktiv OR - (tbl_benutzer.aktiv=false - AND updateaktivam >= now()-(SELECT CASE public.get_rolle_prestudent (prestudent_id,null) - WHEN 'Abbrecher' THEN '".DEL_ABBRECHER_WEEKS." weeks'::interval - WHEN 'Absolvent' THEN '".DEL_STUDENT_WEEKS." weeks'::interval - ELSE '".DEL_MITARBEITER_WEEKS." weeks'::interval - END - ) - )) - ORDER BY nachname, vorname"; - - if($result = $db->db_query($qry)) - { - $fp=fopen('../../../mlists/tw_alias.txt',"w"); - while($row = $db->db_fetch_object($result)) - { - fwrite($fp,"# ".$row->nachname." ".$row->vorname.$crlf); - fwrite($fp,$row->alias.": ".$row->uid.$crlf); - } - fclose($fp); - echo 'tw_alias.txt created
'; - } - else - { - echo 'tw_alias.txt failed
'; - } - -?> -


- Die Mailinglisten wurden erstellt.
- Sie können nun die erstellten Datein auf den Mail-Server kopieren (Copy - Lists).

-

<< Zurück

- - diff --git a/system/mlists/student_lists_copy.php b/system/mlists/student_lists_copy.php deleted file mode 100644 index 74e2b69b0..000000000 --- a/system/mlists/student_lists_copy.php +++ /dev/null @@ -1,31 +0,0 @@ - - -Copy mLists - - - - -

Copy mLists

-&1","r"))) - { - return 126; - } - - while (!feof($p)) - { - $line=fgets($p,1000); - $out .= $line; - } - pclose($p); - return $out; - } - $var="../../../mlists/student/copymlists.sh"; - echo mysystem($var); -?> -Verarbeitung erledigt!
-<<Zurück - - \ No newline at end of file diff --git a/system/mlists/student_lists_create.php b/system/mlists/student_lists_create.php deleted file mode 100644 index da58d5731..000000000 --- a/system/mlists/student_lists_create.php +++ /dev/null @@ -1,138 +0,0 @@ -, - * Andreas Oesterreicher and - * Rudolf Hangl . - */ -/** - * Generiert die Listen fuer die Mailverteiler der Studenten - */ - require_once('../../config/vilesci.config.inc.php'); - require_once('../../include/functions.inc.php'); - - $db = new basis_db(); - if(!($erg=$db->db_query("SELECT studiengang_kz, bezeichnung, lower(typ::varchar(1) || kurzbz) as kurzbz FROM public.tbl_studiengang ORDER BY kurzbz ASC"))) - die($db->db_last_error()); - $num_rows=$db->db_num_rows($erg); -?> - - -Mailinglisten - - - - - -

MailingListen

- - -db_fetch_object($erg, $i); - $stg_kz=$row->studiengang_kz; - $stg_kzbz=$row->kurzbz; - $sql_query="SELECT DISTINCT semester FROM public.tbl_student WHERE studiengang_kz=$stg_kz AND student_uid NOT LIKE '\\\\_%' AND semester<10 AND semester>0 ORDER BY semester"; - - if(!($result_sem = $db->db_query($sql_query))) - die($db->db_last_error()); - $nr_sem=$db->db_num_rows($result_sem); - for ($j=0; $j<$nr_sem; $j++) - { - $row_sem=$db->db_fetch_object($result_sem, $j); - echo $stg_kzbz.'-'.$row_sem->semester.'
'; - - $sql_query="SELECT DISTINCT verband FROM public.tbl_student WHERE studiengang_kz=$stg_kz AND semester=$row_sem->semester AND student_uid NOT LIKE '\\\\_%' ORDER BY verband"; - - if(!($result_ver = $db->db_query($sql_query))) - die($db->db_last_error()); - $nr_ver=$db->db_num_rows($result_ver); - for ($k=0; $k<$nr_ver; $k++) - { - $row_ver = $db->db_fetch_object($result_ver, $k); - - if ( ($row_ver->verband==' ' || $row_ver->verband=='') ) - $row_ver->verband='A'; - - $sql_query="SELECT DISTINCT gruppe FROM public.tbl_student WHERE studiengang_kz=$stg_kz AND semester=$row_sem->semester AND (verband='$row_ver->verband' OR verband='' OR verband=' ') AND student_uid NOT LIKE '\\\\_%' ORDER BY gruppe"; - - if(!($result_grp = $db->db_query($sql_query))) - die($db->db_last_error()); - $nr_grp = $db->db_num_rows($result_grp); - - for ($l=0; $l<$nr_grp; $l++) - { - $row_grp = $db->db_fetch_object($result_grp, $l); - $stgid=$stg_kz; - $sem=$row_sem->semester; - $ver=$row_ver->verband; - $grp=$row_grp->gruppe; - - if ($grp=='' || $grp==' ' || is_null($grp)) - $grp='1'; - if ($grp=='1') - $sql_query='SELECT uid, nachname, vorname FROM campus.vw_student WHERE aktiv AND studiengang_kz='.$stgid.' AND semester='.$sem." AND (verband='".strtoupper($ver)."' OR verband='' OR verband=' ') AND (gruppe='".$grp."' OR gruppe='' OR gruppe=' ') AND uid NOT LIKE '\\\\_%' ORDER BY nachname"; - else - $sql_query='SELECT uid, nachname, vorname FROM campus.vw_student WHERE aktiv AND studiengang_kz='.$stgid.' AND semester='.$sem.' AND verband=\''.strtoupper($ver).'\' AND gruppe=\''.$grp."' AND uid NOT LIKE '\\\\_%' ORDER BY nachname"; - - if(!($result_student = $db->db_query($sql_query))) - die($db->db_last_error()); - // File Operations - $name=$stg_kzbz.$sem.$ver.$grp.'.txt'; - $name=mb_strtolower($name); - $fp=fopen('../../../mlists/student/'.$name,"w"); - - $crlf="\n"; - - $numrows_student = $db->db_num_rows($result_student); - for ($s=0; $s<$numrows_student; $s++) - { - $row = $db->db_fetch_object($result_student, $s); - fwrite($fp, '#'.$row->nachname.' '.$row->vorname.$crlf.$row->uid.$crlf); - } - fclose($fp); - echo $name.', '; - flush(); - } - echo 'created
'; - } - } - } - - // ---------- Eine Datei mit allen Studentent anlegen ------------------- - $sql_query="SELECT studiengang_kz, bezeichnung, lower(typ::varchar(1) || kurzbz) as kurzbz,uid, nachname, vorname, - semester, lower(verband) AS verband, gruppe FROM campus.vw_student JOIN tbl_studiengang USING (studiengang_kz) - WHERE uid NOT LIKE '\\\\_%' AND semester<10 AND semester>0 AND vw_student.aktiv AND (substring(uid from 1 for 1)<'0' OR substring(uid from 1 for 1)>'9')"; - - if(!($result = $db->db_query($sql_query))) - die($db->db_last_error()); - // File Operations - $name='student_lehrverband.txt'; - $fp=fopen('../../../mlists/student/'.$name,"w"); - $crlf="\n"; - // Wunsch von Kopper: ^t^t^t# - while ($row = $db->db_fetch_object($result)) - fwrite($fp, $row->kurzbz."\t".$row->semester.$row->verband.$row->gruppe."\t".$row->uid."\t#".$row->nachname.' '.$row->vorname.$crlf); - fclose($fp); - echo $name.', '; - flush(); -?> -Finished!!!
-<<Zurück - - \ No newline at end of file From 2f30c59da2d23ba2bc9e32a3297d92bd22fb0583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Wed, 19 Dec 2018 19:36:49 +0100 Subject: [PATCH 4/7] Corrected Escaping --- cis/private/pers_in_grp.php | 53 +++++++++--------- cis/private/stud_in_grp.php | 87 ++++++++++++++++++------------ cms/image.php | 6 +-- cms/menu/menu_addon_urlaub.inc.php | 4 +- 4 files changed, 82 insertions(+), 68 deletions(-) diff --git a/cis/private/pers_in_grp.php b/cis/private/pers_in_grp.php index e0c98097f..b44b8db0d 100644 --- a/cis/private/pers_in_grp.php +++ b/cis/private/pers_in_grp.php @@ -46,55 +46,55 @@ $gruppe_kurzbz = $_GET['grp']; $gruppe = new gruppe($gruppe_kurzbz); -echo ' - +echo ' - + - - - - - - + + + + + ' . $p->t('mailverteiler/personenImVerteiler') . ' '; -$qry = "SELECT - uid, vorname, nachname - FROM - campus.vw_benutzer - JOIN - tbl_benutzergruppe USING (uid) - WHERE - gruppe_kurzbz='" . addslashes($gruppe_kurzbz) . "'"; +$qry = "SELECT + uid, vorname, nachname + FROM + campus.vw_benutzer + JOIN + tbl_benutzergruppe USING (uid) + WHERE + gruppe_kurzbz=".$db->db_add_param($gruppe_kurzbz); + // Fuer den Studiengang EWU wird zusaetzlich das aktuelle Studiensemester ermittelt if ($gruppe->studiengang_kz == 10005 && mb_stripos($gruppe_kurzbz,'EWU') === 0) { $qry .= " AND (studiensemester_kurzbz IS NULL - OR studiensemester_kurzbz IN ('" . addslashes($stsem) . "','" . addslashes($ss_nearest_to_akt) . "'))"; + OR studiensemester_kurzbz IN (".$db->db_add_param($stsem).",".$db->db_add_param($ss_nearest_to_akt)."))"; } else { $qry .= " AND (studiensemester_kurzbz IS NULL - OR studiensemester_kurzbz='" . addslashes($stsem) . "')"; + OR studiensemester_kurzbz=".$db->db_add_param($stsem).")"; } - $qry .= " ORDER BY + $qry .= " ORDER BY nachname, vorname"; if ($result = $db->db_query($qry)) { @@ -109,7 +109,6 @@ echo ''; -// $sql_query = "SELECT vornamen AS vn,nachname AS nn,a.uid as uid FROM public.tbl_personmailgrp AS a, public.tbl_person AS b WHERE a.uid=b.uid AND a.mailgrp_kurzbz='$grp' ORDER BY nachname"; if ($result = $db->db_query($qry)) { while ($row = $db->db_fetch_object($result)) @@ -125,4 +124,4 @@ echo '
' . $p->t('global/mail') . '
'; -?> \ No newline at end of file +?> diff --git a/cis/private/stud_in_grp.php b/cis/private/stud_in_grp.php index 02344264d..8854ebc11 100644 --- a/cis/private/stud_in_grp.php +++ b/cis/private/stud_in_grp.php @@ -17,7 +17,6 @@ * * Authors: Andreas Oesterreicher */ - require_once('../../config/cis.config.inc.php'); require_once('../../include/basis_db.class.php'); require_once('../../include/phrasen.class.php'); @@ -26,27 +25,30 @@ require_once('../../include/functions.inc.php'); $sprache = getSprache(); $p = new phrasen($sprache); -echo ' +if(!$uid = get_uid()) + die($p->t('global/fehlerBeimErmittelnDerUID')); + +echo ' - + - - - - - - + + + + + @@ -56,45 +58,60 @@ echo 't('global/fehlerBeimOeffnenDerDatenbankverbindung')); -if(!isset($_GET['kz'])) - die($p->t('global/fehlerBeiDerParameteruebergabe')); +if (!isset($_GET['kz'])) + die($p->t('global/fehlerBeiDerParameteruebergabe')); - if(isset($_GET['all'])) +if (isset($_GET['all'])) { - $qry = "SELECT vorname, nachname, uid FROM campus.vw_student WHERE aktiv=true AND studiengang_kz='".addslashes($_GET['kz'])."' AND semester<10 AND semester>0 ORDER BY nachname, vorname"; + $qry = "SELECT + vorname, nachname, uid + FROM + campus.vw_student + WHERE + aktiv=true + AND studiengang_kz=".$db->db_add_param($_GET['kz'])." + AND semester<10 + AND semester>0 + ORDER BY nachname, vorname"; } else { - $qry = "SELECT vorname, nachname, uid FROM campus.vw_student WHERE aktiv=true AND studiengang_kz='".addslashes($_GET['kz'])."'"; + $qry = "SELECT + vorname, nachname, uid + FROM + campus.vw_student + WHERE + aktiv=true + AND studiengang_kz=".$db->db_add_param($_GET['kz']); - if(isset($_GET['sem'])) - $qry.=" AND semester='".addslashes($_GET['sem'])."'"; + if (isset($_GET['sem'])) + $qry.=" AND semester=".$db->db_add_param($_GET['sem']); - if(isset($_GET['verband'])) - $qry.=" AND verband='".addslashes($_GET['verband'])."'"; + if (isset($_GET['verband'])) + $qry.=" AND verband=".$db->db_add_param($_GET['verband']); - if(isset($_GET['grp'])) - $qry.=" AND gruppe='".addslashes($_GET['grp'])."'"; + if (isset($_GET['grp'])) + $qry.=" AND gruppe=".$db->db_add_param($_GET['grp']); $qry.= ' ORDER BY nachname, vorname'; } -if($result=$db->db_query($qry)) +if ($result = $db->db_query($qry)) { echo '

'.$row=$db->db_num_rows($result).' '.$p->t('mailverteiler/personen'); } echo ' - - - - - - '; + + + + + + '; -if($result=$db->db_query($qry)) +if ($result = $db->db_query($qry)) { - while($row=$db->db_fetch_object($result)) + while ($row = $db->db_fetch_object($result)) { echo ""; echo " "; @@ -109,4 +126,4 @@ else echo '
'.$p->t('global/nachname').''.$p->t('global/vorname').''.$p->t('global/mail').'
'.$p->t('global/nachname').''.$p->t('global/vorname').''.$p->t('global/mail').'
$row->nachname
'; -?> \ No newline at end of file +?> diff --git a/cms/image.php b/cms/image.php index c67058a88..9fbcfeb67 100644 --- a/cms/image.php +++ b/cms/image.php @@ -26,9 +26,9 @@ if (!$db = new basis_db()) if(isset($_GET['src']) && $_GET['src']=='flag' && isset($_GET['sprache'])) { - $qry = "SELECT flagge as bild FROM public.tbl_sprache WHERE sprache='".addslashes($_GET['sprache'])."'"; + $qry = "SELECT flagge as bild FROM public.tbl_sprache WHERE sprache=".$db->db_add_param($_GET['sprache']); } -else +else die('Unkown type'); //Header fuer Bild schicken @@ -38,5 +38,3 @@ $row = $db->db_fetch_object($result); //base64 zurueckwandeln und ausgeben echo base64_decode($row->bild); ?> - - diff --git a/cms/menu/menu_addon_urlaub.inc.php b/cms/menu/menu_addon_urlaub.inc.php index 3321e3f47..48b217a1c 100644 --- a/cms/menu/menu_addon_urlaub.inc.php +++ b/cms/menu/menu_addon_urlaub.inc.php @@ -49,7 +49,7 @@ class menu_addon_urlaub extends menu_addon if($untergebene!='') $untergebene.=','; - $untergebene.="'".addslashes($u_uid)."'"; + $untergebene.="'".$this->db_escape($u_uid)."'"; } $rechte = new benutzerberechtigung(); @@ -62,7 +62,7 @@ class menu_addon_urlaub extends menu_addon { if($untergebene!='') $untergebene.=','; - $untergebene.="'".addslashes($row->uid)."'"; + $untergebene.="'".$this->db_escape($row->uid)."'"; } } From 5301cc1855a6f562c97ec642dc785bbf70475855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Wed, 19 Dec 2018 19:37:28 +0100 Subject: [PATCH 5/7] Removed Legacy Script --- include/tw/anwesenheitsliste.inc.php | 385 --------------------------- 1 file changed, 385 deletions(-) delete mode 100644 include/tw/anwesenheitsliste.inc.php diff --git a/include/tw/anwesenheitsliste.inc.php b/include/tw/anwesenheitsliste.inc.php deleted file mode 100644 index 33808febf..000000000 --- a/include/tw/anwesenheitsliste.inc.php +++ /dev/null @@ -1,385 +0,0 @@ -, - * Andreas Oesterreicher and - * Rudolf Hangl . - */ - -//PDF fuer die Anwesenheitsliste auf CIS - -//PDF erzeugen -$pdf = new PDF('P','pt'); -$pdf->Open(); -$pdf->AddPage(); -$pdf->AliasNbPages(); - -$pdf->SetFillColor(111,111,111); -$pdf->SetXY(30,40); -$stgobj=new studiengang(); -$stgobj->load($stg); -//Logo -$pdf->Image("../../../skin/images/logo.jpg","418","45","","45","jpg",""); -//$pdf->Image("../../../skin/images/tw_logo_02.jpg","400","30","116","43","jpg",""); - -$bezeichnung=''; -if ($lvobj = new lehrveranstaltung($lvid)) - $bezeichnung=mb_convert_encoding($lvobj->bezeichnung,'ISO-8859-15','UTF-8'); - -$pdf->SetFont('Arial','',16); -$pdf->MultiCell(0,20,'Anwesenheitsliste '.$bezeichnung,0,'L',0); - -$pdf->SetFont('Arial','',10); -$pdf->SetFillColor(190,190,190); -//Bei langen Namen muss der Gruppenname etwas weiter unten angezeigt werden da er -//sonst von der zweiten Zeile des Titels ueberschrieben wird. -if(strlen($bezeichnung)>50) -$pdf->SetXY(30,75); -else -$pdf->SetXY(30,60); - -//$stsem_obj = new studiensemester($conn); -//$stsem = $stsem_obj->getaktorNext(); - -$qry = "SELECT distinct on(kuerzel, semester, verband, gruppe, gruppe_kurzbz) UPPER(stg_typ::varchar(1) || stg_kurzbz) as kuerzel, semester, verband, gruppe, gruppe_kurzbz from campus.vw_lehreinheit WHERE lehrveranstaltung_id='".addslashes($lvid)."' AND studiensemester_kurzbz='".addslashes($stsem)."'"; -if($lehreinheit_id!='') - $qry.=" AND lehreinheit_id='".addslashes($lehreinheit_id)."'"; - -$gruppen=''; -if($result = $db->db_query($qry)) -{ - while($row = $db->db_fetch_object($result)) - { - if($gruppen!='') - $gruppen.=', '; - if($row->gruppe_kurzbz=='') - $gruppen.=trim($row->kuerzel.'-'.$row->semester.$row->verband.$row->gruppe); - else - $gruppen.=$row->gruppe_kurzbz; - } -} -$gruppen=mb_convert_encoding($gruppen,'ISO-8859-15','UTF-8'); - -if(strlen($gruppen)>50) - $linebreak="\n"; -else - $linebreak=' '; -$semester = new studiensemester($stsem); -$pdf->MultiCell(0,15,'Gruppe: '.$gruppen.$linebreak.'Studiensemester: '.(($semester->beschreibung != NULL) ? $semester->beschreibung : $stsem)); - -$maxY=$pdf->GetY(); -$maxY=getmax($maxY,$pdf->GetY()); - - -$pdf->SetFont('Arial','B',12); - -$pdf->SetXY(30,90); -$pdf->MultiCell(0,20,'Monat _________'); - -//Anfang Tabelle -$pdf->SetFont('Arial','',8); -$lineheight=12; -//Datum -$maxY=$pdf->GetY()+10; -$maxX=30; -$pdf->SetXY($maxX,$maxY); -$pdf->MultiCell(280,$lineheight,'Datum',1,'L',0); -$maxX +=280; -$pdf->SetXY($maxX,$maxY); -$pdf->MultiCell(40,$lineheight,'',1,'L',0); -$maxX +=40; -$pdf->SetXY($maxX,$maxY); -$pdf->MultiCell(40,$lineheight,'',1,'L',0); -$maxX +=40; -$pdf->SetXY($maxX,$maxY); -$pdf->MultiCell(40,$lineheight,'',1,'L',0); -$maxX +=40; -$pdf->SetXY($maxX,$maxY); -$pdf->MultiCell(40,$lineheight,'',1,'L',0); -$maxX +=40; -$pdf->SetXY($maxX,$maxY); -$pdf->MultiCell(40,$lineheight,'',1,'L',0); -$maxX +=40; -$pdf->SetXY($maxX,$maxY); -$pdf->MultiCell(40,$lineheight,'',1,'L',0); - -//Anzahl der abgehaltenen Stunden -$maxY=$pdf->GetY(); -$maxX=30; -$pdf->SetXY($maxX,$maxY); -$pdf->MultiCell(280,$lineheight,'Anzahl der abgehaltenen Einheiten',1,'L',0); -$maxX +=280; -$pdf->SetXY($maxX,$maxY); -$pdf->MultiCell(40,$lineheight,'',1,'L',0); -$maxX +=40; -$pdf->SetXY($maxX,$maxY); -$pdf->MultiCell(40,$lineheight,'',1,'L',0); -$maxX +=40; -$pdf->SetXY($maxX,$maxY); -$pdf->MultiCell(40,$lineheight,'',1,'L',0); -$maxX +=40; -$pdf->SetXY($maxX,$maxY); -$pdf->MultiCell(40,$lineheight,'',1,'L',0); -$maxX +=40; -$pdf->SetXY($maxX,$maxY); -$pdf->MultiCell(40,$lineheight,'',1,'L',0); -$maxX +=40; -$pdf->SetXY($maxX,$maxY); -$pdf->MultiCell(40,$lineheight,'',1,'L',0); - -//Lektoren -$pdf->SetFont('Arial','B',10); -$maxY=$pdf->GetY(); -$maxX=30; -$pdf->SetXY($maxX,$maxY); -$pdf->MultiCell(520,$lineheight+2,'LektorInnen',1,'L',1); - -//Schleife aller lektoren - -$qry = "SELECT - distinct vorname, nachname - FROM campus.vw_benutzer, lehre.tbl_lehreinheit, lehre.tbl_lehreinheitmitarbeiter - WHERE - uid=mitarbeiter_uid AND - tbl_lehreinheit.lehreinheit_id=tbl_lehreinheitmitarbeiter.lehreinheit_id AND - lehrveranstaltung_id='".addslashes($lvid)."' AND - studiensemester_kurzbz='$stsem' "; - if($lehreinheit_id!='') - $qry.=" AND tbl_lehreinheit.lehreinheit_id='".addslashes($lehreinheit_id)."'"; -$qry.=" ORDER BY nachname, vorname;"; -if($result = $db->db_query($qry)) -{ - while($row=$db->db_fetch_object($result)) - { - $pdf->SetFont('Arial','',8); - $maxY=$pdf->GetY(); - $maxX=30; - $pdf->SetXY($maxX,$maxY); - - $vorname=mb_convert_encoding(trim($row->vorname),'ISO-8859-15','UTF-8'); - $nachname=mb_convert_encoding(trim($row->nachname),'ISO-8859-15','UTF-8'); - $name="$vorname $nachname"; - - $pdf->MultiCell(280,$lineheight,$name,1,'L',0); - $maxX +=280; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',0); - $maxX +=40; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',0); - $maxX +=40; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',0); - $maxX +=40; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',0); - $maxX +=40; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',0); - $maxX +=40; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',0); - } -} -//Studenten -$pdf->SetFont('Arial','B',10); -$maxY=$pdf->GetY(); -$maxX=30; -$pdf->SetXY($maxX,$maxY); -$pdf->MultiCell(520,$lineheight+2,'Studierende',1,'L',1); - -$maxY=$pdf->GetY(); -$pdf->tablewidths = array(20,140,60,60,40,40,40,40,40,40); //Spaltenbreiten setzen -$pdf->SetLeftMargin(30); -$pdf->SetTopMargin(100); // Auch in der Funktion Header umstellen!!! - -$aligns = array('R','L','C','C','L','L','L','L','L','L'); //Ausrichtung der Tabellen festlegen - -$pdf->SetFont('Arial','',8); -$pdf->SetXY(30,$maxY); -$inhalt[]=array(' ','HörerIn/Name','Kennzeichen','Gruppe','','','','','',''); //Spaltenueberschriften - -//Studenten holen - -$pdf->SetFont('Arial','',8); - $maxY=$pdf->GetY(); - $maxX=30; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(20,$lineheight,'',1,'R',0); - $maxX +=20; - $pdf->SetXY($maxX,$maxY); - $pdf->SetFont('Arial','B',8); - $pdf->MultiCell(130,$lineheight,mb_convert_encoding('Hörer/Name','ISO-8859-15','UTF-8'),1,'L',0); - $maxX +=130; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(65,$lineheight,'Kennzeichen',1,'C',0); - $maxX +=65; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(65,$lineheight,'Gruppe',1,'C',0); - $maxX +=65; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',0); - $maxX +=40; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',0); - $maxX +=40; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',0); - $maxX +=40; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',0); - $maxX +=40; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',0); - $maxX +=40; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',0); -$stsem_obj = new studiensemester(); -$stsem_obj->load($stsem); -$stsemdatumvon = $stsem_obj->start; -$stsemdatumbis = $stsem_obj->ende; - -$qry = "SELECT - distinct on(nachname, vorname, person_id) vorname, nachname, matrikelnr, - tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe, - (SELECT status_kurzbz FROM public.tbl_prestudentstatus WHERE prestudent_id=tbl_student.prestudent_id ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status, - tbl_bisio.bisio_id, tbl_bisio.von, tbl_bisio.bis, - tbl_zeugnisnote.note - FROM - campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid) - JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid) - LEFT JOIN public.tbl_studentlehrverband USING(student_uid,studiensemester_kurzbz) - LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id AND tbl_zeugnisnote.student_uid=tbl_student.student_uid AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz) - LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid) - WHERE - vw_student_lehrveranstaltung.lehrveranstaltung_id='".addslashes($lvid)."' AND - vw_student_lehrveranstaltung.studiensemester_kurzbz='".addslashes($stsem)."'"; - -if($lehreinheit_id!='') - $qry.=" AND vw_student_lehrveranstaltung.lehreinheit_id='".addslashes($lehreinheit_id)."'"; - -$qry.=' ORDER BY nachname, vorname, person_id, tbl_bisio.bis DESC'; -//echo $qry; -if($result = $db->db_query($qry)) -{ - $i=0; - while($elem = $db->db_fetch_object($result)) - { - //Abbrecher und Unterbrecher nicht anzeigen - if($elem->status!='Abbrecher' && $elem->status!='Unterbrecher') - { - $i++; - if($i%2) - $pdf->SetFillColor(190,190,190); - else - $pdf->SetFillColor(255,255,255); - - $pdf->SetFont('Arial','',8); - $maxY=$pdf->GetY(); - if($maxY>770) - { - $pdf->AddPage(); - $maxY=$pdf->GetY(); - } - - $vorname=mb_convert_encoding(trim($elem->vorname),'ISO-8859-15','UTF-8'); - $nachname=mb_convert_encoding(trim($elem->nachname),'ISO-8859-15','UTF-8'); - $name="$vorname $nachname"; - $matrikelnr=trim(mb_convert_encoding($elem->matrikelnr,'ISO-8859-15','UTF-8')); - $sem_verb_grup=trim(mb_convert_encoding($elem->semester.$elem->verband.$elem->gruppe,'ISO-8859-15','UTF-8')); - - - - - $maxX=30; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(20,$lineheight,$i,1,'R',1); - $maxX +=20; - $pdf->SetXY($maxX,$maxY); - $pdf->SetFont('Courier','B',8); - $pdf->MultiCell(130,$lineheight,$nachname,1,'L',1); - $pdf->SetFont('Arial','',8); - $pdf->SetXY($maxX+strlen($nachname)*5+1,$maxY); - if($elem->status=='Incoming') //Incoming - $inc=' (i)'; - else - $inc=''; - - if($elem->bisio_id!='' && $elem->status!='Incoming' && ($elem->bis > $stsemdatumvon || $elem->bis=='') && $elem->von < $stsemdatumbis) //Outgoing - $inc.=' (o)'; - - if($elem->note==6) //angerechnet - $inc.=' (ar)'; - - - $pdf->MultiCell(130,$lineheight,$vorname.$inc,0,'L',0); - $maxX +=130; - $pdf->SetXY($maxX,$maxY); - $pdf->SetFont('Arial','',8); - $pdf->MultiCell(65,$lineheight,$matrikelnr,1,'C',1); - $maxX +=65; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(65,$lineheight,$sem_verb_grup,1,'C',1); - $maxX +=65; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',1); - $maxX +=40; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',1); - $maxX +=40; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',1); - $maxX +=40; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',1); - $maxX +=40; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',1); - $maxX +=40; - $pdf->SetXY($maxX,$maxY); - $pdf->MultiCell(40,$lineheight,'',1,'L',1); - $inhalt[]=array($i,$nachname.' '.$vorname,$matrikelnr,$sem_verb_grup,'','','','','',''); - } - } -} -//Fussnote -$maxY=$pdf->GetY()+5; -$maxX=30; -$pdf->SetXY($maxX,$maxY); -$pdf->SetFont('Arial','',8); -$pdf->MultiCell(520,$lineheight,'(i) ... Incoming',0,'L',0); -$pdf->MultiCell(520,$lineheight,'(o) ... Outgoing',0,'L',0); -$pdf->MultiCell(520,$lineheight,'(ar) ... angerechnet',0,'L',0); - -//FHStg -$maxY=$pdf->GetY()+5; -$maxX=30; -$pdf->SetXY($maxX,$maxY); -$pdf->SetFont('Arial','B',8); - - -$bezeichnung=mb_convert_encoding('Fachhochschulstudiengang ('.strtoupper($stgobj->typ).') '.$stgobj->bezeichnung,'ISO-8859-15','UTF-8'); -$pdf->MultiCell(520,$lineheight,$bezeichnung,0,'L',0); - -//FHStg -$maxY=$pdf->GetY(); -$maxX=30; -$pdf->SetXY($maxX,$maxY); -$pdf->SetFont('Arial','',8); -$pdf->MultiCell(520,$lineheight,'Fehlt ein/e Student/in länger als 2 Wochen, bitte um einen deutlichen Vermerk auf der Anwesenheitsliste. Die Anwesenheitsliste bitte am Ende des Monats im Sekretariat abgeben! Bitte achten Sie darauf, dass Sie nur VOLLST�NDIG AUSGEF�LLTE LISTEN abgeben!',0,'L',0); -$pdf->Output('anwesenheitsliste.pdf','I'); -?> \ No newline at end of file From daec3b23ef495320e079caf994736896cd382dd4 Mon Sep 17 00:00:00 2001 From: Gerald Raab Date: Thu, 20 Dec 2018 10:04:20 +0100 Subject: [PATCH 6/7] Filter updated --- system/filtersupdate.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/filtersupdate.php b/system/filtersupdate.php index a55d7943b..d8788b292 100755 --- a/system/filtersupdate.php +++ b/system/filtersupdate.php @@ -105,8 +105,8 @@ $filters = array( {"name": "Nation"}, {"name": "LastAction"}, {"name": "User/Operator"}, - {"name": "LockUser" - }, + {"name": "LastActionType"}, + {"name": "LockUser"}, {"name": "StgNichtAbgeschickt"}, {"name": "StgAbgeschickt"}, {"name": "StgAktiv"}, From fc5df89532a48f3dad5612ffb3b271b7cb699a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Thu, 20 Dec 2018 15:40:35 +0100 Subject: [PATCH 7/7] Removed Geschlecht Column from oeh Export --- vilesci/statistik/oehwaehlerverzeichnis.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vilesci/statistik/oehwaehlerverzeichnis.php b/vilesci/statistik/oehwaehlerverzeichnis.php index d11a4dbd7..144b630fc 100644 --- a/vilesci/statistik/oehwaehlerverzeichnis.php +++ b/vilesci/statistik/oehwaehlerverzeichnis.php @@ -108,7 +108,7 @@ if($result = $db->db_query($qry)) // Personen die in mehreren Studiengaengen gleichzeitig studieren werden nur einmal in die Liste aufgenommen // dabei werden beide Personenkennzeichen und Studiengangskennzahlen mit ; getrennt $data_row[2]=implode(';',$personenkennzeichen); - $data_row[8]=implode(';',$studiengang_kz); + $data_row[7]=implode(';',$studiengang_kz); echo implode('|',$data_row)."|\r\n"; $data_row = array(); @@ -151,7 +151,6 @@ if($result = $db->db_query($qry)) $datum_obj->formatDatum($row->gebdatum,'Ymd'), $row->nachname, $row->vorname, - ($row->geschlecht=='m'?'M':($row->geschlecht=='w'?'W':'X')), null, $row->zustell_plz, $row->zustell_ort, @@ -165,7 +164,7 @@ if($result = $db->db_query($qry)) } $data_row[2]=implode(';',$personenkennzeichen); - $data_row[8]=implode(';',$studiengang_kz); + $data_row[7]=implode(';',$studiengang_kz); echo implode('|',$data_row)."|\r\n"; }