Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

application/controllers/system/Messages.php

@@ -16,105 +16,32 @@ class Messages extends VileSci_Controller
 		
 		$this->load->model('person/Person_model', 'PersonModel');
     }
-
-	public function index()
-	{
-		$this->load->view('system/messages.php', array('person_id' => $this->getPersonId()));
-	}
-
-	public function inbox($person_id)
-	{
-		$msg = $this->messagelib->getMessagesByPerson($person_id);
-		if ($msg->error)
-		{
-			show_error($msg->retval);
-		}
-		
-		$person = $this->PersonModel->load($person_id);
-		if ($person->error)
-		{
-			show_error($person->retval);
-		}
-		
-		$data = array (
-			'messages' => $msg->retval,
-			'person' => $person->retval[0]
-		);
-			
-		$this->load->view('system/messagesInbox.php', $data);
-	}
-
-	public function outbox($person_id)
-	{
-		$msg = $this->messagelib->getSentMessagesByPerson($person_id);
-		if ($msg->error)
-		{
-			show_error($msg->retval);
-		}
-		
-		$person = $this->PersonModel->load($person_id);
-		if ($person->error)
-		{
-			show_error($person->retval);
-		}
-		
-		$data = array (
-			'messages' => $msg->retval,
-			'person' => $person->retval[0]
-		);
-		
-		$this->load->view('system/messagesOutbox.php', $data);
-	}
 	
-	public function view($msg_id, $person_id)
-	{
-		$msg = $this->messagelib->getMessage($msg_id, $person_id);
-		if ($msg->error)
-		{
-			show_error($msg->retval);
-		}
-		
-		$v = $this->load->view('system/messageView', array('message' => $msg->retval[0]));
-	}
-
-	public function reply($msg_id, $person_id)
-	{
-		$msg = $this->messagelib->getMessage($msg_id, $person_id);
-		if ($msg->error)
-		{
-			show_error($msg->retval);
-		}
-		
-		$v = $this->load->view('system/messageReply', array('message' => $msg->retval[0]));
-	}
-	
-	public function sendReply($msg_id, $person_id)
-	{
-		$subject = $this->input->post('subject');
-		$body = $this->input->post('body');
-		
-		$this->load->model('system/Message_model', 'MessageModel');
-		$originMsg = $this->MessageModel->load($msg_id);
-		if ($originMsg->error)
-		{
-			show_error($originMsg->retval);
-		}
-		
-		$msg = $this->messagelib->sendMessage($person_id, $originMsg->retval[0]->person_id, $subject, $body, PRIORITY_NORMAL, $msg_id);
-		if ($msg->error)
-		{
-			show_error($msg->retval);
-		}
-		
-		redirect('/system/Messages/view/' . $msg->retval . '/' . $originMsg->retval[0]->person_id);
-	}
-	
-	public function write($sender_id)
+	/**
+	 * 
+	 */
+	public function write($sender_id, $msg_id = null, $receiver_id = null)
 	{
 		$prestudent_id = $this->input->post('prestudent_id');
+		$msg = null;
 		
+		// Get message data if possible
+		if (is_numeric($msg_id) && is_numeric($receiver_id))
+		{
+			$msg = $this->messagelib->getMessage($msg_id, $receiver_id);
+			if ($msg->error)
+			{
+				show_error($msg->retval);
+			}
+			else
+			{
+				$msg = $msg->retval[0];
+			}
+		}
+		
+		// Get variables
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$prestudent = $this->MessageModel->getMsgVarsData($prestudent_id);
+		$prestudent = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
 		if ($prestudent->error)
 		{
 			show_error($prestudent->retval);
@@ -141,12 +68,16 @@ class Messages extends VileSci_Controller
 		$data = array (
 			'sender_id' => $sender_id,
 			'receivers' => $prestudent->retval,
+			'message' => $msg,
 			'variables' => $variablesArray
 		);
 		
 		$v = $this->load->view('system/messageWrite', $data);
 	}
 	
+	/**
+	 * 
+	 */
 	public function send($sender_id)
 	{
 		$error = false;
@@ -154,7 +85,14 @@ class Messages extends VileSci_Controller
 		$subject = $this->input->post('subject');
 		$body = $this->input->post('body');
 		$prestudents = $this->input->post('prestudents');
-		$data = $this->MessageModel->getMsgVarsData($prestudents);
+		$relationmessage_id = $this->input->post('relationmessage_id');
+		
+		if (!isset($relationmessage_id) || $relationmessage_id == '')
+		{
+			$relationmessage_id = null;
+		}
+		
+		$data = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudents);
 		if (hasData($data))
 		{
 			for ($i = 0; $i < count($data->retval); $i++)
@@ -169,7 +107,7 @@ class Messages extends VileSci_Controller
 				
 				$parsedText = $this->messagelib->parseMessageText($body, $dataArray);
 				
-				$msg = $this->messagelib->sendMessage($sender_id, $dataArray['person_id'], $subject, $parsedText, PRIORITY_NORMAL);
+				$msg = $this->messagelib->sendMessage($sender_id, $dataArray['person_id'], $subject, $parsedText, PRIORITY_NORMAL, $relationmessage_id);
 				if ($msg->error)
 				{
 					show_error($msg->retval);
@@ -185,6 +123,9 @@ class Messages extends VileSci_Controller
 		}
 	}
 	
+	/**
+	 * 
+	 */
 	private function getPersonId()
 	{
 		$person_id = null;
@@ -206,6 +147,9 @@ class Messages extends VileSci_Controller
 		return $person_id;
 	}
 	
+	/**
+	 * 
+	 */
 	public function getVorlage()
 	{
 		$vorlage_kurzbz = $this->input->get('vorlage_kurzbz');
@@ -221,6 +165,9 @@ class Messages extends VileSci_Controller
 		}
 	}
 	
+	/**
+	 * 
+	 */
 	public function parseMessageText()
 	{
 		$prestudent_id = $this->input->get('prestudent_id');
@@ -228,7 +175,7 @@ class Messages extends VileSci_Controller
 		
 		if (isset($prestudent_id))
 		{
-			$data = $this->MessageModel->getMsgVarsData($prestudent_id);
+			$data = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
 			
 			$parsedText = "";
 			if (hasData($data))

application/helpers/fhc_helper.php

@@ -62,3 +62,17 @@ function generateToken($length = 64)
         $token .= $characters[mt_rand(0, $charactersLength)];
     return $token;
 }
+
+/**
+ * var_dump_to_error_log()
+ * Gets the output of the var_dump function and print it out
+ * via the error log. It also removes the end line characters
+ */
+function var_dump_to_error_log($parameter)
+{
+	ob_start();
+	var_dump($parameter);
+	$ob_get_contents = ob_get_contents();
+	ob_end_clean();
+	error_log(str_replace("\n", '', $ob_get_contents));
+}

application/libraries/PermissionLib.php

@@ -29,34 +29,34 @@ class PermissionLib
 	const INSERT_RIGHT = 'i';
 	const DELETE_RIGHT = 'd';
 	const REPLACE_RIGHT = 'ui';
-	
+
 	private $bb; // benutzerberechtigung
 	private $acl; // conversion array from a source to a permission
-	
+
 	/**
-	 * 
+	 *
 	 */
 	function __construct()
 	{
 		// Loads CI instance
 		$this->ci =& get_instance();
-		
+
 		// Loads the library to manage the rights system
 		//$this->ci->load->library('FHC_DB_ACL');
-		
+
 		// Loads the auth helper
 		$this->ci->load->helper('fhcauth');
-		
+
 		// Loads the array of resources
 		$this->acl = $this->ci->config->item('fhc_acl');
-		
-		// 
+
+		//
 		$this->bb = new benutzerberechtigung();
 	}
-	
+
 	/**
 	 * Check if the user is entitled to get access to a source with the given access type
-	 * 
+	 *
 	 * @return bool <b>true</b> if a user has the right to access to the specified
 	 *				resource with a specified permission type, <b>false</b> otherwise
 	 */
@@ -74,7 +74,7 @@ class PermissionLib
 			return false;
 		}
 	}
-	
+
 	/**
 	 * Get a permission by a given source
 	 */
@@ -89,16 +89,25 @@ class PermissionLib
 			return null;
 		}
 	}
