diff --git a/include/statistik.class.php b/include/statistik.class.php
index 49edafce0..f19485fce 100644
--- a/include/statistik.class.php
+++ b/include/statistik.class.php
@@ -75,7 +75,7 @@ class statistik extends basis_db
 				FROM
 					public.tbl_statistik
 				WHERE
-					statistik_kurzbz='".addslashes($statistik_kurzbz)."'";
+					statistik_kurzbz=".$this->db_add_param($statistik_kurzbz);
 		
 		if($result = $this->db_query($qry))
 		{
@@ -89,7 +89,7 @@ class statistik extends basis_db
 				$this->php = $row->php;
 				$this->r = $row->r;
 				$this->gruppe = $row->gruppe;
-				$this->publish = $row->publish;
+				$this->publish = $this->db_parse_bool($row->publish);
 				$this->insertamum = $row->insertamum;
 				$this->insertvon = $row->insertvon;
 				$this->updateamum = $row->updateamum;
@@ -133,7 +133,7 @@ class statistik extends basis_db
 				$obj->php = $row->php;
 				$obj->r = $row->r;
 				$obj->gruppe = $row->gruppe;
-				$obj->publish = $row->publish;
+				$obj->publish = $this->db_parse_bool($row->publish);
 				$obj->insertamum = $row->insertamum;
 				$obj->insertvon = $row->insertvon;
 				$obj->updateamum = $row->updateamum;
@@ -158,9 +158,9 @@ class statistik extends basis_db
 	public function getAnzahlGruppe($publish=null)
 	{
 		$qry = 'SELECT gruppe, count(*) AS anzahl FROM public.tbl_statistik ';
-		if ($publish=='true')
+		if ($publish==true)
 			$qry.='WHERE publish ';
-		elseif ($publish=='false')
+		elseif ($publish==false)
 			$qry.='WHERE NOT publish ';
 		$qry.=' GROUP BY gruppe ORDER BY gruppe;';
 		// echo $qry;
@@ -206,7 +206,7 @@ class statistik extends basis_db
 					$this->db_add_param($this->php).','.
 					$this->db_add_param($this->r).','.
 					$this->db_add_param($this->gruppe).','.
-					$this->db_add_param($this->publish).','.
+					$this->db_add_param($this->publish, FHC_BOOLEAN).','.
 					$this->db_add_param($this->insertamum).','.
 					$this->db_add_param($this->insertvon).','.
 					$this->db_add_param($this->updateamum).','.
@@ -226,7 +226,7 @@ class statistik extends basis_db
 				' php='.$this->db_add_param($this->php).','.
 				' r='.$this->db_add_param($this->r).','.
 				' gruppe='.$this->db_add_param($this->gruppe).','.
-				' publish='.$this->db_add_param($this->publish).','.
+				' publish='.$this->db_add_param($this->publish, FHC_BOOLEAN).','.
 				' insertamum='.$this->db_add_param($this->insertamum).','.
 				' insertvon='.$this->db_add_param($this->insertvon).','.
 				' updateamum='.$this->db_add_param($this->updateamum).','.
@@ -297,7 +297,7 @@ class statistik extends basis_db
 	 */
 	public function delete($statistik_kurzbz)
 	{
-		$qry = "DELETE FROM public.tbl_statistik WHERE statistik_kurzbz='".addslashes($statistik_kurzbz)."';";
+		$qry = "DELETE FROM public.tbl_statistik WHERE statistik_kurzbz=".$this->db_add_param($statistik_kurzbz).";";
 		
 		if($this->db_query($qry))
 		{
@@ -345,17 +345,17 @@ class statistik extends basis_db
 			WHERE 
 				status_kurzbz='Student'
 				AND NOT EXISTS(SELECT 1 FROM public.tbl_prestudentstatus WHERE status_kurzbz='Student' AND datum<status.datum AND prestudent_id=status.prestudent_id) 
-				AND studiengang_kz=".$studiengang_kz;
+				AND studiengang_kz=".$this->db_add_param($studiengang_kz);
 		if($ausbildungssemester!='')
-			$qry.="	AND ausbildungssemester=".$ausbildungssemester;
+			$qry.="	AND ausbildungssemester=".$this->db_add_param($ausbildungssemester);
 		
-		$qry.="	AND ((studiensemester_kurzbz='".$studiensemester_kurzbz."'";
+		$qry.="	AND ((studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
 		if (!is_null($datum_stichtag))
-			$qry.="	AND datum <='".$datum_stichtag."'";
+			$qry.="	AND datum <=".$this->db_add_param($datum_stichtag);
 		$qry.=') ';
-		$qry.=" OR (studiensemester_kurzbz='".$studiensemester_kurzbz."'";
+		$qry.=" OR (studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
 		if (!is_null($datum_stichtag))
-			$qry.="	AND datum <='".$datum_stichtag."'";
+			$qry.="	AND datum <=".$this->db_add_param($datum_stichtag);
 		$qry.="))";
 		$qry.=" ORDER BY prestudent_id;";
 		
@@ -409,13 +409,13 @@ class statistik extends basis_db
 		$qry="SELECT DISTINCT prestudent_id, geschlecht, studiengang_kz, ausbildungssemester, studiensemester_kurzbz
 			FROM tbl_prestudent JOIN tbl_prestudentstatus USING (prestudent_id) JOIN tbl_person USING (person_id) 
 			WHERE (status_kurzbz='Abbrecher') 
-			AND studiengang_kz=".$studiengang_kz;
+			AND studiengang_kz=".$this->db_add_param($studiengang_kz);
 		if($ausbildungssemester!='')
-			$qry.="	AND ausbildungssemester=".$ausbildungssemester;
+			$qry.="	AND ausbildungssemester=".$this->db_add_param($ausbildungssemester);
 		
-		$qry.="	AND (studiensemester_kurzbz='".$studiensemester_kurzbz."'";
+		$qry.="	AND (studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
 		if (!is_null($datum_stichtag))
-			$qry.="	AND datum <='".$datum_stichtag."'";
+			$qry.="	AND datum <=".$this->db_add_param($datum_stichtag);
 		$qry.=') ';
 		$qry.=" ORDER BY prestudent_id;";
 		
diff --git a/include/tw/vilesci_menu_main.inc.php b/include/tw/vilesci_menu_main.inc.php
index 836115ea2..d70095306 100644
--- a/include/tw/vilesci_menu_main.inc.php
+++ b/include/tw/vilesci_menu_main.inc.php
@@ -226,23 +226,12 @@ $menu=array
 	(
 		'name'=>'Auswertung', 'opener'=>'true', 'hide'=>'true', 'permissions'=>array('admin','lv-plan','support','assistenz','wawi/inventar','basis/statistik'), 'image'=>'vilesci_statistik.png',
 		'link'=>'left.php?categorie=Auswertung', 'target'=>'nav',
-	/*
-		'Raumauslastung'=>array('name'=>'Raumauslastung...', 'link'=>'lehre/raumauslastung.php', 'target'=>'main'),
-		'Verplanungsuebersicht'=>array('name'=>'Verplanungsübersicht...', 'link'=>'lehre/check/verplanungsuebersicht.php', 'target'=>'main'),
-		'Zeitwünsche'=>array('name'=>'Zeitwünsche', 'link'=>'lehre/zeitwuensche.php', 'target'=>'main'),
-		'Institute'=>array('name'=>'Institute (+)', 'link'=>'personen/institutsliste.php', 'target'=>'main'),
-		'Student/Semester'=>array('name'=>'Student/Semester', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/studentenprosemester.php', 'target'=>'main'),
-		'ALVS-Statistik'=>array('name'=>'ALVS-Statistik', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/alvsstatistik.php', 'target'=>'main'),
-		'LV-Planung Gesamt'=>array('name'=>'LV-Planung Gesamt (+)', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/lvplanunggesamtsj.php', 'target'=>'main'),
-		'Bewerberstatistik'=>array('name'=>'Bewerberstatistik (+)', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/bewerberstatistik.php', 'target'=>'main'),
-		'Abgängerstatistik'=>array('name'=>'Abgängerstatistik... (~)', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/abgaengerstatistik.php', 'target'=>'main'),
-		'Absolventenstatistik'=>array('name'=>'Absolventenstatistik(~)', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/absolventenstatistik.php', 'target'=>'main'),
-		'Absolventenzahlen'=>array('name'=>'Absolventenzahlen', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/absolventenzahlen.php', 'target'=>'main'),
-		'Studentenstatistik'=>array('name'=>'Studentenstatistik (+)', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/studentenstatistik.php', 'target'=>'main'),
-		'Lektorenstatistik'=>array('name'=>'Lektorenstatistik', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/lektorenstatistik.php', 'target'=>'main'),
-		'Mitarbeiterstatistik'=>array('name'=>'Mitarbeiterstatistik', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/mitarbeiterstatistik.php', 'target'=>'main'),
-		'Stromanalyse'=>array('name'=>'Stromanalyse...', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/bama_stromanalyse.php', 'target'=>'main'),
-	*/		
+		'Administration'=>	array
+		(
+			'name'=>'Administration', 'permissions'=>array('basis/statistik'),
+			'Statistik'=>array('name'=>'Statistik', 'link'=>'stammdaten/statistik_frameset.html', 'target'=>'main','permissions'=>array('basis/statistik')),
+			'Filter'=>array('name'=>'Filter', 'link'=>'statistik/filter_frameset.html', 'target'=>'main','permissions'=>array('basis/statistik')),
+		),
 	),
 	'Inventar'=>	array
 	(
diff --git a/system/checksystem.php b/system/checksystem.php
index b3cbd61a2..f811d5d9d 100644
--- a/system/checksystem.php
+++ b/system/checksystem.php
@@ -41,16 +41,6 @@ echo '<H2>DB-Updates!</H2>';
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
 
-// **************** Spalte publish Tabelle public.tbl_statistik
-if(!$result = @$db->db_query("SELECT publish FROM public.tbl_statistik LIMIT 1;"))
-{
-	$qry = 'ALTER TABLE public.tbl_statistik ADD COLUMN publish boolean DEFAULT false;';
-	if(!$db->db_query($qry))
-		echo '<strong>public.tbl_statistik: '.$db->db_last_error().'</strong><br>';
-	else 
-		echo ' public.tbl_statistik: Spalte publish hinzugefuegt!<br>';
-}
-
 // **************** Spalte scrumsprint_id Tabelle fue.tbl_projekttask
 if(!$result = @$db->db_query("SELECT scrumsprint_id FROM fue.tbl_projekttask LIMIT 1;"))
 {
@@ -1942,6 +1932,16 @@ if(!$result = @$db->db_query("SELECT anmerkung FROM campus.tbl_anwesenheit"))
 		echo ' campus.tbl_anwesenheit: Spalte anmerkung, ext_id hinzugefuegt!<br>';
 }
 
+// Spalte publish Tabelle public.tbl_statistik
+if(!$result = @$db->db_query("SELECT publish FROM public.tbl_statistik LIMIT 1;"))
+{
+	$qry = 'ALTER TABLE public.tbl_statistik ADD COLUMN publish boolean DEFAULT false;';
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_statistik: '.$db->db_last_error().'</strong><br>';
+	else 
+		echo ' public.tbl_statistik: Spalte publish hinzugefuegt!<br>';
+}
+
 echo '<br><br><br>';
 
 $tabellen=array(
@@ -2136,7 +2136,7 @@ $tabellen=array(
 	"public.tbl_service" => array("service_id", "bezeichnung","beschreibung","ext_id","oe_kurzbz","content_id"),
 	"public.tbl_sprache"  => array("sprache","locale","flagge","index","content","bezeichnung"),
 	"public.tbl_standort"  => array("standort_id","adresse_id","kurzbz","bezeichnung","insertvon","insertamum","updatevon","updateamum","ext_id", "firma_id"),
-	"public.tbl_statistik"  => array("statistik_kurzbz","bezeichnung","url","r","gruppe","sql","php","content_id","insertamum","insertvon","updateamum","updatevon","berechtigung_kurzbz"),
+	"public.tbl_statistik"  => array("statistik_kurzbz","bezeichnung","url","r","gruppe","sql","php","content_id","insertamum","insertvon","updateamum","updatevon","berechtigung_kurzbz","publish"),
 	"public.tbl_student"  => array("student_uid","matrikelnr","prestudent_id","studiengang_kz","semester","verband","gruppe","updateamum","updatevon","insertamum","insertvon","ext_id"),
 	"public.tbl_studentlehrverband"  => array("student_uid","studiensemester_kurzbz","studiengang_kz","semester","verband","gruppe","updateamum","updatevon","insertamum","insertvon","ext_id"),
 	"public.tbl_studiengang"  => array("studiengang_kz","kurzbz","kurzbzlang","typ","bezeichnung","english","farbe","email","telefon","max_semester","max_verband","max_gruppe","erhalter_kz","bescheid","bescheidbgbl1","bescheidbgbl2","bescheidgz","bescheidvom","orgform_kurzbz","titelbescheidvom","aktiv","ext_id","zusatzinfo_html","moodle","sprache","testtool_sprachwahl","studienplaetze","oe_kurzbz","lgartcode","mischform","projektarbeit_note_anzeige"),
diff --git a/vilesci/stammdaten/statistik_details.php b/vilesci/stammdaten/statistik_details.php
index c84842a6c..cd3ed266f 100644
--- a/vilesci/stammdaten/statistik_details.php
+++ b/vilesci/stammdaten/statistik_details.php
@@ -63,7 +63,7 @@ if(!$rechte->isBerechtigt('basis/statistik'))
 		$content_id = (isset($_POST['content_id'])?$_POST['content_id']:die('ContentID fehlt'));
 		$php = (isset($_POST['php'])?$_POST['php']:die('PHP fehlt'));
 		$r = (isset($_POST['r'])?$_POST['r']:die('R fehlt'));
-		$publish = (isset($_POST['publish'])?$_POST['publish']:die('Publish fehlt'));
+		$publish = (isset($_POST['publish'])?true:false);
 		$new = (isset($_POST['new'])?$_POST['new']:die('New fehlt'));
 		$berechtigung_kurzbz = (isset($_POST['berechtigung_kurzbz'])?$_POST['berechtigung_kurzbz']:die('Berechtigungkurzbz fehlt'));
 		
@@ -182,7 +182,7 @@ if(!$rechte->isBerechtigt('basis/statistik'))
 	echo '<tr valign="top">';
 	echo '   <td></td>';
 	echo '   <td>Publish</td>';
-	echo '   <td><input type="text" name="publish" value="'.$statistik->publish.'"></td>';
+	echo '   <td><input type="checkbox" name="publish" '.($statistik->publish?'checked="checked"':'').'></td>';
 	echo '</tr>';
 	
 	echo '<tr>';
diff --git a/vilesci/stammdaten/statistik_uebersicht.php b/vilesci/stammdaten/statistik_uebersicht.php
index 84feb18a4..7b87e2347 100644
--- a/vilesci/stammdaten/statistik_uebersicht.php
+++ b/vilesci/stammdaten/statistik_uebersicht.php
@@ -103,7 +103,7 @@ foreach($statistik->result as $row)
 	echo '<td><a href="statistik_details.php?action=update&statistik_kurzbz=',$row->statistik_kurzbz,' " target="detail_statistik">',$row->statistik_kurzbz,'</a></td>';
 	echo '<td>',$row->bezeichnung,'</td>';
 	echo '<td>',$row->gruppe,'</td>';
-	echo '<td>',$row->publish,'</td>';
+	echo '<td>',($row->publish?'Ja':'Nein'),'</td>';
 	echo '<td>',$row->content_id,'</td>';
 	echo '<td><a href="statistik_details.php?action=update&statistik_kurzbz=',$row->statistik_kurzbz,' " target="detail_statistik">bearbeiten</a></td>';
 	echo '<td><a href="statistik_uebersicht.php?action=delete&statistik_kurzbz=',$row->statistik_kurzbz,' " onclick="return confdel()">entfernen</a></td>';