- Freifaecher Anpassung an neue DB

- News/Pinboard Aktualisierung - Bibliotheksseite Aktualisiert - Sync Anpassungen - etc
2026-07-20 00:12:15 +00:00 · 2007-01-05 15:03:24 +00:00
parent 336fb793db
commit 42d7631867
33 changed files with 1851 additions and 73 deletions
@@ -71,6 +71,7 @@ if($result = pg_query($conn_vilesci, $qry))
 		$lehrveranstaltung->planfaktor		='1.0';
 		$lehrveranstaltung->planlektoren		='1';
 		$lehrveranstaltung->planpersonalkosten	='80';
+		$lehrveranstaltung->sprache = $row->sprache;
 		//$lehrveranstaltung->insertamum		='';
 		$lehrveranstaltung->insertvon		='SYNC';
 		//$lehrveranstaltung->updateamum	='';
@@ -104,7 +104,7 @@
 			  	</tr>
 	    	  	<tr>
 			  		<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="Item" href="private/campus/freifaecher/menu.php"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Freif&auml;cher</a></td>
+					<td nowrap><a class="Item" href="private/freifaecher/menu.php"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Freif&auml;cher</a></td>
 			  	</tr>
 			  	<tr>
 			  		<td width="10" nowrap>&nbsp;</td>