-	
+
 	/**
-	 * 
+	 *
 	 */
 	private function isBerechtigt($berechtigung_kurzbz, $art = null,  $oe_kurzbz = null,  $kostenstelle_id = null)
 	{
 		if (!is_null($berechtigung_kurzbz))
 		{
 			$this->bb->getBerechtigungen(getAuthUID());
-			return $this->bb->isBerechtigt($berechtigung_kurzbz, $oe_kurzbz, $art, $kostenstelle_id);
+			if($this->bb->isBerechtigt($berechtigung_kurzbz, $oe_kurzbz, $art, $kostenstelle_id))
+			{
+				log_message('debug','Permission '.$berechtigung_kurzbz.' granted');
+				return true;
+			}
+			else
+			{
+				log_message('debug','Permission '.$berechtigung_kurzbz.' failed');
+				return false;
+			}
 		}
 		else
 		{

application/libraries/ReihungstestLib.php

@@ -23,7 +23,14 @@ class ReihungstestLib
 	 */
 	public function insertPersonReihungstest($ddReihungstest)
 	{
-		return $this->ci->RtPersonModel->insert($ddReihungstest);
+		if (isset($ddReihungstest['rt_id']) && $this->checkAvailability($ddReihungstest['rt_id']))
+		{
+  			return $this->ci->RtPersonModel->insert($ddReihungstest);
+		}
+		else
+		{
+			return error('This test is not more available');
+		}
 	}
 	
 	/**
@@ -62,4 +69,19 @@ class ReihungstestLib
 		
 		return $this->ci->ReihungstestModel->loadWhere($parametersArray);
 	}
+	
+	/**
+	 * It checks if the test is available
+	 */
+	public function checkAvailability($reihungstest_id)
+	{
+		$result = $this->ci->ReihungstestModel->checkAvailability($reihungstest_id);
+		
+		if (hasData($result))
+		{
+			return true;
+		}
+		
+		return false;
+	}
 }

application/models/crm/Reihungstest_model.php

@@ -11,4 +11,31 @@ class Reihungstest_model extends DB_Model
 		$this->dbTable = 'public.tbl_reihungstest';
 		$this->pk = 'reihungstest_id';
 	}	
+	
+	/**
+	 * Gets a test from a test id only if it is available
+	 */
+	public function checkAvailability($reihungstest_id)
+	{
+		$query = 'SELECT public.tbl_reihungstest.*
+					FROM public.tbl_reihungstest LEFT JOIN public.tbl_rt_studienplan USING(reihungstest_id)
+				   WHERE tbl_reihungstest.oeffentlich = TRUE
+					 AND tbl_reihungstest.datum > NOW()
+					 AND tbl_reihungstest.anmeldefrist >= NOW()
+					 AND COALESCE (
+							tbl_reihungstest.max_teilnehmer,
+							(
+								SELECT SUM(arbeitsplaetze)
+								  FROM public.tbl_ort JOIN public.tbl_rt_ort USING(ort_kurzbz)
+								 WHERE rt_id = tbl_reihungstest.reihungstest_id
+							)
+							) - (
+								SELECT COUNT(*)
+								  FROM public.tbl_rt_person
+								 WHERE rt_id = tbl_reihungstest.reihungstest_id
+							) > 0
+					  AND reihungstest_id = ?';
+		
+		return $this->execQuery($query, array($reihungstest_id));
+	}
 }

application/models/system/Message_model.php

@@ -87,7 +87,7 @@ class Message_model extends DB_Model
 	/**
 	 * 
 	 */
-	public function getMsgVarsData($prestudent_id)
+	public function getMsgVarsDataByPrestudentId($prestudent_id)
 	{
 		$query = 'SELECT * FROM public.vw_msg_vars WHERE prestudent_id %s ?';
 		

application/views/system/messageReply.php

@@ -1,65 +0,0 @@
-<?php $this->load->view("templates/header", array("title" => "MessageReply", "jquery" => true, "tinymce" => true)); ?>
-
-	<body>
-		<?php
-			$href = str_replace("/system/Messages/reply", "/system/Messages/sendReply", $_SERVER["REQUEST_URI"]);
-		?>
-		<form id="sendForm" method="post" action="<?php echo $href; ?>">
-			
-			<div class="row">
-				<div class="span4">
-					To: <?php echo $message->uid . " " . $message->vorname . " " . $message->nachname . " " . $message->kontakt; ?><br/>
-					Subject: <input type="text" value="Re: <?php echo $message->subject; ?>" name="subject"><br/>
-					<textarea id="bodyTextArea" name="body"><?php echo $message->body; ?></textarea>
-				</div>
-			</div>
-			
-			<div class="row">
-				<div class="span4">
-					<button type="submit">Send</button>
-					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-					<?php
-						echo $this->widgetlib->widget(
-							'Vorlage_widget',
-							null,
-							array('name' => 'vorlage', 'id' => 'vorlageDnD')
-						);
-					?>
-				</div>
-			</div>
-			
-		</form>
-	</body>
-	
-	<script>
-		tinymce.init({
-			selector: "#bodyTextArea"
-		});
-		
-		<?php
-			$url = str_replace("/system/Messages/reply", "/system/Messages/getVorlage", $_SERVER["REQUEST_URI"]);
-		?>
-		
-		$(document).ready(function() {
-			if ($("#vorlageDnD"))
-			{
-				$("#vorlageDnD").change(function() {
-					if (this.value != '')
-					{
-						$.ajax({
-							dataType: "json",
-							url: "<?php echo $url; ?>",
-							data: {"vorlage_kurzbz": this.value},
-							success: function(data, textStatus, jqXHR) {
-								tinyMCE.activeEditor.setContent(data.retval[0].text + "<?php echo $message->body; ?>");
-							},
-							error: function(jqXHR, textStatus, errorThrown) {
-								alert(textStatus + " - " + errorThrown);
-							}
-						});
-					}
-				});
-			}
-		});
-	</script>
-</html>

application/views/system/messageView.php

@@ -1,34 +0,0 @@
-<?php $this->load->view('templates/header'); ?>
-
-<script type="text/javascript" src="<?php echo base_url('vendor/tinymce/tinymce/tinymce.min.js');?>"></script>
-
-	<body>
-		<div class="row">
-			<div class="span4">
-				<h2>
-					From: <?php echo $message->uid . " " . $message->vorname . " " . $message->nachname . " " . $message->kontakt; ?><br/>
-					Subject: <?php echo $message->subject; ?><br/>
-				</h2>
-				<textarea id="bodyTextArea"><?php echo $message->body; ?></textarea>
-			</div>
-		</div>
-
-		<div class="row">
-			<div class="span4">
-				<button type="submit" onClick="parent.document.getElementById('MessagesBottom').src = 'Messages/reply/<?php echo $message->message_id; ?>/<?php echo $message->person_id; ?>'">
-					Reply
-				</button>
-			</div>
-		</div>
-
-		<script>
-			tinymce.init({
-				selector: '#bodyTextArea',
-				readonly : 1,
-				statusbar: false,
-				toolbar: false,
-				menubar: false
-			});
-		</script>
-	</body>
-</html>

application/views/system/messageWrite.php

@@ -1,10 +1,13 @@
 <?php $this->load->view("templates/header", array("title" => "MessageReply", "jquery" => true, "tinymce" => true)); ?>
 
 	<body>
+	
 		<?php
 			$href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER["REQUEST_URI"]);
 		?>
+		
 		<form id="sendForm" method="post" action="<?php echo $href; ?>">
+		
 			<table>
 				<tr>
 					<td>
@@ -33,15 +36,30 @@
 						<strong>Subject:</strong>&nbsp;
 					</td>
 					<td>
-						<input id="subject" type="text" value="" name="subject" size="70">
+						<?php
+							$subject = '';
+							if (isset($message))
+							{
+								$subject = 'Re: '.$message->subject;
+							}
+						?>
+						<input id="subject" type="text" value="<?php echo $subject; ?>" name="subject" size="70">
 					</td>
 				</tr>
 			</table>
+			
 			<table width="100%">
 				<tr>
 					<td width="80%">
 						<strong>Message:</strong><br>
-						<textarea id="bodyTextArea" name="body"></textarea>
+						<?php
+							$body = '';
+							if (isset($message))
+							{
+								$body = $message->body;
+							}
+						?>
+						<textarea id="bodyTextArea" name="body"><?php echo $body; ?></textarea>
 					</td>
 					<td width="3%">&nbsp;</td>
 					<td width="17%">
