diff --git a/cis/private/pers_in_grp.php b/cis/private/pers_in_grp.php
index 83b15119e..e0c98097f 100644
--- a/cis/private/pers_in_grp.php
+++ b/cis/private/pers_in_grp.php
@@ -1,48 +1,51 @@
 <?php
-/* Copyright (C) 2006 Technikum-Wien
- *
+/*
+ * Copyright (C) 2006 Technikum-Wien
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * 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>
- *          Rudolf Hangl 		< rudolf.hangl@technikum-wien.at >
- *          Gerald Simane-Sequens 	< gerald.simane-sequens@technikum-wien.at >
+ * Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>
+ * Rudolf Hangl < rudolf.hangl@technikum-wien.at >
+ * Gerald Simane-Sequens < gerald.simane-sequens@technikum-wien.at >
  */
-  require_once('../../config/cis.config.inc.php');
-  require_once('../../include/basis_db.class.php');
-  require_once('../../include/functions.inc.php');
-  require_once('../../include/studiensemester.class.php');
-  require_once('../../include/phrasen.class.php');
-  
-  $sprache = getSprache();
-  $p = new phrasen($sprache);
-  
-  if (!$db = new basis_db())
-  		die($p->t('global/fehlerBeimOeffnenDerDatenbankverbindung'));
-  
-  if (!$user=get_uid())
-		die($p->t('global/fehlerBeimErmittelnDerUID'));
+require_once ('../../config/cis.config.inc.php');
+require_once ('../../include/basis_db.class.php');
+require_once ('../../include/functions.inc.php');
+require_once ('../../include/studiensemester.class.php');
+require_once ('../../include/phrasen.class.php');
+require_once ('../../include/gruppe.class.php');
 
-	$stsem_obj = new studiensemester();
-	$stsem = $stsem_obj->getaktorNext();
+$sprache = getSprache();
+$p = new phrasen($sprache);
+
+if (! $db = new basis_db())
+	die($p->t('global/fehlerBeimOeffnenDerDatenbankverbindung'));
+
+if (! $user = get_uid())
+	die($p->t('global/fehlerBeimErmittelnDerUID'));
+
+$stsem_obj = new studiensemester();
+$stsem = $stsem_obj->getaktorNext();
+$ss_nearest_to_akt = $stsem_obj->getNearestFrom($stsem);
+
+if (check_lektor($user))
+	$is_lector = true;
+else
+	$is_lector = false;
+
+$gruppe_kurzbz = $_GET['grp'];
+
+$gruppe = new gruppe($gruppe_kurzbz);
 
-	if(check_lektor($user))
-       $is_lector=true;
-  else
-       $is_lector=false;       
-       
 echo '
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -67,37 +70,57 @@ echo '
 		} 
 	);
 	</script>
-	<title>'.$p->t('mailverteiler/personenImVerteiler').'</title>
+	<title>' . $p->t('mailverteiler/personenImVerteiler') . '</title>
 </head>
 <body id="inhalt">';
 
-	$qry = "SELECT uid, vorname, nachname FROM campus.vw_benutzer JOIN tbl_benutzergruppe USING (uid) WHERE gruppe_kurzbz='".addslashes($_GET['grp'])."' AND (studiensemester_kurzbz IS NULL OR studiensemester_kurzbz='".addslashes($stsem)."') ORDER BY nachname, vorname";
-	if($result=$db->db_query($qry))
-	{
-		echo '<p>'.$row=$db->db_num_rows($result).' '.$p->t('mailverteiler/personen');
-	}
-	
-	echo'<table class="tablesorter" id="table">
+$qry = "SELECT 
+				uid, vorname, nachname 
+			FROM 
+				campus.vw_benutzer 
+			JOIN 
+				tbl_benutzergruppe USING (uid) 
+			WHERE 
+				gruppe_kurzbz='" . addslashes($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) . "'))";
+			}
+			else
+			{
+				$qry .= "	AND (studiensemester_kurzbz IS NULL
+				OR studiensemester_kurzbz='" . addslashes($stsem) . "')";
+			}
+
+			$qry .= " ORDER BY 
+				nachname, vorname";
+if ($result = $db->db_query($qry))
+{
+	echo '<p>' . $row = $db->db_num_rows($result) . ' ' . $p->t('mailverteiler/personen');
+}
+
+echo '<table class="tablesorter" id="table">
 		<thead>
 		<tr>
-			<th>'.$p->t('global/nachname').'</th>
-			<th>'.$p->t('global/vorname').'</th>
-			<th>'.$p->t('global/mail').'</th>
+			<th>' . $p->t('global/nachname') . '</th>
+			<th>' . $p->t('global/vorname') . '</th>
+			<th>' . $p->t('global/mail') . '</th>
 		</tr></thead><tbody>';
 
-
- 		  //$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))
-	  	{
-		  	echo "<tr>";
-	      	echo "  <td>$row->nachname</td>";
-	      	echo "  <td>$row->vorname</td>";
-	      	echo "  <td><a href='mailto:$row->uid@".DOMAIN."' class='Item'>$row->uid@".DOMAIN."</a></td>";
-	      	echo "</tr>";
-		}
-	  }
+// $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))
+	{
+		echo "<tr>";
+		echo "  <td>$row->nachname</td>";
+		echo "  <td>$row->vorname</td>";
+		echo "  <td><a href='mailto:$row->uid@" . DOMAIN . "' class='Item'>$row->uid@" . DOMAIN . "</a></td>";
+		echo "</tr>";
+	}
+}
 echo '
 		</tbody></table>
 	</body>

'.$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	$row->vorname	$row->uid@".DOMAIN."
$row->nachname	$row->vorname	$row->uid@" . DOMAIN . "