@@ -0,0 +1,158 @@
+<?php
+/* 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
+ * 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> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+/* 
+ * Ermoeglicht das Anmelden zu Freifaechern
+ */
+require_once('../../config.inc.php');
+require_once('../../../include/functions.inc.php');
+require_once('../../../include/studiensemester.class.php');
+require_once('../../../include/lehrveranstaltung.class.php');
+
+if(!$conn=pg_connect(CONN_STRING))
+	die('Die Datenbankverbindung konnte nicht hergestellt werden.');
+	
+$user = get_uid();
+
+//Aktuelles Studiensemester holen
+$stsem_obj = new studiensemester($conn);
+$stsem = $stsem_obj->getaktorNext();
+
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+	<html>
+	<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<link href="../../../skin/cis.css" rel="stylesheet" type="text/css">
+	<title>Freifaecher Anmeldung</title>
+	</head>
+	
+	<body>
+	<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+		<tr>
+	    <td width="10">&nbsp;</td>
+	    <td><table width="100%"  border="0" cellspacing="0" cellpadding="0">
+	    	<tr> 
+	      	<td class="ContentHeader"><font class="ContentHeader">&nbsp;Freif&auml;cher Anmeldung</font></td>
+	    	</tr>
+	    	<tr> 
+	      	<td>&nbsp;</td>
+	    	</tr>
+	    	<tr>
+		    	<td>
+		    	Bitte markieren Sie die Freif&auml;cher f&uuml;r die Sie sich Anmelden m&ouml;chten
+		    	<br />
+<?php
+//Wenn das Formular abgeschickt wurde
+if(isset($_POST['submit']))
+{
+	//Wenn eine der Checkboxen angeklickt wurde
+	if(isset($_POST['chkbox']))
+	{
+		pg_query($conn,'BEGIN');
+		//Zuerst die alten Eintraege herausloeschen...
+		$qry = "DELETE FROM campus.tbl_benutzerlvstudiensemester WHERE uid='$user' AND studiensemester_kurzbz='$stsem'";
+		if(!pg_query($conn,$qry))
+			die('Fehler beim aktualisieren der Freifaecherzuteilung! Bitte Versuchen Sie es erneut');
+		
+		//...dann die angeklickten FF hinzufuegen
+		foreach ($_POST['chkbox'] as $elem) 
+		{
+			$qry = "INSERT INTO campus.tbl_benutzerlvstudiensemester(uid, lehrveranstaltung_id, studiensemester_kurzbz) VALUES('$user','$elem','$stsem');";
+			if(!pg_query($conn,$qry))
+			{
+				pg_query($conn,'ROLLBACK');
+				die("Freifaecher konnten nicht zugeteilt werden! Bitte Versuchen Sie es erneut");
+			}
+		}
+		pg_query($conn,'COMMIT');
+		echo "<b>Ihre Daten wurden erfolgreich aktualisiert!</b><br />";
+	}
+	else 
+	{
+		//Wenn keine Checkbox angeklickt wurde, alle Eintraege herausloeschen
+		$qry = "DELETE FROM campus.tbl_benutzerlvstudiensemester WHERE uid='$user' AND studiensemester_kurzbz='$stsem'";
+		if(!pg_query($conn,$qry))
+			die("Fehler beim aktualisieren der Freifaecherzuteilung! Bitte Versuchen Sie es erneut");
+		else 
+			echo "<b>Ihre Daten wurden erfolgreich aktualisiert!</b><br />";
+	}
+}
+
+//Freifachzuteilungen holen
+$qry = "SELECT * FROM campus.tbl_benutzerlvstudiensemester WHERE uid = '$user' AND studiensemester_kurzbz='$stsem'";
+if($result=pg_query($conn,$qry))
+{
+	$ff = array();	
+	while($row=pg_fetch_object($result))
+		$ff[] = $row->lehrveranstaltung_id;
+}
+else 
+	echo 'Fehler beim Auslesen der Zuteilunstabelle';
+		
+echo '<br />';
+//Freifaecher laden
+$lv_obj = new lehrveranstaltung($conn);
+if($lv_obj->load_lva('0','0',null,true))
+{
+	$anz = count($lv_obj->lehrveranstaltungen);
+	
+	echo "<form method='POST'>";
+	$i=0;
+	echo "<table><tr><td valign='top'>";
+	foreach($lv_obj->lehrveranstaltungen as $row)
+	{
+		//Auftrennen in eine zweite Spalte bei der haelfte der Eintraege
+		if($i==intval($anz/2))
+			echo "</td><td valign='top'>";
+			
+		if(in_array($row->lehrveranstaltung_id,$ff))
+			$checked = "checked='true'";
+		else 
+			$checked = '';
+			
+		//Wenn aktiv=false dann ist fuer dieses Lehrfach keine Anmeldung mehr moeglich
+		if($row->aktiv==false && $checked=='')
+			$disabled = "disabled='true'";
+		else 
+			$disabled = "";
+			
+		echo "<input type='checkbox' value='$row->lehrveranstaltung_id' name='chkbox[]' $checked $disabled >$row->bezeichnung<br />";
+		$i++;
+	}
+	echo "</td></tr><tr><td></td><td>&nbsp;</td></tr>";
+	echo "<tr><td></td><td><input type='submit' name='submit' value='Speichern'></td></tr>";	
+	echo "</table>";
+	echo "</form>";
+}
+else
+{
+	die("Fehler bei Auslesen der Freifaecher! Bitte versuchen Sie es erneut");
+}
+?>
+				</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+</body>
+</html>
@@ -0,0 +1,152 @@
+<?php
+/* 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
+ * 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> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+/* 
+ * Ermoeglicht das Anmelden zu Freifaechern
+ */
+require_once('../../config.inc.php');
+require_once('../../../include/functions.inc.php');
+require_once('../../../include/studiensemester.class.php');
+require_once('../../../include/lehrveranstaltung.class.php');
+
+if(!$conn=pg_connect(CONN_STRING))
+	die('Die Datenbankverbindung konnte nicht hergestellt werden.');
+	
+$user = get_uid();
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+	<html>
+	<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<link href="../../../skin/cis.css" rel="stylesheet" type="text/css">
+	<title>Freifaecher Anmeldungsuebersicht</title>
+	</head>
+	
+	<body>
+	<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+		<tr>
+	    <td width="10">&nbsp;</td>
+	    <td><table width="100%"  border="0" cellspacing="0" cellpadding="0">
+	    	<tr> 
+	      	<td class="ContentHeader"><font class="ContentHeader">&nbsp;Freif&auml;cher Anmeldunguebersicht</font></td>
+	    	</tr>
+	    	<tr> 
+	      	<td>&nbsp;</td>
+	    	</tr>
+	    	<tr>
+		    	<td>
+		    	Bitte w&auml;hlen Sie eines der Freif&auml;cher aus
+		    	<br />
+<?php
+$lvid = isset($_POST['lvid'])?$_POST['lvid']:'';
+
+//Aktuelles Studiensemester holen
+$stsem_obj = new studiensemester($conn);
+$stsem = $stsem_obj->getaktorNext();
+
+
+$lv_obj = new lehrveranstaltung($conn);
+
+if($lv_obj->load_lva('0','0',null,true))
+{	
+	echo "<FORM method='POST' name='frmauswahl'>";
+	echo "<SELECT name='lvid' onchange='window.document.frmauswahl.submit();'>";
+	if($lvid=='')
+		echo "\n<OPTION value='0' selected>--Auswahl--</OPTION>";
+	foreach($lv_obj->lehrveranstaltungen as $row)
+	{
+		if($lvid==$row->lehrveranstaltung_id)
+			echo "\n<OPTION value='$row->lehrveranstaltung_id' selected>$row->bezeichnung</OPTION>";
+		else 
+			echo "\n<OPTION value='$row->lehrveranstaltung_id'>$row->bezeichnung</OPTION>";
+	}
+	echo "\n</SELECT>";
+	echo "\n</FORM>";
+}
+else
+{
+	die("Fehler bei Auslesen der Freifaecher! Bitte versuchen Sie es erneut");
+}
+
+//Wenn das Formular abgeschickt wurde
+if(isset($_POST['lvid']))
+{
+	
+	$qry = "SELECT 
+				vorname, 
+				nachname, 
+				uid, 
+				tbl_student.semester as semester, 
+				tbl_studiengang.kurzbzlang 
+			FROM 
+				campus.vw_benutzer
+				LEFT JOIN 
+				(tbl_student LEFT JOIN tbl_studiengang using (studiengang_kz)) ON (student_uid = uid) 
+			WHERE
+				uid IN (SELECT uid FROM campus.tbl_benutzerlvstudiensemester 
+				        WHERE lehrveranstaltung_id='$lvid' AND studiensemester_kurzbz='$stsem')
+			ORDER BY
+				nachname, vorname";
+	
+if($result=pg_query($conn,$qry))
+{
+	$ff = array();	
+	$content='';
+	
+	$mailto= "&nbsp;<a href='mailto:";
+	$content .= "<table>\n  <tr class='liste'><th></th><th>Nachname</th><th>Vorname</th><th>Mail</th><th>Studiengang</th><th>Semester</th></tr>";
+	$i=0;
+	while($row=pg_fetch_object($result))
+	{
+		$i++;
+		$content .= "\n<tr class='liste".($i%2)."'><td>$i</td><td>$row->nachname</td><td>$row->vorname</td><td><a href='mailto:$row->uid@technikum-wien.at'>$row->uid@technikum-wien.at</a></td><td align='center'>$row->kurzbzlang</td><td align='center'>$row->semester</td></tr>";
+		if($i!=1)
+			$mailto.=",";
+		$mailto.=$row->uid."@technikum-wien.at";
+	}
+	$mailto.="'>Mail an alle in diesem Freifach senden</a>";
+	$content .= "</table>";
+	
+	if($i==0)
+	{
+		echo "<b>Es gibt noch keine Anmeldungen für dieses Freifach</b>";
+	}
+	else 
+	{
+		//echo "Anzahl der Anmeldungen: ".$i;
+		echo $content;
+		echo "<br />";
+		echo $mailto;
+	}
+}
+else 
+	echo "Fehler beim Auslesen der Zuteilunstabelle";	
+}
+
+?>
+				</td>
+			</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+</body>
+</html>
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<html>
+<head>
+	<title>CIS - FH Technikum Wien</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<link href="../skin/cis.css" rel="stylesheet" type="text/css">
+	<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
+</head>
+
+<frameset rows="77,*,1" cols="*" frameborder="NO" border="0" framespacing="0">
+	<frame src="../../topbar.html" name="topbar" scrolling="NO" noresize>
+	<frameset rows="*" cols="200,*" framespacing="0" frameborder="NO" border="0">
+		<frame src="menu.php" name="menu" scrolling="AUTO" noresize>
+    	<frame src="pinboard.php" name="content">
+  	</frameset>
+	<noframes>
+		<body>
+		<p>Diese Seite verwendet Frames. Frames werden von Ihrem Browser aber nicht	unterstützt.</p>
+		</body>
+	</noframes>
+</frameset>
+</html>
@@ -0,0 +1,323 @@
+<?php
+/* 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
+ * 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> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+	require_once('../../config.inc.php');
+    require_once('../../../include/functions.inc.php');
+    require_once('../../../include/benutzerberechtigung.class.php');
+    
+    //Connection Herstellen
+    if(!$sql_conn = pg_pconnect(CONN_STRING))
+       die("Fehler beim herstellen der Datenbankverbindung");
+        
+	$user = get_uid();
+	
+	if(check_lektor($user,$sql_conn))
+       $is_lector=true;
+    else 
+       $is_lector=false;
+
+    if(!isset($_GET['lvid']) || !is_numeric($_GET['lvid']))
+    	die('Fehlerhafte Parameteruebergabe');
+    else 
+    	$lvid = $_GET['lvid'];
+    
+	$sql_query = "SELECT DISTINCT lehreverzeichnis, bezeichnung FROM lehre.tbl_lehrveranstaltung WHERE lehrveranstaltung_id='$lvid'";
+	
+	if(!$result_lessons = pg_query($sql_conn, $sql_query))
+		die('Freifach konnte nicht aufgeloest werden');
+		
+	$num_rows_lessons = pg_num_rows($result_lessons);
+	
+	if(!$row = pg_fetch_object($result_lessons))
+		die('Freifach konnte nicht aufgeloest werden');
+	
+	$short_name = $row->bezeichnung;
+	$short_short_name = $row->lehreverzeichnis;
+	
+	$rechte=new benutzerberechtigung($sql_conn);
+	$rechte->getBerechtigungen($user);
+	$user_is_allowed_to_upload=false;
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link href="../../../skin/cis.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<table border="0" cellspacing="0" cellpadding="0" height="100%" width="100%">
+	<tr>
+		<td width="10">&nbsp;</td>
+		<td class="ContentHeader"><font class="ContentHeader">&nbsp;
+		<?php
+			echo $short_name;
+
+		?></font></td>
+	</tr>
+	<tr>
+		<td valign="top">&nbsp;</td>
+		<td>
+		<?php			
+			$qry = "SELECT studiensemester_kurzbz FROM lehre.tbl_lehreinheit JOIN tbl_studiensemester USING(studiensemester_kurzbz) WHERE lehrveranstaltung_id='$lvid' ORDER BY ende DESC LIMIT 1";
+			$angezeigtes_stsem ='';
+			if($result = pg_query($sql_conn, $qry))
+				if($row = pg_fetch_object($result))
+					$angezeigtes_stsem = $row->studiensemester_kurzbz;
+					
+			$qry = "SELECT distinct vorname, nachname, tbl_benutzer.uid as uid FROM lehre.tbl_lehreinheit, lehre.tbl_lehreinheitmitarbeiter, tbl_benutzer, tbl_person WHERE tbl_lehreinheit.lehreinheit_id=tbl_lehreinheitmitarbeiter.lehreinheit_id AND tbl_lehreinheitmitarbeiter.mitarbeiter_uid=tbl_benutzer.uid AND tbl_person.person_id=tbl_benutzer.person_id AND lehrveranstaltung_id='$lvid' AND tbl_lehreinheitmitarbeiter.mitarbeiter_uid NOT like '_Dummy%' AND tbl_person.aktiv=true AND studiensemester_kurzbz='$angezeigtes_stsem' ORDER BY nachname, vorname";		
+			if(!$result = pg_query($sql_conn, $qry))
+				die('Fehler bei Abfrage'.$qry);
+			
+			$num_rows_result = pg_num_rows($result);
+			
+			if(!($num_rows_result > 0))
+			{
+				echo 'Derzeit sind keine Lektoren f&uuml;r dieses Fach zugeteilt.';
+			}
+			else
+			{				
+				$i=1;
+				while($row_lector=pg_fetch_object($result))
+				{	
+					if($row_lector==$user)
+						$user_is_allowed_to_upload=true;
+						
+					echo '<a class="Item2" href="mailto:'.$row_lector->uid.'@technikum-wien.at">'.$row_lector->vorname.' '.$row_lector->nachname.'</a>';
+					if(!($i == $num_rows_result))
+					{
+						echo ',';
+					}
+											
+					$i++;	
+				}				
+			}
+		?></td>
+	</tr>
+	<tr>
+		<td valign="top">&nbsp;</td>
+		<td valign="top">&nbsp;</td>
+	</tr>	
+	<tr>
+		<td valign="top">&nbsp;</td>
+		<td valign="top">
+		<table border="0" cellpadding="0" cellspacing="0" width="100%">
+			<tr>
+			    <td valign="top" align="center">
+				  <?php
+				  	$dest_dir = @dir('../../../documents/freifaecher/'.strtolower($short_short_name).'/semesterplan');
+					
+					if(!@is_dir($dest_dir->path))
+					{
+						if(!is_dir('../../../documents/freifaecher'))
+						{
+							@exec('mkdir -m 775 "../../../documents/freifaecher"');
+							exec('sudo chown www-data:teacher "'.$GLOBALS["DOCUMENT_ROOT"].'/documents/freifaecher"');
+						}
+						if(!is_dir('../../../documents/freifaecher/'.strtolower($short_short_name)))
+						{
+							@exec('mkdir -m 775 "../../../documents/freifaecher/'.strtolower($short_short_name).'"');
+							exec('sudo chown www-data:teacher "'.$GLOBALS["DOCUMENT_ROOT"].'/documents/freifaecher/'.strtolower($short_short_name).'"');
+						}
+						if(!is_dir('../../../documents/freifaecher/'.strtolower($short_short_name).'/semesterplan'))
+						{
+							@exec('mkdir -m 775 "../../../documents/freifaecher/'.strtolower($short_short_name).'/semesterplan"');
+							exec('sudo chown www-data:teacher "'.$GLOBALS["DOCUMENT_ROOT"].'/documents/freifaecher/'.strtolower($short_short_name).'/semesterplan"');
+						}
+					}
+					
+					if($dest_dir)
+					{
+						$dir_empty = true;
+						
+						while($entry = $dest_dir->read())
+						{
+							if($entry != "." && $entry != "..")
+							{
+								$dir_empty = false;
+								
+								break;
+							}
+						}
+					}
+										
+					if(isset($dir_empty) && $dir_empty == false)
+					{
+						echo '<a href="'.$dest_dir->path.'/" target="_blank">';
+						echo '<img border="0" src="../../../skin/images/button_semplan.jpg" width="67" height="45"><br>';
+						echo '<strong>Semesterplan</strong>';
+						echo '</a>';
+					}
+					else
+					{						
+						echo '<img border="0" src="../../../skin/images/button_semplan.jpg" width="67" height="45"><br>';
+						echo '<strong>Semesterplan</strong>';
+					}
+					if($is_lector > 0 ) //islector=True
+					{							
+						if($user_is_allowed_to_upload || $rechte->isBerechtigt('admin',0)|| $rechte->isBerechtigt('lehre',0)) 
+						{	
+							echo '<br><a onClick="javascript:window.open(\'semupload.php?lvid='.$lvid.'\',\'_blank\',\'width=400,height=300,location=no,menubar=no,status=no,toolbar=no\');">Upload</a>';
+							echo '&nbsp;&nbsp;&nbsp;<a href="semdownhlp.php" >Vorlage</a>';
+						}
+					}					
+			    ?>
+				  <p>&nbsp;</p>
+				</td>
+				<td valign="top" align="center">
+				<?php
+					$dest_dir = @dir('../../../documents/freifaecher/'.strtolower($short_short_name).'/download');
+					
+					if(!@is_dir($dest_dir->path))
+					{
+						if(!is_dir('../../../documents/freifaecher'))
+						{
+							@exec('mkdir -m 775 "../../../documents/freifaecher"');
+							exec('sudo chown www-data:teacher "'.$GLOBALS["DOCUMENT_ROOT"].'/documents/freifaecher"');
+						}
+						if(!is_dir('../../../documents/freifaecher/'.strtolower($short_short_name)))
+						{
+							@exec('mkdir -m 775 "../../../documents/freifaecher/'.strtolower($short_short_name).'"');
+							exec('sudo chown www-data:teacher "'.$GLOBALS["DOCUMENT_ROOT"].'/documents/freifaecher/'.strtolower($short_short_name).'"');
+						}
+						if(!is_dir('../../../documents/freifaecher/'.strtolower($short_short_name).'/download'))
+						{
+							@exec('mkdir -m 775 "../../../documents/freifaecher/'.strtolower($short_short_name).'/download"');
+							exec('sudo chown www-data:teacher "'.$GLOBALS["DOCUMENT_ROOT"].'/documents/freifaecher/'.strtolower($short_short_name).'/download"');
+						}
+					}
+					
+					if($dest_dir)
+					{
+						$dir_empty = true;
+						
+						while($entry = $dest_dir->read())
+						{
+							if($entry != "." && $entry != "..")
+							{
+								$dir_empty = false;
+								
+								break;
+							}
+						}
+					}
+										
+					if(isset($dir_empty) && $dir_empty == false)
+					{
+						echo '<a href="'.$dest_dir->path.'/" target="_blank">';
+						echo '<img border="0" src="../../../skin/images/button_dl.jpg" width="67" height="45"><br>';
+						echo '<strong>Download</strong>';
+						echo '</a>';
+					}
+					else
+					{						
+						echo '<img border="0" src="../../../skin/images/button_dl.jpg" width="67" height="45"><br>';
+						echo '<strong>Download</strong>';
+					}
+			    ?>
+			      <p>&nbsp;</p>
+			    </td>
+			</tr>
+			
+			<tr>
+				<td valign="top" align="center">
+				<?php
+					/*$dest_dir = @dir('../../../documents/freifaecher/'.strtolower($short_short_name).'/leistung');
+					
+					if(!@is_dir($dest_dir->path))
+					{
+						if(!is_dir('../../../documents/freifaecher'))
+						{
+							@exec('mkdir -m 775 "../../../documents/freifaecher"');
+							exec('sudo chown www-data:teacher "'.$GLOBALS["DOCUMENT_ROOT"].'/documents/freifaecher"');
+						}
+						if(!is_dir('../../../documents/freifaecher/'.strtolower($short_short_name)))
+						{
+							@exec('mkdir -m 775 "../../../documents/freifaecher/'.strtolower($short_short_name).'"');
+							exec('sudo chown www-data:teacher "'.$GLOBALS["DOCUMENT_ROOT"].'/documents/freifaecher/'.strtolower($short_short_name).'"');
+						}
+						if(!is_dir('../../../documents/freifaecher/'.strtolower($short_short_name).'/'.strtolower($short_short_name).'_leistung'))
+						{
+							@exec('mkdir -m 775 "../../../documents/freifaecher/'.strtolower($short_short_name).'/'.strtolower($short_short_name).'_leistung"');
+							exec('sudo chown www-data:teacher "'.$GLOBALS["DOCUMENT_ROOT"].'/documents/freifaecher/'.strtolower($short_short_name).'/'.strtolower($short_short_name).'_leistung"');
+						}
+					}
+					
+					if($dest_dir)
+					{
+						$dir_empty = true;
+						
+						while($entry = $dest_dir->read())
+						{
+							if($entry != "." && $entry != "..")
+							{
+								$dir_empty = false;
+								
+								break;
+							}
+						}
+					}
+										
+					if(isset($dir_empty) && $dir_empty == false)
+					{
+						echo '<a href="'.$dest_dir->path.'/" target="_blank">';
+						echo '<img border="0" src="../../../skin/images/button_lb.jpg" width="67" height="45"><br>';
+						echo '<strong>Leistungsbeurteilung</strong>';
+						echo '</a>';
+					}
+					else
+					{						
+						echo '<img border="0" src="../../../skin/images/button_lb.jpg" width="67" height="45"><br>';
+						echo '<strong>Leistungsbeurteilung</strong>';
+					}*/
+			    ?>
+				<p>&nbsp;</p>
+				</td>
+				
+          <td valign="top" align="center">&nbsp;</td>
+			</tr>
+			<tr>
+				<td valign="top" align="center"><?php
+				
+				  echo "<a href=\"../lehre/feedback.php?lvid=$lvid\" target=\"_blank\"><img border=\"0\" src=\"../../../skin/images/button_fb.jpg\" width=\"67\" height=\"45\"><br>
+				     <strong>Feedback</strong></a>";
+				       
+				?>
+            <p>&nbsp;</p>
+				</td>
+				<td valign="top" align="center">
+				<a href="<?php
+				  			echo 'news://cis.technikum-wien.at/'.strtolower($short_short_name);
+				  		   ?>">
+				<img border="0" src="../../../skin/images/button_ng.jpg" width="67" height="45"><br>
+				<strong>Newsgroups</strong>
+				</a>
+				<p>&nbsp;</p>
+				</td>
+			</tr>
+		</table>
+		</td>
+		<td width="30">&nbsp;</td>
+	</tr>
+</table>
+</body>
+</html>
@@ -0,0 +1,186 @@
+<?php
+/* 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
+ * 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> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+	require_once('../../config.inc.php');
+    require_once('../../../include/functions.inc.php');
+    require_once('../../../include/benutzerberechtigung.class.php');
+    require_once('../../../include/lehrveranstaltung.class.php');
+    
+    //Connection Herstellen
+    if(!$sql_conn = pg_pconnect(CONN_STRING))
+       die("Fehler beim oeffnen der Datenbankverbindung");	
+
+	$user = get_uid();
+	
+    $rechte= new benutzerberechtigung($sql_conn);
+    $rechte->getBerechtigungen($user);
+    
+	if(check_lektor($user,$sql_conn))
+       $is_lector=true;
+    else 
+       $is_lector=false;
+	
+	function CutString($strVal, $limit)
+	{
+		if(strlen($strVal) > $limit)
+		{
+			return substr($strVal, 0, $limit) . "...";
+		}
+		else
+		{
+			return $strVal;
+		}
+	}
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link href="../../../skin/cis.css" rel="stylesheet" type="text/css">
+
+<script language="JavaScript">
+<!--        
+        __js_page_array = new Array();
+        
+        function js_toggle_container(conid) {
+        
+	if (document.getElementById) {
+              var block = "table-row";
+	      
+              if (navigator.appName.indexOf('Microsoft') > -1) {
+                 block = 'block';
+              }
+        
+              var status = __js_page_array[conid];
+              if (status == null) {
+                  status = "none";
+              }
+        
+              if (status == "none") {
+                 document.getElementById(conid).style.display = block;
+                 __js_page_array[conid] = "visible";
+              } else {
+                 document.getElementById(conid).style.display = 'none';
+                 __js_page_array[conid] = "none";
+              }
+              return false;
+           } else {
+             return true;
+           }
+        }
+  //-->
+</script>
+
+<?php
+	echo '<script language="JavaScript">';
+	echo '	parent.content.location.href="pinboard.php"';
+	echo '</script>';
+?>
+</head>
+
+<body>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td width="159" valign="top" nowrap>
+	  <table width="100%" cellspacing="0" cellpadding="0" frame="rhs" style="border-color:#BCBCBC;">
+	    <tr>
+          <td nowrap><a class="HyperItem" href="../../index.html" target="_top">&lt;&lt; Zum Campus wechseln </a></td>
+  		</tr>
+		<tr>
+		  <td nowrap>&nbsp;</td>
+		</tr>
+		<?php		
+			$lv_obj = new lehrveranstaltung($sql_conn);
+			if(!$lv_obj->load_lva('0','0', null, true))
+				echo "<tr><td>$lv_obj->errormsg</td></tr>";
+			
+			foreach($lv_obj->lehrveranstaltungen AS $row)
+			{				
+				echo '<tr>';
+				echo '	<td nowrap>';
+				echo "	  <li><a class=\"Item2\" title=\"".$row->bezeichnung."\" href=\"lesson.php?lvid=$row->lehrveranstaltung_id\" target=\"content\">".CutString($row->bezeichnung, 21)."</a></li>";
+				echo '	</td>';
+				echo '</tr>';
+			}
+			
+		?>
+		<tr><td>&nbsp;</td></tr>
+		<tr>
+          <td nowrap><a class="MenuItem" href="pinboard.php" target="content"><img src="../../../skin/images/menu_item.gif" width="7" height="9">&nbsp;Pinboard</a></td>
+  		</tr>
+  		<tr>
+          <td nowrap><a href="anmeldung.php" target='content' class="MenuItem" onClick="js_toggle_container('Anmeldung')"><img src="../../../skin/images/menu_item.gif" width="7" height="9">&nbsp;Anmeldung</a></td>
+  		</tr>
+		<tr>
+          <td nowrap>
+		  	<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Anmeldung" style="display: none;">
+			  <tr>
+			  	<td width="10" nowrap>&nbsp;</td>
+				<td nowrap><a class="Item" href="anmeldungsuebersicht.php" target="content"><img src="../../../skin/images/menu_item.gif" width="7" height="9">&nbsp;&Uuml;bersicht</a></td>
+			  </tr>
+			</table>
+		  </td>
+  		</tr>
+		<tr>
+          <td nowrap><a href="?Info &amp; Kommunikation" class="MenuItem" onClick="return(js_toggle_container('Info &amp; Kommunikation'));"><img src="../../../skin/images/menu_item.gif" width="7" height="9">&nbsp;Info &amp; Kommunikation</a></td>
+  		</tr>
+		<tr>
+          <td nowrap>
+		  	<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Info &amp; Kommunikation" style="display: none;">
+			  <tr>
+			  	<td width="10" nowrap>&nbsp;</td>
+				<td nowrap><a class="Item" href="../../private/lvplan/" target="_blank"><img src="../../../skin/images/menu_item.gif" width="7" height="9">&nbsp;LV-Plan</a></td>
+			  </tr>
+	    	  <tr>
+			  	<td width="10" nowrap>&nbsp;</td>
+				<td nowrap><a class="Item" href="https://webmail.technikum-wien.at" target="_blank"><img src="../../../skin/images/menu_item.gif" width="7" height="9">&nbsp;Webmail</a></td>
+			  </tr>
+			  <tr>
+			  	<td width="10" nowrap>&nbsp;</td>
+				<td nowrap><a class="Item" href="../info/faq_upload.html" target="content"><img src="../../../skin/images/menu_item.gif" width="7" height="9">&nbsp;FAQ</a></td>
+			  </tr>
+			</table>
+		  </td>
+  		</tr>
+		<?php
+			if($is_lector || $rechte->isBerechtigt('admin'))
+			{
+				echo '<tr>';
+				echo '  <td nowrap><a href="?Lektorenbereich" class="MenuItem" onClick="return(js_toggle_container(\'Lektorenbereich\'));"><img src="../../../skin/images/menu_item.gif" width="7" height="9">&nbsp;Lektorenbereich</a></td>';
+				echo '</tr>';
+				echo '<tr>';
+				echo '  <td nowrap>';
+				echo '  	<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Lektorenbereich" style="display: none;">';				
+				echo '	  <tr>';
+				echo '	  	<td width="10" nowrap>&nbsp;</td>';
+				echo '		<td nowrap><a class="Item" href="pinboardverwaltung.php" target="content"><img src="../../../skin/images/menu_item.gif" width="7" height="9">&nbsp;Pinboardverwaltung</a></td>';
+				echo '	  </tr>';
+				echo '	</table>';
+				echo '  </td>';
+				echo '</tr>';
+			}
+		?>
+	  </table>
+	</td>
+</table>
+</body>
+</html>
@@ -0,0 +1,89 @@
+<?php
+/* 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
+ * 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> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+	require_once('../../config.inc.php');
+	require_once('../../../include/functions.inc.php');
+	require_once('../../../include/news.class.php');
+        
+    //Connection Herstellen
+    if(!$sql_conn = pg_pconnect(CONN_STRING))
+       die("Fehler beim oeffnen der Datenbankverbindung");
+
+	
+	function print_news($sql_conn)
+	{
+		$news_obj = new news($sql_conn);
+		$news_obj->getnews(MAXNEWSALTER,'0','0');
+		
+		$zaehler=0;
+		
+		foreach ($news_obj->result as $row)
+		{
+			$zaehler++;
+			if($row->datum!='')
+				$datum = date('d.m.Y',strtotime(strftime($row->datum)));
+			else 	
+				$datum='';
+			
+			if($row->semester == 0)
+			{
+				echo '<p><small>'.$datum.' - '.$row->verfasser.' - [Allgemein]</small><br><b>'.$row->betreff.'</b><br>';
+			}
+			else
+			{
+				echo '<p><small>'.$datum.' - '.$row->verfasser.' - </small><br><b>'.$row->betreff.'</b><br>';
+			}
+				
+			echo "$row->text</p>";
+		}
+		
+		if($zaehler==0)
+			echo '<p>Zur Zeit gibt es keine aktuellen News!</p>';
+	}
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link href="../../../skin/cis.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td width="10">&nbsp;</td>
+    <td><table width="100%"  border="0" cellspacing="0" cellpadding="0">
+      <tr>
+        <td class="ContentHeader" width="70%"><font class="ContentHeader">&nbsp;Pinboard</font></td>
+      </tr>
+	  <tr>
+	  	<td>&nbsp;</td>
+	  </tr>
+	  <tr>
+	  	<td valign="top"><?php print_news($sql_conn); ?></td>
+	  </tr>
+    </table></td>
+	<td width="30">&nbsp;</td>
+  </tr>
+</table>
+</body>
+</html>
@@ -0,0 +1,246 @@
+<?php
+/* 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
+ * 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> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+	require_once('../../config.inc.php');
+	require_once('../../../include/functions.inc.php');
+	require_once('../../../include/news.class.php');
+        
+    //Connection Herstellen
+    if(!$sql_conn = pg_pconnect(CONN_STRING))
+       die('Fehler beim oeffnen der Datenbankverbindung');
+        
+	$user = get_uid();
+	
+	if(check_lektor($user,$sql_conn))
+       $is_lector=true;
+    else 
+    	die('Sie haben keine Berechtigung fuer diesen Bereich');
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<?php
+	if(isset($news_submit) && (!isset($message_sent) || $message_sent == "no"))
+	{		
+		$author = chop($_POST['txtAuthor']);
+		$title = chop($_POST['txtTitle']);
+		$datum = $_POST['datum'];
+		$news_message = chop(str_replace("\r\n", "<br>", $txtNewsMessage));
+		
+		if($author != "" && $title != "" && $news_message != "")
+		{
+			$news_obj = new news($sql_conn);
+				
+			$news_obj->verfasser = $author;
+			$news_obj->uid = $user;
+			$news_obj->studiengang_kz = '0';
+			
+			$news_obj->semester = '0';
+			$news_obj->betreff = $title;
+			$news_obj->text = $news_message;
+			$news_obj->datum = $datum;
+			$news_obj->updatevon = $user;
+			
+			if(isset($news_id) && $news_id != "")
+			{
+				$news_obj->new=false;
+				$news_obj->news_id = $news_id;
+			}
+			else
+				$news_obj->new=true;
+
+			if($news_obj->save())
+			{
+				echo '<script language="JavaScript">';
+				echo "	document.location.href = 'pinboard_entry.php?&message_sent=yes';";
+				echo '</script>';
+			}
+			else 
+			{
+				echo $news_obj->errormsg;
+				//echo "<script language=\"JavaScript\">";
+				//echo "	document.location.href = 'pinboard_entry.php?&message_sent=no';";
+				//echo "</script>";
+			}
+		}
+		else
+		{
+			echo "<script language=\"JavaScript\">";
+			echo "	document.location.href = 'pinboard_entry.php?message_sent=no';";
+			echo "</script>";
+		}
+		
+		exit;
+	}
+?>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link href="../../../skin/cis.css" rel="stylesheet" type="text/css">
+
+<script language="JavaScript">
+
+	function focusFirstElement()
+	{
+		if(document.NewsEntry.txtAuthor != null)
+		{
+			document.NewsEntry.txtAuthor.focus();
+		}
+	}
+
+</script>
+
+<?php
+	echo "<script language=\"JavaScript\">";
+	echo "	parent.news_window.location.href = 'pinboard_show.php'";
+	echo "</script>";
+?>
+</head>
+
+<body onLoad="focusFirstElement();">
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td width="10">&nbsp;</td>
+    <td><form method="post" name="NewsEntry">
+	<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+      <tr>
+        <td class="ContentHeader"><font class="ContentHeader">&nbsp;Lektorenbereich - Pinboardverwaltung</font></td>
+      </tr>
+      <tr>
+        <td>&nbsp;</td>
+      </tr>
+	  <tr>
+	  	<?php		
+			
+			if(isset($message_sent) && $message_sent == "yes")
+			{
+				if(isset($changed) && $changed == "yes")
+				{
+					echo "  <td>";
+					echo "<script language=\"JavaScript\">";
+					echo "	parent.news_window.location.href = 'pinboard_show.php'";
+					echo "</script>";
+					echo "</td>";
+					echo "</tr>";
+					echo "  <td>&nbsp;</td>";
+					echo "</tr>";
+					echo "<tr>";
+					echo "  <td><font class=\"headline\">Die Nachricht wurde erfolgreich ge&auml;ndert!</font></td>";
+					echo "</tr>";
+				}
+				else
+				{
+					echo "  <td>";
+					echo "<script language=\"JavaScript\">";
+					echo "	parent.news_window.location.href = 'pinboard_show.php'";
+					echo "</script>";
+					echo "</td>";
+					echo "</tr>";
+					echo "  <td>&nbsp;</td>";
+					echo "</tr>";
+					echo "<tr>";
+					echo "  <td><font class=\"headline\">Die Neuigkeit wurde erfolgreich eingetragen!</font></td>";
+					echo "</tr>";
+				}
+				
+				exit;
+			}
+			else if(isset($message_sent) && $message_sent == "no")
+			{
+				echo "<td>&nbsp;</td>";
+				echo "</tr>";
+				echo "  <td><font class=\"headline\">Die Neuigkeit wurde nicht eingetragen!</font><br>";
+				echo "<font class=\"subline\">Es wurden nicht alle erforderlichen Felder ausgef&uuml;llt.</font></td>";
+				echo "</tr>";
+				
+				exit;
+			}
+			
+			echo '<td class="ContentHeader2">&nbsp;';
+			
+			if(isset($news_id) && $news_id != "")
+			{
+				$news_obj = new news($sql_conn, $news_id);
+				
+				$verfasser = $news_obj->verfasser;
+				$betreff = $news_obj->betreff;
+				$text = $news_obj->text;
+				$datum = $news_obj->datum;
+				
+				echo 'Eintrag &auml;ndern';
+			}
+			else
+			{
+				echo 'Neuen Eintrag erstellen';
+			}
+			
+			echo '</td>';
+		?>
+	  </tr>
+	  <tr>
+	    <td>&nbsp;</td>
+	  </tr>
+	  <tr>
+	    <td>
+		  <table width="100%"  border="0" cellspacing="0" cellpadding="0">
+		    <tr>
+			  <td width="65">Verfasser:</td>
+			  <td width="218"><input type="text" class="TextBox" name="txtAuthor" size="30"<?php if(isset($news_id) && $news_id != "") echo ' value="'.$verfasser.'"'; ?>>
+			  </td>
+			  <td width="60">&nbsp;</td>
+			  <td>&nbsp;Sichtbar ab <input type="text" class="TextBox" name="datum" size="10" value="<?php if(isset($news_id) && $news_id != "") echo date('d.m.Y',strtotime(strftime($datum))); else echo date('d.m.Y'); ?>"></td>
+		    </tr>
+			<tr>
+			  <td>Titel:</td>
+			  <td><input type="text" class="TextBox" name="txtTitle" size="30"<?php if(isset($news_id) && $news_id != "") echo ' value="'.$betreff.'"'; ?>></td>
+			  <td><strong><font color="#ff0000">Hinweis:</font></strong></td>
+			  <td>Bitte beachten Sie, dass im Titel auch das jeweilige Freifach genannt wird. </td>
+		    </tr>
+		</table>
+		</td>
+	  </tr>
+	  <tr>
+	  	<td>&nbsp;</td>
+	  </tr>
+	  <tr>
+	  	<td>Bitte geben Sie hier Ihre Nachricht ein:<br>
+			<textarea class="TextBox" style="width: 99%; heigth: 166px" name="txtNewsMessage" rows="10" cols="70" maxlength="2000"><?php if(isset($news_id) && $news_id != "") echo str_replace("<br>", "\r\n", $text); ?></textarea></td>
+	  </tr>
+	  <tr>
+	  	<td nowrap>
+		  <input type="hidden" name="news_submit">
+	      <input type="submit" name="btnSend" value="Abschicken">&nbsp;
+		  <?php
+		  if(isset($news_id) && $news_id != "")
+		  {
+		  	echo "<input type=\"reset\" name=\"btnCancel\" value=\"Abbrechen\" onClick=\"document.location.href='pinboard_entry.php';\"></td>";
+		  }
+		  else
+		  {
+		  	echo '<input type="reset" name="btnCancel" value="Zur&uuml;cksetzen" onClick="document.NewsEntry.txtAuthor.focus();"></td>';
+		  }
+		  ?>
+	  </tr>
+    </table>
+	</form></td>
+	<td width="30">&nbsp;</td>
+  </tr>
+</table>
+</body>
+</html>
@@ -0,0 +1,138 @@
+<?php
+/* 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
+ * 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> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+	require_once('../../config.inc.php');
+    require_once('../../../include/functions.inc.php');
+    require_once('../../../include/news.class.php');
+    
+    //Connection Herstellen
+    if(!$sql_conn = pg_pconnect(CONN_STRING))
+       die('Fehler beim oeffnen der Datenbankverbindung');
+        
+	$user = get_uid();
+	
+	if(check_lektor($user,$sql_conn))
+       $is_lector=true;		
+	
+	if($is_lector)
+	{
+		if(isset($remove_id) && $remove_id != "")
+		{
+			$news_obj = new news($sql_conn);
+			if($news_obj->delete($remote_id))
+			{			
+				echo "<script language=\"JavaScript\">";
+				echo "	document.location.href = 'pinboard_show.php'";
+				echo "</script>";
+			}
+			else 
+				echo 'Fehler beim loeschen'.$news_obj->errormsg;
+			exit;
+		}
+	}
+	else 
+		die('Sie haben keine Berechtigung fuer diesen Bereich');
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link href="../../../skin/cis.css" rel="stylesheet" type="text/css">
+
+<script language="JavaScript">
+	
+	function deleteEntry(id)
+	{
+		if(confirm("Soll dieser Eintrag wirklich gelöscht werden?") == true)
+		{
+			document.location.href = 'pinboard_show.php?remove_id=' + id;
+		}
+	}
+	
+	function editEntry(id)
+	{
+		parent.news_entry.location.href = 'pinboard_entry.php?news_id=' + id;
+	}
+
+</script>
+</head>
+
+<body>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td width="10">&nbsp;</td>
+    <td><table width="100%"  border="0" cellspacing="0" cellpadding="0">
+        <tr>
+          <td>
+		  	<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+			  <?php
+				$news_obj = new news($sql_conn);
+				$news_obj->getnews(MAXNEWSALTER,'0','0',true);
+				
+				$zaehler =0;
+				$i=0;
+				foreach($news_obj->result as $row)
+				{
+					$i++;
+					$zaehler++;
+					echo "<tr>";
+					
+					if($i % 2 != 0)
+						echo '<td class="MarkLine">';
+					else
+						echo '<td>';
+					
+					if($row->datum!='')
+						$datum = date('d.m.Y',strtotime(strftime($row->datum)));
+					else 	
+						$datum='';
+							
+					echo '  <table width="100%"  border="0" cellspacing="0" cellpadding="0">';
+					echo '    <tr>';
+					echo '      <td nowarp>';
+					echo '        <small>'.$datum.'&nbsp;-&nbsp;'.$row->verfasser.'</small>';
+					echo '      </td>';
+					echo '		<td align="right" nowrap>';
+					echo '		  <a onClick="editEntry('.$row->news_id.');">Editieren</a>, <a onClick="deleteEntry('.$row->news_id.');">L&ouml;schen</a>';
+					echo '		</td>';
+					echo '    </tr>';
+					echo '  </table>';
+					echo '  <strong>'.$row->betreff.'</strong><br>'.$row->text.'</td>';
+					echo "</tr>";
+					echo '<tr>';
+					echo '  <td>&nbsp;</td>';
+					echo '</tr>';
+					echo '<tr>';
+					echo '  <td>&nbsp;</td>';
+					echo '</tr>';
+				}
+				if($zaehler==0)
+					echo 'Zur Zeit gibt es keine aktuellen News!';
+			  ?>
+			</table>
+		  </td>
+        </tr>
+    </table></td>
+    <td width="30">&nbsp;</td>
+  </tr>
+</table>
+</body>
+</html>
@@ -0,0 +1,71 @@
+<?php
+/* 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
+ * 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> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+	require_once('../../config.inc.php');
+	require_once('../../../include/functions.inc.php');
+    
+    //Connection Herstellen
+    if(!$sql_conn = pg_pconnect(CONN_STRING))
+       die('Fehler beim oeffnen der Datenbankverbindung');
+    
+	$user = get_uid();
+	
+	if(check_lektor($user,$sql_conn))
+       $is_lector=true;
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link href="../../../skin/cis.css" rel="stylesheet" type="text/css">
+</head>
+
+<frameset rows="375,*" cols="*" framespacing="0"" frameborder="NO" border="0">
+  <frame src="pinboard_entry.php" name="news_entry" scrolling="NO">
+  <frame src="pinboard_show.php" name="news_window">
+</frameset>
+<noframes><body>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td width="10">&nbsp;</td>
+    <td><table width="100%"  border="0" cellspacing="0" cellpadding="0">
+      <tr>
+        <td class="ContentHeader"><font class="ContentHeader">&nbsp;Lektorenbereich - Pinboardverwaltung</td>
+      </tr>
+      <tr>
+        <td>&nbsp;</td>
+      </tr>
+	  <tr>
+	  	<td>
+		<?php	
+			if(!$is_lector)
+			{
+				die('Sie haben leider keine Berechtigung f&uuml;r diese Seite.');
+			}
+		?>
+		&nbsp;</td>
+	  </tr>
+    </table></td>
+	<td width="30">&nbsp;</td>
+  </tr>
+</table>
+</body></noframes>
+</html>
@@ -0,0 +1,35 @@
+<?php
+/* 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
+ * 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> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */   
+    $filename = '../../cisdocs/18_muster_semesterplan_index.html';
+    $fp = fopen($filename, "rb");
+    if ($fp)
+    {
+    	header("Content-Type: application/html");
+    	header("Content-Disposition: attachment; filename=\"Semesterplan.html\"");
+        $buffer = fread ($fp, filesize ($filename));
+        echo $buffer;
+        fclose($fp);
+    }
+    else 
+    	echo 'Datei wurde nicht gefunden';
+    exit();
+?> 
@@ -0,0 +1,155 @@
+<?php
+/* 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
+ * 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> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+/**
+ * @brief Formular zum Uploaden und Loeschen von 
+ *        Semesterplaenen.
+ * @date 31-08-2005
+ * @edit 05-01-2007 Umstellung neue DB
+ */
+	require_once('../../config.inc.php');
+	require_once('../../../include/functions.inc.php');
+    require_once('../../../include/benutzerberechtigung.class.php');
+	require_once('../../../include/lehrveranstaltung.class.php');
+	
+    //Connection Herstellen
+    if(!$sql_conn = pg_pconnect(CONN_STRING))
+       die("Fehler beim oeffnen der Datenbankverbindung");
+     
+	$user = get_uid();
+	
+	if(check_lektor($user,$sql_conn))
+       $is_lector=true;
+    else 
+    	die('Sie haben keine Berechtigung fuer diesen Bereich');
+    
+   	if(!isset($_GET['lvid']) || !is_numeric($_GET['lvid']))
+   		die('Fehlerhafte Parameteruebergabe');
+   	else 
+   		$lvid=$_GET['lvid'];
+    
+   	$lv_obj = new lehrveranstaltung($sql_conn);
+   	if(!$lv_obj->load($lvid))
+   		die('Freifach konnte nicht ermittelt werden');
+
+    $openpath='../../../documents/freifaecher/'.$lv_obj->lehreverzeichnis.'/semesterplan/';
+    
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link href="../../../skin/cis.css" rel="stylesheet" type="text/css">
+<script language="JavaScript">
+
+/**
+ * @brief Zeigt eine Sicherheitsabfrage ob die Datei
+ * 		  wirklich geloescht werden soll
+ */
+function ConfirmFile(handle)
+{			
+	return confirm("Wollen Sie die ausgewaehlten Dateien wirklich loeschen? Dieser Vorgang ist unwiderruflich!");
+}
+</script>
+</head>
+<title>Upload Semesterplan</title>
+<body>
+<table border="0" cellspacing="0" cellpadding="0" width="100%">
+	<tr>
+		<td width="10">&nbsp;</td>
+		<td class="ContentHeader"><font class="ContentHeader">Upload Semesterplan</font></td>
+
+	</tr>
+	<tr>		
+		<td width="10">&nbsp;</td>		  
+		<td width="10">&nbsp;</td>
+	</tr>
+		
+<?php
+   	echo "<tr><td width=\"10\">&nbsp;</td><td>";
+	if(isset($inhalt))
+	{
+		if($inhalt!="____Ordnerinhalt____")
+		{
+			if(is_file($openpath . $inhalt))
+			{
+				exec("rm -r '$openpath$inhalt'");
+				writeCISlog('DELETE',"rm -r '$openpath$inhalt'");
+				echo "<center>Datei erfolgreich geloescht</center>";
+			}
+			else 
+			{
+			   echo "<center>Die Datei $openpath$inhalt konnte nicht gefunden werden.</center>";
+			}
+		}
+		else
+		{
+			echo "<center>Bitte zuerst eine Datei auswaehlen</center>";
+		}	
+	}
+	if(isset($userfile))
+	{
+		if(is_uploaded_file($userfile))
+		{
+			$fn = $_FILES['userfile']['name']; //Original Dateiname
+			
+			if(!stristr($fn, '.php') && !stristr($fn, '.cgi') && !stristr($fn, '.pl'))
+			{				
+				if(copy($userfile,$openpath . $fn))
+					echo "<center>Das File wurde erfolgreich hochgeladen</center>";
+				else 
+					echo "<center>Fehler beim hochladen der Datei!</center>";
+			}
+			else 
+			{
+				echo "<center>Dieser Dateityp ist nicht erlaubt <center>";
+			}
+		}
+	}
+	
+	echo "</tr></td>";
+ 
+  echo "<tr><td width=\"10\">&nbsp;</td><td><form name=\"form1\"  method=\"POST\" action=\"semupload.php?lvid=$lvid\"  onSubmit=\"return ConfirmFile(this);\">";
+  echo "<select name=\"inhalt\" size=5>";
+  echo "<option selected>____Ordnerinhalt____</option>";
+  //Inhalt des Semesterplan Ordners Auslesen
+  if(is_dir($openpath))
+  {  	
+  	  $dest_dir = dir($openpath);
+	  while($entry = $dest_dir->read())
+	  {
+	     if(!is_dir($entry))
+		      echo "<option>$entry</option>";
+	  }
+  }
+  echo "</select>";
+  echo "<input type=\"submit\" value=\"Datei Loeschen\">";
+  echo "</form></td><td>";
+  
+    //FileAuswahlfeld
+  echo "<tr><td width=\"10\">&nbsp;</td><td><br><form enctype=\"multipart/form-data\" method=\"POST\" action = \"semupload.php?lvid=$lvid\">";
+  echo " <input type=\"file\" name = \"userfile\" size = \"30\">";
+  echo " <input type=\"submit\" name=\"upload\" value=\"Upload\">";
+  echo "</form></td><td>";
+  
+?>
+</body>
+</html>
@@ -149,7 +149,7 @@ border:1px dashed #000000;
 	* @param $qry Query anweisung
 	*        $uid Username
 	* @return true wenn ok false wenn fehler beim oeffnen