@@ -142,8 +160,16 @@
 				}
 			?>
 			
+			<?php
+				if (isset($message))
+				{
+			?>
+					<input type="hidden" name="relationmessage_id" value="<?php echo $message->message_id; ?>">
+			<?php
+				}
+			?>
+			
 		</form>
-	</body>
 	
 	<script>
 		tinymce.init({
@@ -254,4 +280,7 @@
 			});
 		}
 	</script>
-</html>
+	
+	</body>
+	
+<?php $this->load->view("templates/footer"); ?>

application/views/system/messages.php

@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">
-<html lang="de_AT">
-
-	<head>
-		<title>VileSci - Messages</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	</head>
-
-	<frameset rows="30%,*">
-		<frame src="Messages/inbox/<?php echo $person_id; ?>" id="MessagesTop" name="MessagesTop" frameborder="0" />
-		<frame src="" id="MessagesBottom" name="MessagesBottom" frameborder="0" />
-		<noframes>
-			<body bgcolor="#FFFFFF">
-				This application works only with a frames-enabled browser.<br />
-				<a href="MessagesList">Use without frames</a>
-			</body>
-		</noframes>
-	</frameset>
-
-</html>

application/views/system/messagesInbox.php

@@ -1,57 +0,0 @@
-<?php $this->load->view('templates/header', array('title' => 'MessagesList', 'tablesort' => true, 'tableid' => 't1', 'headers' => '4:{sorter:false}')); ?>
-
-		<div class="row">
-			<div class="span4">
-				<h2>
-					Inbox <?php echo $person->vorname . " " . $person->nachname; ?>
-					<br />
-					<br />
-					<button type="button" onClick="parent.document.getElementById('MessagesTop').src = 'Messages/outbox/<?php echo $person->person_id; ?>'">
-						Outbox
-					</button>
-					<br />
-					<br />
-				</h2>
-				<form method="post" action="">
-					Person <input name="person_id"></input>
-					<button type="submit">show Mails</button> 
-				</form> 
-				<table id="t1" class="tablesorter">
-					<thead>
-						<tr>
-							<th>MessageID</th>
-							<th class='table-sortable:default'>Sender</th>
-							<th>Erstellt</th>
-							<th>Priorität</th>
-							<th>Status</th>
-							<th>StatusInfo</th>
-							<th>OE</th>
-							<th>Relation</th>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<?php foreach ($messages as $m): ?>
-							<?php
-								$href = str_replace("/system/Messages/inbox", "/system/Messages/view", $_SERVER["REQUEST_URI"]);
-								$href = substr($href, 0, strrpos($href, "/") - strlen($href));
-								$href .= "/" . $m->message_id . "/" . $person->person_id;
-							?>
-							<tr>
-								<td><a href="<?php echo $href; ?>" target="MessagesBottom"><?php echo $m->message_id; ?></a></td>
-								<td><?php echo $m->titelpost.' '.$m->vorname.' '.$m->nachname.' '.$m->titelpre; ?></td>
-								<td><?php echo $m->insertamum; ?></td>
-								<td><?php echo $m->priority; ?></td>
-								<td><?php echo $m->status; ?></td>
-								<td><?php echo $m->statusinfo; ?></td>
-								<td><?php echo $m->oe_kurzbz; ?></td>
-								<td><?php echo $m->relationmessage_id; ?></td>
-								<td><a href="<?php echo $href; ?>" target="MessagesBottom">View</a></td>
-							</tr>
-						<?php endforeach ?>
-					</tbody>
-				</table>
-			</div>
-		</div>
-	</body>
-</html>

application/views/system/messagesOutbox.php

@@ -1,57 +0,0 @@
-<?php $this->load->view('templates/header', array('title' => 'MessagesList', 'tablesort' => true, 'tableid' => 't1', 'headers' => '4:{sorter:false}')); ?>
-
-		<div class="row">
-			<div class="span4">
-				<h2>
-					Outbox <?php echo $person->vorname . " " . $person->nachname; ?>
-					<br />
-					<br />
-					<button type="button" onClick="parent.document.getElementById('MessagesTop').src = 'Messages/inbox/<?php echo $person->person_id; ?>'">
-						Inbox
-					</button>
-					<br />
-					<br />
-				</h2>
-				<form method="post" action="">
-					Person <input name="person_id"></input>
-					<button type="submit">show Mails</button> 
-				</form>
-				<table id="t1" class="tablesorter">
-					<thead>
-						<tr>
-							<th>MessageID</th>
-							<th class='table-sortable:default'>Sender</th>
-							<th>Erstellt</th>
-							<th>Priorität</th>
-							<th>Status</th>
-							<th>StatusInfo</th>
-							<th>OE</th>
-							<th>Relation</th>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						<?php foreach ($messages as $m): ?>
-							<?php
-								$href = str_replace("/system/Messages/outbox", "/system/Messages/view", $_SERVER["REQUEST_URI"]);
-								$href = substr($href, 0, strrpos($href, "/") - strlen($href));
-								$href .= "/" . $m->message_id . "/" . $person->person_id;
-							?>
-							<tr>
-								<td><a href="<?php echo $href; ?>" target="MessagesBottom"><?php echo $m->message_id; ?></a></td>
-								<td><?php echo $m->titelpost.' '.$m->vorname.' '.$m->nachname.' '.$m->titelpre; ?></td>
-								<td><?php echo $m->insertamum; ?></td>
-								<td><?php echo $m->priority; ?></td>
-								<td><?php echo $m->status; ?></td>
-								<td><?php echo $m->statusinfo; ?></td>
-								<td><?php echo $m->oe_kurzbz; ?></td>
-								<td><?php echo $m->relationmessage_id; ?></td>
-								<td><a href="<?php echo $href; ?>" target="MessagesBottom">View</a></td>
-							</tr>
-						<?php endforeach ?>
-					</tbody>
-				</table>
-			</div>
-		</div>
-	</body>
-</html>

cis/private/lehre/moodle_choice.php

@@ -27,6 +27,7 @@ require_once('../../../include/moodle.class.php');
 require_once('../../../include/moodle19_course.class.php');
 require_once('../../../include/moodle24_course.class.php');
 require_once('../../../include/phrasen.class.php');
+require_once('../../../include/lehreinheit.class.php');
 
 if (!$db = new basis_db())
 	die('Fehler beim Herstellen der Datenbankverbindung');
@@ -37,15 +38,15 @@ $p = new phrasen(getSprache());
 
 if(isset($_GET['lvid']))
 	$lvid=$_GET['lvid'];
-else 
+else
 	die('lvid muss uebergeben werden');
-	
+
 if(isset($_GET['stsem']))
 	$stsem = $_GET['stsem'];
-else 
+else
 	die('Es wurde kein Studiensemester uebergeben');
-	
-echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+
+echo '<!DOCTYPE HTML>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -53,39 +54,74 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www
 </head>
 <body>
 <h1>'.$p->t('moodle/kursUebersicht').'</h1>
-
-<table width="100%">
-	<tr>
-		<td>';
+';
 
 $moodle = new moodle();
 $moodle->getAll($lvid, $stsem);
 
