blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-22 09:22:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

mlists: tbl_student replaced

Browse Source
This commit is contained in:
Andreas Moik
2016-05-10 14:17:27 +02:00
parent 1185c68fb6
commit 068bcddb07
15 changed files with 131 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/mlists/mlists_copy.php
+16 -16
View File
@@ -7,24 +7,24 @@
<BODY class="background_main">
<H3>Copy mLists</H3>
<?php
function mysystem($command)
function mysystem($command)
{
if (!($p=popen("($command)2>&1","r")))
{
if (!($p=popen("($command)2>&1","r")))
{
return 126;
}
return 126;
}
while (!feof($p))
{
$line=fgets($p,1000);
$out .= $line;
}
pclose($p);
return $out;
}
$var="../../../mlists/copymlists.sh";
echo mysystem($var);
while (!feof($p))
{
$line=fgets($p,1000);
$out .= $line;
}
pclose($p);
return $out;
}
$var="../../../mlists/copymlists.sh";
echo mysystem($var);
?>
Verarbeitung erledigt!
</BODY>
</HTML>
</HTML>
system/mlists/mlists_create.php
+4 -3
View File
@@ -16,8 +16,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
* Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>.
*/
/**
* Gerneriert die Textfiles fuer die Mailverteiler
@@ -101,7 +102,7 @@
}
//$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)
$qry = "SELECT vorname, nachname, uid, alias FROM (public.tbl_person JOIN public.tbl_benutzer USING(person_id)) LEFT JOIN public.tbl_prestudent USING(uid)
WHERE
alias<>''";
if($noalias_kz!='')
system/mlists/mlists_generate.php
+10 -9
View File
@@ -16,8 +16,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
* Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>.
*/
/****************************************************************************
* Script: mlists_generate.php
@@ -1264,8 +1265,8 @@ $error_msg='';
tbl_studiengang.typ,
tbl_studiengang.kurzbz
FROM
public.tbl_student
JOIN public.tbl_benutzer ON(student_uid=uid)
public.tbl_prestudent
JOIN public.tbl_benutzer USING(uid)
JOIN public.tbl_prestudentstatus USING(prestudent_id)
JOIN public.tbl_studiengang USING(studiengang_kz)
WHERE
@@ -1314,18 +1315,18 @@ $error_msg='';
SELECT
distinct student_uid
FROM
public.tbl_student
JOIN public.tbl_benutzer ON(uid=student_uid)
public.tbl_prestudent
JOIN public.tbl_benutzer USING(uid)
WHERE
tbl_benutzer.aktiv AND
'".addslashes($row->orgform_kurzbz)."'=
(SELECT orgform_kurzbz
FROM public.tbl_prestudentstatus
WHERE
prestudent_id=tbl_student.prestudent_id
prestudent_id=tbl_prestudent.prestudent_id
AND tbl_prestudentstatus.studiensemester_kurzbz='".addslashes($stsem)."'
ORDER BY datum desc, insertamum desc, ext_id desc LIMIT 1)
AND tbl_student.studiengang_kz='".addslashes($row->studiengang_kz)."'";
ORDER BY datum desc, insertamum desc, ext_id desc LIMIT 1)
AND tbl_prestudent.studiengang_kz='".addslashes($row->studiengang_kz)."'";
//Personen entfernen die nicht mehr in den Verteiler gehoeren
$qry = "DELETE FROM public.tbl_benutzergruppe WHERE gruppe_kurzbz='".$mlist_name."' AND uid NOT IN(".$sql_query.");";
system/mlists/student_lists_copy.php
+16 -16
View File
@@ -7,25 +7,25 @@
<BODY class="background_main">
<H3>Copy mLists</H3>
<?php
function mysystem($command)
function mysystem($command)
{
if (!($p=popen("($command)2>&1","r")))
{
if (!($p=popen("($command)2>&1","r")))
{
return 126;
}
return 126;
}
while (!feof($p))
{
$line=fgets($p,1000);
$out .= $line;
}
pclose($p);
return $out;
}
$var="../../../mlists/student/copymlists.sh";
echo mysystem($var);
while (!feof($p))
{
$line=fgets($p,1000);
$out .= $line;
}
pclose($p);
return $out;
}
$var="../../../mlists/student/copymlists.sh";
echo mysystem($var);
?>
Verarbeitung erledigt!<BR>
<A href="index.html" class="linkblue">&lt;&lt;Zur&uuml;ck</A>
</BODY>
</HTML>
</HTML>
system/mlists/student_lists_create.php
+13 -7
View File
@@ -16,14 +16,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
* Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>.
*/
/**
* Generiert die Listen fuer die Mailverteiler der Studenten
*/
require_once('../../config/vilesci.config.inc.php');
require_once('../../include/functions.inc.php');
require_once('../../include/studiensemester.class.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")))
@@ -42,12 +44,16 @@
<?php
$stsem = new studiensemester();
$studiensemester_kurzbz = $stsem->getaktorNext();
for ($i=0; $i<$num_rows; $i++)
{
$row=$db->db_fetch_object($erg, $i);
$stg_kz=$row->studiengang_kz;
$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";
$sql_query="SELECT DISTINCT semester FROM public.tbl_studentlehrverband WHERE studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND studiengang_kz=".$db->db_add_param($stg_kz, FHC_INTEGER)." AND semester<10 AND semester>0 ORDER BY semester";
if(!($result_sem = $db->db_query($sql_query)))
die($db->db_last_error());
@@ -57,7 +63,7 @@
$row_sem=$db->db_fetch_object($result_sem, $j);
echo $stg_kzbz.'-'.$row_sem->semester.'<br>';
$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";
$sql_query="SELECT DISTINCT verband FROM public.tbl_studentlehrverband WHERE studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND studiengang_kz=".$db->db_add_param($stg_kz, FHC_INTEGER)." AND semester=".$db->db_add_param($row_sem->semester)." ORDER BY verband";
if(!($result_ver = $db->db_query($sql_query)))
die($db->db_last_error());
@@ -69,7 +75,7 @@
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";
$sql_query="SELECT DISTINCT gruppe FROM public.tbl_studentlehrverband WHERE studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND studiengang_kz=".$db->db_add_param($stg_kz, FHC_INTEGER)." AND semester=$row_sem->semester AND (verband='$row_ver->verband' OR verband='' OR verband=' ') ORDER BY gruppe";
if(!($result_grp = $db->db_query($sql_query)))
die($db->db_last_error());
@@ -135,4 +141,4 @@
Finished!!! <BR>
<A href="index.html" class="linkblue">&lt;&lt;Zur&uuml;ck</A>
</BODY>
</HTML>
</HTML>
system/sync/sync_moodle_kurse.php
+1 -1
View File
@@ -46,7 +46,7 @@ if(php_sapi_name() != 'cli')
$db = new basis_db();
$stsem_obj = new studiensemester();
$stsem = $stsem_obj->getAktOrNext();
$stsem = $stsem_obj->getaktorNext();
$qry = "SELECT
distinct lehrveranstaltung_id, tbl_lehrveranstaltung.bezeichnung, tbl_lehrveranstaltung.kurzbz,