-	*/    
+	*/
 	function WriteLog($qry,$uid)
 	{
 	
@@ -166,25 +166,6 @@ border:1px dashed #000000;

 	if(isset($status))
 	{
-		/*Sprachaenderungen nur noch von Assistenz
-		if($status=='sprachechange' && isset($lv) && $lv!='' && isset($sprache) && $sprache!='') //Aenderung des DropDown Menues Sprache
-		{
-			//Bei der aenderung dieses DropDown Menues wird die Sprache in der 
-			//Tabelle LV geaendert
-			
-			$qry = "UPDATE tbl_lehrveranstaltung SET sprache = '".addslashes($sprache)."' WHERE lehrveranstaltung_id = '".addslashes($lv)."'";
-			if(!pg_query($conn,$qry))
-			{
-				   $errormsg.= "Fehler beim schreiben der Sprache in die Tabelle Lehrfach";
-			}   	   	   
-			else 
-			{
-				   //Schreiben des Log Files
-				   if(!WriteLog($qry,$user))
-				      $errormsg.= "Fehler beim Schreiben des Log Files.";
-			}
-		}
-		*/
   	    
 		if($status=='save') // Beim druecken auf "Speichern"
 		{
@@ -526,10 +507,7 @@ border:1px dashed #000000;
 	   echo "<input type='hidden' name='lv' value='$lv'>";
 	   echo "<input type='hidden' name='status' value=''>";

-	   echo "<input type='hidden' name='lehrende' size='30' value=\"".(isset($lehrende)?str_replace("\"","&quot;",stripslashes($lehrende)):'')."\">";
-	   //echo "<table width='30%'  border='0' cellspacing='0' cellpadding='0'>";
-		//echo "<tr><td><b>Lehrende</b></td><td><input type='text' name='lehrende' size='30' value=\"".str_replace("\"","&quot;",stripslashes($lehrende))."\"></td></tr>";
-		echo "</td></tr>";
+	   echo "</td></tr>";
 	   //Sprache ausgeben   
 	   echo "<tr><td><b>Unterrichtssprache</b></td><td>$lv_obj->sprache";	   
 	   echo "</td></tr></table><br><br>";
@@ -32,8 +32,8 @@
 	if(isset($POST["feedback_message"]))
 	   $feedback_message=$POST["feedback_message"];
 	   
-	if(isset($feedback_message))	
-		echo $feedback_message;  
+//	if(isset($feedback_message))	
+//		echo $feedback_message;  

 ?>

@@ -247,7 +247,8 @@ function js_toggle_container(conid)
 		<?php
 			$lv_obj = new lehrveranstaltung($sql_conn);
 			
-			$lv_obj->load_lva($course_id,$term_id, null, true);
+			if(!$lv_obj->load_lva($course_id,$term_id, null, true))
+				echo "<tr><td>$lv_obj->errormsg</td></tr>";
 						
 			foreach($lv_obj->lehrveranstaltungen as $row)
 			{
@@ -1,4 +1,24 @@
 <?php
+/* 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
+ * 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> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
 	require_once('../../config.inc.php');
 	require_once('../../../include/functions.inc.php');
 	require_once('../../../include/studiengang.class.php');
@@ -35,8 +55,7 @@
 		$news_message = chop(str_replace("\r\n", "<br>", $_POST['txtNewsMessage']));
 		
 		if($author != "" && $title != "" && $news_message != "" && isset($course_id) && isset($term_id))
-		{
-			//Einfache Hochkomma Konvertieren
+		{	
 			if(isset($news_id) && $news_id != "")
 			{
 				$news_obj = new news($conn);
@@ -47,6 +66,7 @@
 				
 				$news_obj->semester = $term_id;
 				$news_obj->betreff = $title;
+				$news_obj->datum = $datum;
 				$news_obj->text = $news_message;
 				$news_obj->updatevon = $user;
 				$news_obj->news_id = $news_id;
@@ -74,6 +94,7 @@
 				$news_obj->studiengang_kz = $course_id;
 				$news_obj->semester = $term_id;
 				$news_obj->betreff = $title;
+				$news_obj->datum = $datum;
 				$news_obj->text = $news_message;
 				$news_obj->updatevon = $user;
 				$news_obj->new=true;
@@ -246,6 +267,7 @@
 			$verfasser = '';
 			$betreff = '';
 			$text = '';
+			$datum = '';
 				
 			if(isset($news_id) && $news_id != "")
 			{
@@ -253,6 +275,7 @@
 				$verfasser = $news_obj->verfasser;
 				$betreff = $news_obj->betreff;
 				$text = $news_obj->text;
+				$datum = $news_obj->datum;
 				echo 'Eintrag &auml;ndern';
 			}
 			else
@@ -299,22 +322,14 @@
 						{
 							if($course_id == $row_course->studiengang_kz)
 							{
-								if($row_course->studiengang_kz == 0)
-								{
-									echo '<option value="pinboard_entry.php?course_id='.$row_course->studiengang_kz.'&term_id='.$term_id.'" selected>Alle Studieng&auml;nge</option>';
-								}
-								else
+								if($row_course->studiengang_kz != 0)
 								{
 									echo '<option value="pinboard_entry.php?course_id='.$row_course->studiengang_kz.'&term_id='.$term_id.'" selected>'.$row_course->kurzbz.' ('.$row_course->kurzbzlang.')</option>';
 								}
 							}
 							else
 							{
-								if($row_course->studiengang_kz == 0)
-								{
-									echo '<option value="pinboard_entry.php?course_id='.$row_course->studiengang_kz.'&term_id='.$term_id.'">Alle Studieng&auml;nge</option>';
-								}
-								else
+								if($row_course->studiengang_kz != 0)
 								{
 									echo '<option value="pinboard_entry.php?course_id='.$row_course->studiengang_kz.'&term_id='.$term_id.'">'.$row_course->kurzbz.' ('.$row_course->kurzbzlang.')</option>';
 								}
@@ -334,6 +349,7 @@
 					}
 				?>
 			  	</select>
+			  	Sichtbar ab <input type="text" class="TextBox" name="datum" size="10" value="<?php if(isset($news_id) && $news_id != "") echo date('d.m.Y',strtotime(strftime($datum))); else echo date('d.m.Y'); ?>"></td> 
 			  </td>
 		    </tr>
 			<tr>
@@ -1,13 +1,30 @@
 <?php
-	include("../../../include/functions.inc.php");
-    include("../../config.inc.php");
-    writeCISlog('START');
+/* 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
+ * 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> and
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
+ */
+	require_once('../../config.inc.php');
+	require_once('../../../include/functions.inc.php');
+    
    //Connection Herstellen
    if(!$sql_conn = pg_pconnect(CONN_STRING))
-    {
-       writeCISlog('STOP');
-       die("Fehler beim öffnen der Datenbankverbindung");
-    }
+       die('Fehler beim oeffnen der Datenbankverbindung');
        
 	$user = get_uid();
 	
@@ -16,7 +33,7 @@
 	
 	$sql_query = "SELECT DISTINCT kurzbzlang FROM public.tbl_studiengang WHERE studiengang_kz='$course_id'";
 					
-	$result = pg_exec($sql_conn, $sql_query);
+	$result = pg_query($sql_conn, $sql_query);
 	$row_stg_short = pg_fetch_object($result, 0);
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
@@ -45,11 +62,7 @@
 	  	<td>
 		<?php	
 			if(!$is_lector)
-			{
-				writeCISlog('STOP');
-				die("Sie haben leider keine Berechtigung f&uuml;r diese Seite.");
-			}
-			writeCISlog('STOP');
+				die('Sie haben leider keine Berechtigung f&uuml;r diese Seite.');
 		?>
 		&nbsp;</td>
 	  </tr>
@@ -77,7 +77,7 @@
 	      </table><br><br>
 		   	<strong><font color="#ff0000">Hinweis: </font></strong>Diese Verteiler d&uuml;rfen nur f&uuml;r Fachhochschul-relevante Zwecke verwendet werden!
 		   		<br>
-            <strong><font color="#ff0000">Info: </font></strong>Infos bez&uuml;glich  <a href="Mailverteiler.pdf" target="_blank">Berechtigungskonzept</a> Mailverteiler, <a href="bedienung_mailverteiler.pdf" target="_blank">Bedienungsanleitung</a> Mailverteiler
+            <strong><font color="#ff0000">Info: </font></strong>Infos bez&uuml;glich  <a href="../cisdocs/Mailverteiler.pdf" target="_blank">Berechtigungskonzept</a> Mailverteiler, <a href="../cisdocs/bedienung_mailverteiler.pdf" target="_blank">Bedienungsanleitung</a> Mailverteiler
            <br>
 <?php
 		$stg_obj = new studiengang($conn);
@@ -114,10 +114,10 @@
 				}
 				else 
 				{
-					echo "test:".$news->errormsg;
-					//echo "<script language=\"JavaScript\">";
-					//echo "	document.location.href = 'news_entry.php' + \"?message_sent=no\";";
-					//echo "</script>";
+					//echo "test:".$news->errormsg;
+					echo "<script language=\"JavaScript\">";
+					echo "	document.location.href = 'news_entry.php' + \"?message_sent=no\";";
+					echo "</script>";
 				}
 			}
 		}
@@ -145,21 +145,29 @@
 </td>
              </tr>
              
-              <tr> 
-                <td class="ContentHeader2" colspan="4">&nbsp;Literatursuche ausserhalb der FH Technikum Wien</td>
+               <tr>
+                <td class="ContentHeader2" colspan="4">&nbsp;Recherche-Tipps</td>
              </tr>
-              <tr> 
+               <tr> 
                <td colspan="4">&nbsp;</td>
              </tr>
              <tr> 
-                <td colspan="4">F&uuml;r die Literatursuche au&szlig;erhalb der 
-                  Bibliothek des Technikum Wien empfehlen wir den &Ouml;sterreichischen 
-                  Bibliothekenverbund (&Ouml;BV), in dem alle gr&ouml;&szlig;eren 
-                  wissenschaftlichen Bibliotheken &Ouml;sterreichs zusammengeschlossen 
-                  sind. Der &Ouml;BV stellt f&uuml;r die Titelrecherche einen 
-                  OPAC (Onlinekatalog) zur Verf&uuml;gung. (Link: <a href="http://www.obvsg.at/kataloge/verbundkataloge/" target="_blank">http://www.obvsg.at/kataloge/verbundkataloge/</a>). 
-                  Die Suche ist sowohl im gesamten Verbundkatalog als auch in 
-                  den einzelnen Teilkatalogen (TU, WU etc.) m&ouml;glich.</td>
+                <td colspan="4">
+                <u>Bibliotheken Wien</u><br>
+				<a href='http://www.obvsg.at/kataloge/kataloge-wien/' target="_blank" class='Item'>Verbund-Bibliotheken</a> (TU, WU, Nationalbibliothek etc.)<br>
+				<a href='http://www.buechereien.wien.at/' class='Item' target="_blank">Büchereien Wien</a><br>
+				<br>
+				<u>Bibliotheken Österreich</u><br>
+				<a href='http://www.obvsg.at/kataloge/verbundkataloge/' class='Item' target="_blank">&Ouml;sterreichischer Bibliothekenverbund</a><br>
+				<br>
+				<u>Bibliotheken Europa</u><br>
+				<a href='http://www.ubka.uni-karlsruhe.de/kvk.html' class='Item' target="_blank">Karlsruher Virtueller Katalog</a><br>
+				<a href='http://www.bl.uk/' class="Item" target="_blank">British Library</a><br>
+				<br>
+				<u>Weitere Recherche-Links</u><br>
+				<a href='http://scholar.google.at' class='Item' target="_blank">Google Scholar</a><br>
+				<a href='http://www.subito-doc.de/' class='Item' target="_blank">Subito</a> (gebührenpflichtiger Lieferdienst von Zeitschriftenartikeln)
+                  </td>
              </tr>
              <tr> 
                <td colspan="2">&nbsp;</td>
@@ -0,0 +1,23 @@
+<?php
+	include('config.inc.php');
+	if(!($dbh = @mysql_connect($dbhost, $dbuser, $dbpasswd))) 
+	{
+        die("Error: Cannot connect to database $dbhost");
+	}
+	mysql_select_db($dbname);
+    
+	$query  = "select antwort from rt_antwort where ";
+	$query .= "gruppenID=$gruppe and prueflingID=$pruefling";
+	$query .= " order by nummer ASC";
+
+	$result = mysql_query($query, $dbh);
+
+	while ($row = mysql_fetch_array($result))
+ 	{
+		$antwort = $row[0];
+ 
+		echo "$antwort;";	
+	}
+
+	mysql_close($dbh);
+?>
@@ -0,0 +1,21 @@
+<?php
+	include('config.inc.php');
+	if(!($dbh = @mysql_connect($dbhost, $dbuser, $dbpasswd))) 
+	{
+        die("Error: Cannot connect to database $dbhost");
+	}
+	mysql_select_db($dbname);
+    
+	$query  = "select id, bezeichnung, anzfragen, zeit from rt_gruppen where reihung<>0 order by reihung";
+	$result = mysql_query($query, $dbh);
+
+	while ($row = mysql_fetch_array($result))
+    {
+		$id = $row["id"];
+		$bezeichnung = $row["bezeichnung"];
+		$anzfragen = $row["anzfragen"];
+		$zeit = $row["zeit"];
+		echo "$id;$bezeichnung;$anzfragen;$zeit\$";
+	}
+	mysql_close($dbh);
+?>
@@ -0,0 +1,18 @@
+<?php
+	include('config.inc.php');
+	if(!($dbh = @mysql_connect($dbhost, $dbuser, $dbpasswd))) 
+	{
+        die("Error: Cannot connect to database $dbhost");
+	}
+	mysql_select_db($dbname);
+    
+	$query  = "select name from rt_studiengang";
+	$result = mysql_query($query, $dbh);
+
+	while ($row = mysql_fetch_array($result))
+    {
+		$name = $row["name"];
+		echo "$name;";
+	}
+	mysql_close($dbh);
+?>
@@ -0,0 +1,18 @@
+<?php
+	include('config.inc.php');
+	if(!($dbh = @mysql_connect($dbhost, $dbuser, $dbpasswd))) 
+	{
+        die("Error: Cannot connect to database $dbhost");
+	}
+	mysql_select_db($dbname);
+    
+	$query  = "insert into rt_antwort(gruppe, pruefling, nummer, antwort, ) ";
+	$query .= "values ($gruppe, $pruefling, $nummer, '$antwort';
+
+	$result = mysql_query($query, $dbh);
+
+	$id = mysql_insert_id($dbh);
+	echo "$id";
+
+	mysql_close($dbh);
+?>
@@ -0,0 +1,22 @@
+<?php
+	include('config.inc.php');
+	if(!($dbh = @mysql_connect($dbhost, $dbuser, $dbpasswd))) 
+	{
+        die("Error: Cannot connect to database $dbhost");
+	}
+	mysql_select_db($dbname);
+    
+	$query  = "select id from rt_studiengang where name='$studiengang'";
+	$result = mysql_query($query, $dbh);
+    $row = mysql_fetch_array($result);
+    $studiengangID = $row["id"];
+	
+	$query  = "insert into rt_pruefling(name, vorname, gebdatum, gruppe, studiengangID, datum) ";
+	$query .= "values ('$name', '$vorname', '$gebdatum', '$gruppe', $studiengangID, NOW())";
+
+	$result = mysql_query($query, $dbh);
+	$id = mysql_insert_id($dbh);
+	echo "$id";
+
+	mysql_close($dbh);
+?>
@@ -0,0 +1,29 @@
+<?php
+	include('config.inc.php');
+	if(!($dbh = @mysql_connect($dbhost, $dbuser, $dbpasswd))) 
+	{
+        die("Error: Cannot connect to database $dbhost");
+	}
+	mysql_select_db($dbname);
+    
+	$query  = "select p.id, p.name, p.vorname, p.gebdatum, p.gruppe, s.name ";
+	$query .= "from rt_pruefling p, rt_studiengang s where p.id=$id and p.studiengangID=s.id";
+	$result = mysql_query($query, $dbh);
+    
+	if ($row = mysql_fetch_array($result))
+ 	{
+		$pid = $row[0];
+		$pname = $row[1];
+		$pvorname = $row[2];
+		$pgebdatum = $row[3];
+		$pgruppe = $row[4];
+		$sname = $row[5];
+ 
+		echo "$pid;$pname;$pvorname;$pgebdatum;$pgruppe;$sname";	
+	}
+	else
+	{
+		echo "0";
+	}
+	mysql_close($dbh);
+?>
@@ -0,0 +1,37 @@
+<?php
+	include('config.inc.php');
+	if(!($dbh = @mysql_connect($dbhost, $dbuser, $dbpasswd))) 
+	{
+        die("Error: Cannot connect to database $dbhost");
+	}
+	mysql_select_db($dbname);
+    
+	$query  = "select id from rt_studiengang where name='$studiengang'";
+	$result = mysql_query($query, $dbh);
+    $row = mysql_fetch_array($result);
+    $studiengangID = $row["id"];
+	
+	$query  = "insert into rt_pruefling(name, vorname, gebdatum, gruppe, studiengangID, datum) ";
+	$query .= "values ('$name', '$vorname', '$gebdatum', '$gruppe', $studiengangID, NOW())";
+
+	$result = mysql_query($query, $dbh);
+	$id = mysql_insert_id($dbh);
+
+	$query  = "select id, anzfragen from rt_gruppen where reihung<>0 order by reihung";
+	$result = mysql_query($query, $dbh);
+
+	while ($row = mysql_fetch_array($result))
+    {
+		$gid = $row["id"];
+		$anzfragen = $row["anzfragen"];
+
+		for ($i=1;$i<=$anzfragen;$i++)
+		{
+			$query1  = "insert into rt_antwort(gruppenID,prueflingID,nummer,antwort) values ($gid,$id,$i,' ')";
+			$result1 = mysql_query($query1, $dbh);
+		}
+	}
+	echo "$id";
+
+	mysql_close($dbh);
+?>
@@ -0,0 +1,17 @@
+<?php
+	include('config.inc.php');
+	if(!($dbh = @mysql_connect($dbhost, $dbuser, $dbpasswd))) 
+	{
+        die("Error: Cannot connect to database $dbhost");
+	}
+	mysql_select_db($dbname);
+    
+	$query  = "update rt_antwort set antwort='$antwort' where ";
+	$query .= "gruppenID=$gruppe and prueflingID=$pruefling and nummer=$nummer";
+
+	$result = mysql_query($query, $dbh);
+
+	echo "$antwort";
+
+	mysql_close($dbh);
+?>
@@ -161,9 +161,10 @@ class lehrveranstaltung
 	function load_lva($studiengang_kz, $semester=null, $lehreverzeichnis=null, $lehre=null)
 	{						
 		//Variablen pruefen
-		if(!is_numeric($studiengang_kz) || $studiengang_kz =='')
+		
+		if(!is_numeric($studiengang_kz) || $studiengang_kz=='')
 		{
-			$this->errormsg = 'studiengang_id muss eine gueltige Zahl sein';
+			$this->errormsg = 'studiengang_kz muss eine gueltige Zahl sein';
 			return false;
 		}
 		if($semester!=null && (!is_numeric($semester) || $semester==''))
@@ -187,7 +188,7 @@ class lehrveranstaltung
 		if($lehre!=null)
 			$qry .= " AND lehre=".($lehre?'true':'false');
 			
-		$qry .= " ORDER BY bezeichnung";
+		$qry .= " AND lehreverzeichnis<>'' ORDER BY bezeichnung";
 		
 		//Datensaetze laden
 		if(!$res = pg_query($this->conn, $qry))
@@ -115,7 +115,7 @@ class news
 			$datum = 'AND datum<=now()';
 			
 		if($studiengang_kz==0)
-			$qry = "SELECT * FROM campus.tbl_news WHERE $interval studiengang_kz=".$studiengang_kz." AND semester".($semester!=''?"='$semester'":' is null')." $datum ORDER BY datum DESC, updateamum DESC;";
+			$qry = "SELECT * FROM campus.tbl_news WHERE $interval studiengang_kz=".$studiengang_kz." ".($semester!=''?"":'AND semester is null')." $datum ORDER BY datum DESC, updateamum DESC;";
 		else 
 			$qry = "SELECT * FROM campus.tbl_news WHERE $interval ((studiengang_kz=$studiengang_kz AND semester=$semester) OR (studiengang_kz=$studiengang_kz AND semester=0) OR (studiengang_kz=0 AND semester=$semester) OR (studiengang_kz=0 and semester is null)) $datum ORDER BY datum DESC, updateamum DESC";