+$meinekurse = '';
+$allgemeinekurse = '';
+
 foreach ($moodle->result as $row)
 {
+	$kurs = '';
 	switch($row->moodle_version)
 	{
 		case '1.9':
 			$mdlcourse19=new moodle19_course();
 			$mdlcourse19->load($row->mdl_course_id);
-			echo "<a href='".$moodle->getPfad($row->moodle_version)."course/view.php?id=".$row->mdl_course_id."' class='Item'>$mdlcourse19->mdl_fullname</a><br>";
+			$bezeichnung = $mdlcourse19->mdl_fullname;
+			if($bezeichnung=='')
+				$bezeichnung = 'Course '.$row->mdl_course_id;
+			$kurs = "<a href='".$moodle->getPfad($row->moodle_version)."course/view.php?id=".$row->mdl_course_id."' class='Item'>$bezeichnung</a><br>";
 			break;
 
 		case '2.4':
 			$mdlcourse24=new moodle24_course();
 			$mdlcourse24->load($row->mdl_course_id);
-			echo "<a href='".$moodle->getPfad($row->moodle_version)."course/view.php?id=".$row->mdl_course_id."' class='Item'>$mdlcourse24->mdl_fullname</a><br>";
+			$bezeichnung = $mdlcourse24->mdl_fullname;
+			if($bezeichnung=='')
+				$bezeichnung = 'Course '.$row->mdl_course_id;
+			$kurs = "<a href='".$moodle->getPfad($row->moodle_version)."course/view.php?id=".$row->mdl_course_id."' class='Item'>$bezeichnung</a><br>";
 			break;
 
 		default:
-			echo $p->t('moodle/ungueltigeVersion',array($row->moodle_version)).'<br>';
+			$kurs = $p->t('moodle/ungueltigeVersion',array($row->moodle_version)).'<br>';
 			break;
 	}
+	if($row->lehreinheit_id!='')
+	{
+		$le = new lehreinheit();
+		$stud = $le->getStudenten($row->lehreinheit_id);
+		$zugeordnet = false;
+
+		foreach($stud as $row_stud)
+		{
+			if($row_stud->uid == $user)
+			{
+				$zugeordnet = true;
+				break;
+			}
+		}
+
+		if($zugeordnet)
+		{
+			$meinekurse .= $kurs;
+		}
+	}
+	$allgemeinekurse .= $kurs;
 }
 
-echo '	</td>
-	</tr>
-</table>
-</body>
+if($meinekurse!='')
+{
+	echo '<h2>'.$p->t('moodle/meineKurse').'</h2>';
+	echo $meinekurse;
+}
+
+echo '<br><br><h2>'.$p->t('moodle/vorhandeneKurse').'</h2>';
+
+echo $allgemeinekurse;
+
+echo '</body>
 </html>';
 ?>

content/messages.js.php

@@ -24,6 +24,7 @@ var MessagePersonID=null;
 var MessagesTreeDatasource=''; // Datasource des Adressen Trees
 var MessagesSelectID='';
 var MessageSenderPersonID='';
+var MessageIFrameIsInitialized=false;
 
 var MessagesTreeSinkObserver =
 {
@@ -102,9 +103,9 @@ function MessagesNewMessage()
 	else
 	{
 		var prestudentIdArray = getMultipleTreeCellText(tree, 'student-treecol-prestudent_id');
-		
+
 		var action = '<?php echo APP_ROOT ?>index.ci.php/system/Messages/write/' + MessageSenderPersonID;
-		
+
 		openWindowPostArray(action, 'prestudent_id', prestudentIdArray);
 	}
 }
@@ -114,16 +115,22 @@ function MessagesNewMessage()
  */
 function MessagesSendAnswer()
 {
-	var tree=document.getElementById('messages-tree');
-	if(tree.currentIndex==-1)
+	var messagesTree = document.getElementById('messages-tree');
+	var studentsTree = parent.document.getElementById('student-tree');
+
+	if (messagesTree.currentIndex == -1)
 	{
 		alert("Bitte markieren Sie zuerst eine Nachricht");
 	}
 	else
 	{
-		var MessageId = getTreeCellText(tree, 'messages-tree-message_id', tree.currentIndex);
-		var RecipientID = getTreeCellText(tree, 'messages-tree-recipient_id', tree.currentIndex);
-		window.open('<?php echo APP_ROOT ?>index.ci.php/system/Messages/reply/'+MessageId+'/'+RecipientID,'Reply','');
+		var MessageId = getTreeCellText(messagesTree, 'messages-tree-message_id', messagesTree.currentIndex);
+		var RecipientID = getTreeCellText(messagesTree, 'messages-tree-recipient_id', messagesTree.currentIndex);
+		var prestudentIdArray = new Array(getTreeCellText(studentsTree, 'student-treecol-prestudent_id', studentsTree.currentIndex));
+
+		var action = '<?php echo APP_ROOT ?>index.ci.php/system/Messages/write/' + MessageSenderPersonID + '/' + MessageId + '/' + RecipientID;
+
+		openWindowPostArray(action, 'prestudent_id', prestudentIdArray);
 	}
 }
 
@@ -150,5 +157,35 @@ function MessageAuswahl()
 			document.getElementById('messages-button-answer').disabled=false;
 		}
 	}
-	document.getElementById('message-wysiwyg').value=text;
+
+	MessagesIFrameSetHTML(text);
 }
+
+function MessagesIFrameSetHTML(val)
+{
+	MessageIFrameInit();
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	editor = document.getElementById('message-wysiwyg');
+
+	if(editor.contentWindow.document.body.innerHTML!='')
+	{
+		//Inhalt leeren
+		editor.contentDocument.execCommand("selectall", false, null);
+		editor.contentDocument.execCommand("delete", false, null);
+	}
+	//Value setzen
+	if(val!='')
+		editor.contentDocument.execCommand("inserthtml", false, val);
+}
+
+function MessageIFrameInit()
+{
+	if(!MessageIFrameIsInitialized)
+	{
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		editor = document.getElementById('message-wysiwyg');
+		editor.contentDocument.designMode = 'on';
+		editor.style.backgroundColor="#FFFFFF";
+		MessageIFrameIsInitialized=true;
+	}
+}

content/messages.xul.php

@@ -73,7 +73,7 @@ echo ']>
 	<button oncommand="MessagesSendAnswer()" id="messages-button-answer" label="Antworten"/>
 </hbox>
 
-<hbox>
+<hbox flex="1">
 
 <tree id="messages-tree" seltype="single" hidecolumnpicker="false" flex="1"
 	datasources="rdf:null" ref="http://www.technikum-wien.at/messages"
@@ -142,8 +142,11 @@ echo ']>
 		</treechildren>
 	</template>
 </tree>
+<splitter collapse="after" persist="state">
+	<grippy />
+</splitter>
+<iframe id="message-wysiwyg" editortype="html" src="about:blank" flex="1" type="content-primary" style="min-width: 100px; min-height: 100px; border: 1px solid gray; margin: 10px;"/>
 </hbox>
-<box class="WYSIWYG" id="message-wysiwyg" flex="1"/>
-<spacer flex="1" />
+
 </vbox>
 </window>

content/statistik/oeh_beitraege.xls.php

@@ -157,14 +157,17 @@ if($studiensemester_kurzbz!='')
 		(SELECT strasse FROM public.tbl_adresse WHERE person_id=public.tbl_person.person_id ORDER BY heimatadresse desc LIMIT 1) AS w_strasse,
 		titelpost, get_rolle_prestudent(tbl_prestudent.prestudent_id, ".$db->db_add_param($studiensemester_kurzbz).") as status,
 		(SELECT ausbildungssemester FROM public.tbl_prestudentstatus WHERE prestudent_id=public.tbl_prestudent.prestudent_id AND tbl_prestudentstatus.studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."' ORDER BY datum desc LIMIT 1) AS semester
-		FROM public.tbl_person
-		JOIN public.tbl_benutzer using(person_id)
-		JOIN public.tbl_student on(uid=student_uid)
-		JOIN public.tbl_prestudent using(prestudent_id)
-		JOIN public.tbl_prestudentstatus on(tbl_prestudentstatus.prestudent_id=tbl_student.prestudent_id)
-		WHERE tbl_prestudentstatus.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
-		AND get_rolle_prestudent(tbl_prestudent.prestudent_id, ".$db->db_add_param($studiensemester_kurzbz).") in('Student','Diplomand','Praktikant','Incoming')
-		AND tbl_student.studiengang_kz<999 AND tbl_prestudent.bismelden=true";
+		FROM 
+			public.tbl_person
+			JOIN public.tbl_benutzer using(person_id)
+			JOIN public.tbl_student on(uid=student_uid)
+			JOIN public.tbl_prestudent using(prestudent_id)
+			JOIN public.tbl_prestudentstatus on(tbl_prestudentstatus.prestudent_id=tbl_student.prestudent_id)
+		WHERE 
+			tbl_prestudentstatus.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
+			AND get_rolle_prestudent(tbl_prestudent.prestudent_id, ".$db->db_add_param($studiensemester_kurzbz).") in('Student','Diplomand','Praktikant','Incoming')
+			AND tbl_student.studiengang_kz<10000 
+			AND tbl_prestudent.bismelden=true";
 	// AND tbl_benutzer.aktiv=true
 
 	if($result = $db->db_query($qry))
@@ -331,19 +334,21 @@ if($studiensemester_kurzbz!='')
 	(SELECT strasse FROM public.tbl_adresse WHERE person_id=public.tbl_person.person_id ORDER BY heimatadresse desc LIMIT 1) AS w_strasse,
 	titelpost, get_rolle_prestudent(tbl_prestudent.prestudent_id, ".$db->db_add_param($studiensemester_kurzbz).") as status,
 	(SELECT ausbildungssemester FROM public.tbl_prestudentstatus WHERE prestudent_id=public.tbl_prestudent.prestudent_id AND tbl_prestudentstatus.studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."' ORDER BY datum desc LIMIT 1) AS semester
-	FROM public.tbl_person
-	JOIN public.tbl_konto as ka using(person_id)
-	JOIN public.tbl_konto as kb using(person_id)
-	JOIN public.tbl_benutzer using(person_id)
-	JOIN public.tbl_student on(uid=student_uid)
-	JOIN public.tbl_prestudent using(prestudent_id)
-	JOIN public.tbl_prestudentstatus on(tbl_prestudentstatus.prestudent_id=tbl_student.prestudent_id)
-	WHERE tbl_prestudentstatus.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
-	AND get_rolle_prestudent(tbl_prestudent.prestudent_id, ".$db->db_add_param($studiensemester_kurzbz).") in('Student','Diplomand','Praktikant','Incoming','Absolvent','Abbrecher')
-	AND tbl_student.studiengang_kz<999 AND
-	ka.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND ka.buchungstyp_kurzbz='OEH' AND tbl_student.studiengang_kz=ka.studiengang_kz
-	AND kb.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND kb.buchungstyp_kurzbz='OEH' AND tbl_student.studiengang_kz=kb.studiengang_kz
-	AND kb.buchungsnr_verweis=ka.buchungsnr";
+	FROM 
+		public.tbl_person
+		JOIN public.tbl_konto as ka using(person_id)
+		JOIN public.tbl_konto as kb using(person_id)
+		JOIN public.tbl_benutzer using(person_id)
+		JOIN public.tbl_student on(uid=student_uid)
+		JOIN public.tbl_prestudent using(prestudent_id)
+		JOIN public.tbl_prestudentstatus on(tbl_prestudentstatus.prestudent_id=tbl_student.prestudent_id)
+	WHERE 
+		tbl_prestudentstatus.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
+		AND get_rolle_prestudent(tbl_prestudent.prestudent_id, ".$db->db_add_param($studiensemester_kurzbz).") in('Student','Diplomand','Praktikant','Incoming','Absolvent','Abbrecher')
+		AND tbl_student.studiengang_kz<10000 
+		AND ka.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND ka.buchungstyp_kurzbz in('OEH','Lehrgangsgebuehr') AND tbl_student.studiengang_kz=ka.studiengang_kz
+		AND kb.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND kb.buchungstyp_kurzbz in('OEH','Lehrgangsgebuehr') AND tbl_student.studiengang_kz=kb.studiengang_kz
+		AND kb.buchungsnr_verweis=ka.buchungsnr";
 	//AND tbl_benutzer.aktiv=true
 
 	if($result = $db->db_query($qry))

content/statistik/studentenexport.xls.php

@@ -177,7 +177,9 @@ loadVariables($user);
 	$maxlength[$i]=8;
 	$worksheet->write($zeile,++$i,"PRESTUDENTID", $format_bold);
 	$maxlength[$i]=12;
-
+	$worksheet->write($zeile,++$i,"MATR_NR", $format_bold);
+	$maxlength[$i]=12;
+	
 	$zeile++;
 
 	$ids = explode(';',$data);
@@ -565,6 +567,12 @@ loadVariables($user);
 			$maxlength[$i] = mb_strlen($row->prestudent_id);
 		$worksheet->write($zeile,$i, $row->prestudent_id);
 		$i++;
+
+		//Matrikelnummer (tbl_person)
+		if(mb_strlen($row->matr_nr)>$maxlength[$i])
+			$maxlength[$i] = mb_strlen($row->matr_nr);
+		$worksheet->write($zeile,$i, $row->matr_nr);
+		$i++;
 	}
 
 

include/tw/anwesenheitsliste_bilder.inc.php

@@ -58,18 +58,18 @@ $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=".$db->db_add_param($lvid)." 
-		AND 
+$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=".$db->db_add_param($lvid)."
+		AND
 			studiensemester_kurzbz=".$db->db_add_param($stsem);
 if($lehreinheit_id!='')
 	$qry.=" AND lehreinheit_id=".$db->db_add_param($lehreinheit_id);
@@ -128,8 +128,8 @@ $pdf->SetFont('Arial','',8);
 		$pdf->MultiCell(130,$lineheight,mb_convert_encoding('HörerIn/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->MultiCell(70,$lineheight,'Kennzeichen',1,'C',0);
+		$maxX +=70;
 		$pdf->SetXY($maxX,$maxY);
 		$pdf->MultiCell(65,$lineheight,'Gruppe',1,'C',0);
 		$maxX +=65;
@@ -215,8 +215,8 @@ if($result = $db->db_query($qry))
 			$maxX +=130;
 			$pdf->SetXY($maxX,$maxY);
 			$pdf->SetFont('Arial','',10);
-			$pdf->MultiCell(65,$lineheight,trim($matrikelnr),1,'C',1);
-			$maxX +=65;
+			$pdf->MultiCell(70,$lineheight,trim($matrikelnr),1,'C',1);
+			$maxX +=70;
 			$pdf->SetXY($maxX,$maxY);
 			$pdf->MultiCell(65,$lineheight,$sem_verb_grup,1,'C',1);
 			$maxX +=65;

include/tw/vilesci_menu_main.inc.php

@@ -230,7 +230,6 @@ $menu=array
 		'link'=>'left.php?categorie=Admin', 'target'=>'nav',
 		'Cronjobs'=>array('name'=>'Cronjobs', 'link'=>'stammdaten/cronjobverwaltung.php', 'target'=>'main','permissions'=>array('basis/cronjob')),
 		'Vorlagen'=>array('name'=>'Vorlagen', 'link'=>'../index.ci.php/system/Vorlage', 'target'=>'main','permissions'=>array('basis/cronjob')),
-		'Messages'=>array('name'=>'Nachrichten', 'link'=>'../index.ci.php/system/Messages', 'target'=>'main','permissions'=>array('basis/cronjob')),
 		'Phrasen'=>array('name'=>'Phrasen', 'link'=>'../index.ci.php/system/Phrases', 'target'=>'main','permissions'=>array('basis/cronjob'))
 	),
 	'SD-Tools'=>	array

locale/de-AT/moodle.php

@@ -35,4 +35,6 @@ Bitte wählen Sie die Moodle Version die Sie für Ihre Lehrveranstaltung verwend
 Moodle befindet sich derzeit im Dualbetrieb.<br>
 Ab dem <b>Wintersemester 2014</b> wird Moodle nur noch in der <b>Version 2.4</b> angeboten.
 </center>';
+$this->phrasen['moodle/meineKurse']='Meine Kurse';
+$this->phrasen['moodle/vorhandeneKurse']='Vorhandene Kurse';
 ?>

locale/en-US/moodle.php

@@ -35,4 +35,6 @@ Please select the Moodle version you want to use for your course:
 Two versions of Moodle are currently offered.<br>
 Starting <b>Winter Semester 2014</b>, Moodle will only be available in <b>version 2.4</b>.
 </center>';
+$this->phrasen['moodle/meineKurse']='My Courses';
+$this->phrasen['moodle/vorhandeneKurse']='Available Courses';
 ?>

rdf/lehrstunde.rdf.php

@@ -204,24 +204,24 @@ if (is_array($lehrstunden->lehrstunden))
 			?>
   			<RDF:li>
   	    	<RDF:Description  id="<?php echo $ls->stundenplan_id; ?>"  about="<?php echo $rdf_url.'/'. $ls->stundenplan_id; ?>" >
-  		      	<LEHRSTUNDE:id><?php echo $ls->stundenplan_id  ?></LEHRSTUNDE:id>
-  		      	<LEHRSTUNDE:reservierung><?php echo ($ls->reservierung?'true':'false'); ?></LEHRSTUNDE:reservierung>
-				<LEHRSTUNDE:lehreinheit_id><?php echo $ls->lehreinheit_id  ?></LEHRSTUNDE:lehreinheit_id>
-				<LEHRSTUNDE:datum><?php echo $ls->datum  ?></LEHRSTUNDE:datum>
-				<LEHRSTUNDE:stunde><?php echo $ls->stunde  ?></LEHRSTUNDE:stunde>
-  		  		<LEHRSTUNDE:unr><?php echo $ls->unr  ?></LEHRSTUNDE:unr>
-				<LEHRSTUNDE:ort_kurzbz><?php echo $ls->ort_kurzbz  ?></LEHRSTUNDE:ort_kurzbz>
-				<LEHRSTUNDE:lehrfach><?php echo $ls->lehrfach  ?></LEHRSTUNDE:lehrfach>
+  		      	<LEHRSTUNDE:id><![CDATA[<?php echo $ls->stundenplan_id  ?>]]></LEHRSTUNDE:id>
+  		      	<LEHRSTUNDE:reservierung><![CDATA[<?php echo ($ls->reservierung?'true':'false'); ?>]]></LEHRSTUNDE:reservierung>
+				<LEHRSTUNDE:lehreinheit_id><![CDATA[<?php echo $ls->lehreinheit_id  ?>]]></LEHRSTUNDE:lehreinheit_id>
+				<LEHRSTUNDE:datum><![CDATA[<?php echo $ls->datum  ?>]]></LEHRSTUNDE:datum>
+				<LEHRSTUNDE:stunde><![CDATA[<?php echo $ls->stunde  ?>]]></LEHRSTUNDE:stunde>
+  		  		<LEHRSTUNDE:unr><![CDATA[<?php echo $ls->unr  ?>]]></LEHRSTUNDE:unr>
+				<LEHRSTUNDE:ort_kurzbz><![CDATA[<?php echo $ls->ort_kurzbz  ?>]]></LEHRSTUNDE:ort_kurzbz>
+				<LEHRSTUNDE:lehrfach><![CDATA[<?php echo $ls->lehrfach  ?>]]></LEHRSTUNDE:lehrfach>
 				<LEHRSTUNDE:lehrfach_bez><![CDATA[<?php echo $ls->lehrfach_bez  ?>]]></LEHRSTUNDE:lehrfach_bez>
-				<LEHRSTUNDE:lehrform><?php echo $ls->lehrform  ?></LEHRSTUNDE:lehrform>
-				<LEHRSTUNDE:lektor><?php echo $ls->lektor_kurzbz  ?></LEHRSTUNDE:lektor>
-				<LEHRSTUNDE:sem><?php echo $ls->sem  ?></LEHRSTUNDE:sem>
-				<LEHRSTUNDE:ver><?php echo $ls->ver  ?></LEHRSTUNDE:ver>
-				<LEHRSTUNDE:grp><?php echo $ls->grp  ?></LEHRSTUNDE:grp>
-				<LEHRSTUNDE:gruppe><?php echo $ls->gruppe_kurzbz  ?></LEHRSTUNDE:gruppe>
-				<LEHRSTUNDE:lehrform><?php echo $ls->lehrform  ?></LEHRSTUNDE:lehrform>
-				<LEHRSTUNDE:studiengang><?php echo $ls->studiengang  ?></LEHRSTUNDE:studiengang>
-				<LEHRSTUNDE:farbe><?php echo $ls->farbe  ?></LEHRSTUNDE:farbe>
+				<LEHRSTUNDE:lehrform><![CDATA[<?php echo $ls->lehrform  ?>]]></LEHRSTUNDE:lehrform>
+				<LEHRSTUNDE:lektor><![CDATA[<?php echo $ls->lektor_kurzbz  ?>]]></LEHRSTUNDE:lektor>
+				<LEHRSTUNDE:sem><![CDATA[<?php echo $ls->sem  ?>]]></LEHRSTUNDE:sem>
+				<LEHRSTUNDE:ver><![CDATA[<?php echo $ls->ver  ?>]]></LEHRSTUNDE:ver>
+				<LEHRSTUNDE:grp><![CDATA[<?php echo $ls->grp  ?>]]></LEHRSTUNDE:grp>
+				<LEHRSTUNDE:gruppe><![CDATA[<?php echo $ls->gruppe_kurzbz  ?>]]></LEHRSTUNDE:gruppe>
+				<LEHRSTUNDE:lehrform><![CDATA[<?php echo $ls->lehrform  ?>]]></LEHRSTUNDE:lehrform>
+				<LEHRSTUNDE:studiengang><![CDATA[<?php echo $ls->studiengang  ?>]]></LEHRSTUNDE:studiengang>
+				<LEHRSTUNDE:farbe><![CDATA[<?php echo $ls->farbe  ?>]]></LEHRSTUNDE:farbe>
 				<LEHRSTUNDE:anmerkung><![CDATA[<?php echo $ls->anmerkung;  ?>]]></LEHRSTUNDE:anmerkung>
 				<LEHRSTUNDE:anmerkung_lehreinheit><![CDATA[<?php echo $ls->anmerkung_lehreinheit;  ?>]]></LEHRSTUNDE:anmerkung_lehreinheit>
 				<LEHRSTUNDE:titel><![CDATA[<?php echo $ls->titel;  ?>]]></LEHRSTUNDE:titel>

system/xsl/Studienblatt_Leer.xsl

@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+>
+
+<xsl:output method="xml" version="1.0" indent="yes"/>
+<xsl:template match="studienblaetter">
+
+<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2">
+    <office:scripts/>
+    <office:font-face-decls>
+        <style:font-face style:name="Mangal1" svg:font-family="Mangal"/>
+        <style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="roman" style:font-pitch="variable"/>
+        <style:font-face style:name="Tahoma" svg:font-family="Tahoma" style:font-family-generic="roman" style:font-pitch="variable"/>
+        <style:font-face style:name="Times New Roman" svg:font-family="&apos;Times New Roman&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
+        <style:font-face style:name="Liberation Sans" svg:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="swiss" style:font-pitch="variable"/>
+        <style:font-face style:name="Arial1" svg:font-family="Arial" style:font-family-generic="system" style:font-pitch="variable"/>
+        <style:font-face style:name="Mangal" svg:font-family="Mangal" style:font-family-generic="system" style:font-pitch="variable"/>
+        <style:font-face style:name="Microsoft YaHei" svg:font-family="&apos;Microsoft YaHei&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+        <style:font-face style:name="Tahoma1" svg:font-family="Tahoma" style:font-family-generic="system" style:font-pitch="variable"/>
+        <style:font-face style:name="Times New Roman1" svg:font-family="&apos;Times New Roman&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+    </office:font-face-decls>
+    <office:automatic-styles>
+        <style:style style:name="Tabelle1" style:family="table">
+            <style:table-properties style:width="16.443cm" fo:margin-left="-0.199cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left" style:writing-mode="lr-tb"/>
+        </style:style>
+        <style:style style:name="Tabelle1.A" style:family="table-column">
+            <style:table-column-properties style:column-width="4.69cm"/>
+        </style:style>
+        <style:style style:name="Tabelle1.B" style:family="table-column">
+            <style:table-column-properties style:column-width="7.5cm"/>
+        </style:style>
+        <style:style style:name="Tabelle1.C" style:family="table-column">
+            <style:table-column-properties style:column-width="4.253cm"/>
+        </style:style>
+        <style:style style:name="Tabelle1.1" style:family="table-row">
+            <style:table-row-properties style:min-row-height="1cm" fo:keep-together="auto"/>
+        </style:style>
+        <style:style style:name="Tabelle1.A1" style:family="table-cell">
+            <style:table-cell-properties fo:background-color="#ffffff" fo:padding-left="0.199cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="0.5pt solid #00000a">
+                <style:background-image/>
+            </style:table-cell-properties>
+        </style:style>
+        <style:style style:name="Tabelle1.2" style:family="table-row">
+            <style:table-row-properties style:min-row-height="0.501cm" fo:keep-together="auto"/>
+        </style:style>
+        <style:style style:name="Tabelle2" style:family="table">
+            <style:table-properties style:width="16.379cm" fo:margin-left="-0.199cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left" style:writing-mode="lr-tb"/>
+        </style:style>
+        <style:style style:name="Tabelle2.A" style:family="table-column">
+            <style:table-column-properties style:column-width="5.84cm"/>
+        </style:style>
+        <style:style style:name="Tabelle2.B" style:family="table-column">
+            <style:table-column-properties style:column-width="6.003cm"/>
+        </style:style>
+        <style:style style:name="Tabelle2.C" style:family="table-column">
+            <style:table-column-properties style:column-width="4.537cm"/>
+        </style:style>
+        <style:style style:name="Tabelle2.1" style:family="table-row">
+            <style:table-row-properties fo:keep-together="auto"/>
+        </style:style>
+        <style:style style:name="Tabelle2.A1" style:family="table-cell">
+            <style:table-cell-properties fo:background-color="#ffffff" fo:padding-left="0.199cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="0.5pt solid #00000a">
+                <style:background-image/>
+            </style:table-cell-properties>
+        </style:style>
+        <style:style style:name="Tabelle3" style:family="table">
+            <style:table-properties style:width="16.443cm" fo:margin-left="-0.199cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left" style:writing-mode="lr-tb"/>
+        </style:style>
+        <style:style style:name="Tabelle3.A" style:family="table-column">
+            <style:table-column-properties style:column-width="7.689cm"/>
+        </style:style>
+        <style:style style:name="Tabelle3.B" style:family="table-column">
+            <style:table-column-properties style:column-width="8.754cm"/>
+        </style:style>
+        <style:style style:name="Tabelle3.1" style:family="table-row">
+            <style:table-row-properties style:min-row-height="0.801cm" fo:keep-together="auto"/>
+        </style:style>
+        <style:style style:name="Tabelle3.A1" style:family="table-cell">
+            <style:table-cell-properties style:vertical-align="middle" fo:background-color="#ffffff" fo:padding-left="0.199cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="0.5pt solid #00000a">
+                <style:background-image/>
+            </style:table-cell-properties>
+        </style:style>
+        <style:style style:name="Tabelle4" style:family="table">
+            <style:table-properties style:width="16.443cm" fo:margin-left="-0.199cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left" style:writing-mode="lr-tb"/>
+        </style:style>
+        <style:style style:name="Tabelle4.A" style:family="table-column">
+            <style:table-column-properties style:column-width="3.69cm"/>
+        </style:style>
+        <style:style style:name="Tabelle4.B" style:family="table-column">
+            <style:table-column-properties style:column-width="12.753cm"/>
+        </style:style>
+        <style:style style:name="Tabelle4.1" style:family="table-row">
+            <style:table-row-properties fo:keep-together="auto"/>
+        </style:style>
+        <style:style style:name="Tabelle4.A1" style:family="table-cell">
+            <style:table-cell-properties fo:padding-left="0.199cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="0.5pt solid #00000a"/>
+        </style:style>
+        <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Footer">
+            <style:paragraph-properties>
+                <style:tab-stops>
+                    <style:tab-stop style:position="8.001cm" style:type="center"/>
+                    <style:tab-stop style:position="15.998cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+        </style:style>
+        <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties>
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="11pt" style:font-size-asian="11pt" style:font-size-complex="11pt"/>
+        </style:style>
+        <style:style style:name="P3" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties>
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+        </style:style>
+        <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties>
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+        </style:style>
+        <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:text-align="end" style:justify-single-word="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+        </style:style>
+        <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:margin-top="0.106cm" fo:margin-bottom="0cm" style:contextual-spacing="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+        </style:style>
+        <style:style style:name="P7" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:margin-top="0.106cm" fo:margin-bottom="0cm" style:contextual-spacing="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="11pt" style:font-size-asian="11pt" style:font-size-complex="11pt"/>
+        </style:style>
+        <style:style style:name="P8" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:margin-top="0.106cm" fo:margin-bottom="0cm" style:contextual-spacing="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="11pt" officeooo:rsid="00026b08" officeooo:paragraph-rsid="00026b08" style:font-size-asian="11pt" style:font-size-complex="11pt"/>
+        </style:style>
+        <style:style style:name="P9" style:family="paragraph" style:parent-style-name="Header">
+            <style:paragraph-properties fo:margin-top="0.494cm" fo:margin-bottom="0.423cm" style:contextual-spacing="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="7.502cm"/>
+                    <style:tab-stop style:position="9.502cm"/>
+                    <style:tab-stop style:position="14.753cm"/>
+                    <style:tab-stop style:position="15.503cm"/>
+                    <style:tab-stop style:position="16.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="11pt" style:font-size-asian="11pt" style:font-size-complex="11pt"/>
+        </style:style>
+        <style:style style:name="P10" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:margin-top="0.106cm" fo:margin-bottom="0cm" style:contextual-spacing="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+        </style:style>
+        <style:style style:name="P11" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:margin-top="0.106cm" fo:margin-bottom="0cm" style:contextual-spacing="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="9pt" officeooo:paragraph-rsid="00026b08" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+        </style:style>
+        <style:style style:name="P12" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:margin-top="0.106cm" fo:margin-bottom="0cm" style:contextual-spacing="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="11pt" officeooo:rsid="00026b08" officeooo:paragraph-rsid="00026b08" style:font-size-asian="11pt" style:font-size-complex="11pt"/>
+        </style:style>
+        <style:style style:name="P13" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties>
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+        </style:style>
+        <style:style style:name="P14" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties>
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="11pt" style:font-size-asian="11pt" style:font-size-complex="11pt"/>
+        </style:style>
+        <style:style style:name="P15" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties>
+                <style:tab-stops>
+                    <style:tab-stop style:position="6.752cm"/>
+                    <style:tab-stop style:position="13.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="11pt" officeooo:rsid="00026b08" style:font-size-asian="11pt" style:font-size-complex="11pt"/>
+        </style:style>
+        <style:style style:name="P16" style:family="paragraph" style:parent-style-name="Header">
+            <style:text-properties fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+        </style:style>
+        <style:style style:name="P17" style:family="paragraph" style:parent-style-name="Header" style:master-page-name="Standard">
+            <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.423cm" style:contextual-spacing="false" style:page-number="auto">
+                <style:tab-stops>
+                    <style:tab-stop style:position="7.502cm"/>
+                    <style:tab-stop style:position="9.502cm"/>
+                    <style:tab-stop style:position="14.753cm"/>
+                    <style:tab-stop style:position="15.503cm"/>
+                    <style:tab-stop style:position="16.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/>
+        </style:style>
+        <style:style style:name="P18" style:family="paragraph" style:parent-style-name="Header">
+            <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.423cm" style:contextual-spacing="false">
+                <style:tab-stops>
+                    <style:tab-stop style:position="7.502cm"/>
+                    <style:tab-stop style:position="9.502cm"/>
+                    <style:tab-stop style:position="14.753cm"/>
+                    <style:tab-stop style:position="15.503cm"/>
+                    <style:tab-stop style:position="16.002cm" style:type="right"/>
+                </style:tab-stops>
+            </style:paragraph-properties>
+            <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/>
+        </style:style>
+        <style:style style:name="P19" style:family="paragraph" style:parent-style-name="Standard">
+            <style:paragraph-properties fo:text-align="end" style:justify-single-word="false" fo:margin-top="0.106cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/>
+            <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+        </style:style>
+        <style:style style:name="T1" style:family="text">
+            <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+        </style:style>
+        <style:style style:name="T2" style:family="text">
+            <style:text-properties fo:font-size="9pt" officeooo:rsid="00026b08" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+        </style:style>
+        <style:style style:name="T3" style:family="text">
+            <style:text-properties fo:font-size="11pt" style:font-size-asian="11pt" style:font-size-complex="11pt"/>
+        </style:style>
+        <style:style style:name="T4" style:family="text">
+            <style:text-properties officeooo:rsid="00026b08"/>
+        </style:style>
+        <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics">
+            <style:graphic-properties fo:margin-left="0.318cm" fo:margin-right="0.318cm" fo:margin-top="0cm" fo:margin-bottom="0cm" style:run-through="background" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" fo:background-color="transparent" style:background-transparency="100%" fo:padding="0cm" fo:border="none" style:mirror="none" fo:clip="rect(0cm, 0cm, 0cm, 0cm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard">
+                <style:background-image/>
+            </style:graphic-properties>
+        </style:style>
+    </office:automatic-styles>
+  <office:body>
+	  <office:text text:use-soft-page-breaks="true" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0">
+	  <text:p text:style-name="P17">Ein Studienblatt ist für diesen Studiengang/Lehrgang nicht vorgesehen</text:p>
+        </office:text>
+  </office:body>
+</office:document-content>
+</xsl:template>
+
+</xsl:stylesheet>

vilesci/bis/studentenmeldung.php

@@ -665,6 +665,7 @@ function GenerateXMLStudentBlock($row)
 		}
 	}
 
+	$aktstatus_stsem = $ssem;
 	//StudStatusCode und Semester ermitteln
 	$qrystatus="SELECT * FROM public.tbl_prestudentstatus
 		WHERE prestudent_id=".$db->db_add_param($row->prestudent_id)." AND studiensemester_kurzbz=".$db->db_add_param($ssem)." AND (tbl_prestudentstatus.datum<=".$db->db_add_param($bisdatum).")
@@ -721,6 +722,7 @@ function GenerateXMLStudentBlock($row)
 				$aktstatus=$rowstatus->status_kurzbz;
 				$aktstatus_datum=$rowstatus->datum;
 				$storgform=$rowstatus->orgform_kurzbz;
+				$aktstatus_stsem = $rowstatus->studiensemester_kurzbz;
 			}
 		}
 		else
@@ -775,6 +777,7 @@ function GenerateXMLStudentBlock($row)
 					$aktstatus=$rowstatus->status_kurzbz;
 					$aktstatus_datum=$rowstatus->datum;
 					$storgform=$rowstatus->orgform_kurzbz;
+					$aktstatus_stsem = $rowstatus->studiensemester_kurzbz;
 				}
 			}
 		}
@@ -783,8 +786,67 @@ function GenerateXMLStudentBlock($row)
 	if($storgform=='')
 		$storgform=$orgform_kurzbz;
 
+	// **** GS Container ****/
+	$gsstatus='';
+	$gsblock='';
+	$gemeinsamestudien=false;
+	$qrygs="SELECT
+				tbl_mobilitaet.*,
+				tbl_gsprogramm.programm_code,
+				tbl_firma.partner_code
+			FROM
+				bis.tbl_mobilitaet
+				LEFT JOIN bis.tbl_gsprogramm USING(gsprogramm_id)
+				LEFT JOIN public.tbl_firma USING(firma_id)
+			WHERE
+				prestudent_id=".$db->db_add_param($row->prestudent_id)."
+				AND studiensemester_kurzbz=".$db->db_add_param($aktstatus_stsem)."
+			ORDER BY tbl_mobilitaet.insertamum DESC limit 1;";
+
+	if($resultgs = $db->db_query($qrygs))
+	{
+		while($rowgs = $db->db_fetch_object($resultgs))
+		{
+			$gsstatus = 'GS '.$rowgs->status_kurzbz.' '.$row->gsstudientyp_kurzbz;
+			$gemeinsamestudien=true;
+			$studtyp = $kodex_studientyp_array[$row->gsstudientyp_kurzbz];
+			$studstatuscode = (isset($kodex_studstatuscode_array[$rowgs->status_kurzbz])?$kodex_studstatuscode_array[$rowgs->status_kurzbz]:'');
+
+			$gserror='';
+			if($studstatuscode=='')
+				$gserror.="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gemeinsame Studien - Status ist nicht gesetzt\n";
+			if($studtyp=='')
+				$gserror.="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gemeinsame Studien - Studientyp ist nicht gesetzt\n";
+			if($rowgs->partner_code=='')
+				$gserror.="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gemeinsame Studien - Partner Code ist leer\n";
+			if($rowgs->programm_code=='')
+				$gserror.="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gemeinsame Studien - Programm ist leer\n";
+
+			if($gserror!='')
+			{
+				$v.="<u>Bei Student (UID, Vorname, Nachname) '".$row->student_uid."', '".$row->nachname."', '".$row->vorname."' ($row->status_kurzbz): </u>\n";
+				$v.=$gserror."\n";
+				return '';
+			}
+			$gsblock.="
+		<GS>
+			<MobilitaetsProgrammCode>".$rowgs->mobilitaetsprogramm_code."</MobilitaetsProgrammCode>
+			<ProgrammNr>".$rowgs->programm_code."</ProgrammNr>
+			<StudTyp>".$studtyp."</StudTyp>
+			<PartnerCode>".$rowgs->partner_code."</PartnerCode>
+			<Ausbildungssemester>".$rowgs->ausbildungssemester."</Ausbildungssemester>
+			<StudStatusCode>".$studstatuscode."</StudStatusCode>
+		</GS>";
+			if(!isset($gssem[$storgform][$rowgs->ausbildungssemester]))
+			{
+				$gssem[$storgform][$rowgs->ausbildungssemester]=0;
+			}
+			$gssem[$storgform][$rowgs->ausbildungssemester]++;
+		}
+	}
+
 	//bei Absolventen das Beendigungsdatum (Sponsion oder Abschlussprüfung) überprüfen
-	if($aktstatus=='Absolvent')
+	if($aktstatus=='Absolvent' && !$gemeinsamestudien)
 	{
 		$qry_ap="SELECT * FROM lehre.tbl_abschlusspruefung WHERE student_uid=".$db->db_add_param($row->student_uid)." AND abschlussbeurteilung_kurzbz!='nicht' AND abschlussbeurteilung_kurzbz IS NOT NULL";
 		if($result_ap = $db->db_query($qry_ap))
@@ -883,64 +945,6 @@ function GenerateXMLStudentBlock($row)
 	}
 	else
 	{
-
-		// **** GS Container ****/
-		$gsstatus='';
-		$gsblock='';
-		$gemeinsamestudien=false;
-		$qrygs="SELECT
-					tbl_mobilitaet.*,
-					tbl_gsprogramm.programm_code,
-					tbl_firma.partner_code
-				FROM
-					bis.tbl_mobilitaet
-					LEFT JOIN bis.tbl_gsprogramm USING(gsprogramm_id)
-					LEFT JOIN public.tbl_firma USING(firma_id)
-				WHERE
-					prestudent_id=".$db->db_add_param($row->prestudent_id)."
-					AND studiensemester_kurzbz=".$db->db_add_param($ssem).";";
-		if($resultgs = $db->db_query($qrygs))
-		{
-			while($rowgs = $db->db_fetch_object($resultgs))
-			{
-				$gsstatus = 'GS '.$rowgs->status_kurzbz.' '.$row->gsstudientyp_kurzbz;
-				$gemeinsamestudien=true;
-				$studtyp = $kodex_studientyp_array[$row->gsstudientyp_kurzbz];
-				$studstatuscode = (isset($kodex_studstatuscode_array[$rowgs->status_kurzbz])?$kodex_studstatuscode_array[$rowgs->status_kurzbz]:'');
-
-				$gserror='';
-				if($studstatuscode=='')
-					$gserror.="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gemeinsame Studien - Status ist nicht gesetzt\n";
-				if($studtyp=='')
-					$gserror.="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gemeinsame Studien - Studientyp ist nicht gesetzt\n";
-				if($rowgs->partner_code=='')
-					$gserror.="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gemeinsame Studien - Partner Code ist leer\n";
-				if($rowgs->programm_code=='')
-					$gserror.="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gemeinsame Studien - Programm ist leer\n";
-
-				if($gserror!='')
-				{
-					$v.="<u>Bei Student (UID, Vorname, Nachname) '".$row->student_uid."', '".$row->nachname."', '".$row->vorname."' ($row->status_kurzbz): </u>\n";
-					$v.=$gserror."\n";
-					return '';
-				}
-				$gsblock.="
-			<GS>
-				<MobilitaetsProgrammCode>".$rowgs->mobilitaetsprogramm_code."</MobilitaetsProgrammCode>
-				<ProgrammNr>".$rowgs->programm_code."</ProgrammNr>
-				<StudTyp>".$studtyp."</StudTyp>
-				<PartnerCode>".$rowgs->partner_code."</PartnerCode>
-				<Ausbildungssemester>".$rowgs->ausbildungssemester."</Ausbildungssemester>
-				<StudStatusCode>".$studstatuscode."</StudStatusCode>
-			</GS>";
-				if(!isset($gssem[$storgform][$rowgs->ausbildungssemester]))
-				{
-					$gssem[$storgform][$rowgs->ausbildungssemester]=0;
-				}
-				$gssem[$storgform][$rowgs->ausbildungssemester]++;
-			}
-		}
-
 		$datei.="
 		<StudentIn>
 			<PersKz>".trim($row->matrikelnr)."</PersKz>";