+ Gast als MA-Typ, Erweiterungen Projekt, Key, Telefonliste
authorBettina Schwarzer
Fri, 20 Dec 2013 15:19:32 +0100
changeset 41 9c668cd391fa
parent 40 6f4b105daa24
child 42 cfc409017ba8
+ Gast als MA-Typ, Erweiterungen Projekt, Key, Telefonliste
Thumbs.db
fhiiqm/alpruef_ed.php
fhiiqm/alpruef_flist.php
fhiiqm/css/db.css
fhiiqm/css/db_print.css
fhiiqm/deprecated/ma_ed_form.inc.php
fhiiqm/deprecated/ma_tel_og_ed.php
fhiiqm/img/Thumbs.db
fhiiqm/inc/func_lib.inc.php
fhiiqm/inc/ma_list_ac.inc.php
fhiiqm/inc/ma_tel_dat_show.inc.php
fhiiqm/inc/menu.inc.php
fhiiqm/inc/prozess_dat_show.inc.php
fhiiqm/info_ed3.php
fhiiqm/keydepot_user_list.php
fhiiqm/keytyp_ma_search.php
fhiiqm/keytyp_tract_ma.php
fhiiqm/laser_report.php
fhiiqm/ldap_search_uid.php
fhiiqm/logout.php
fhiiqm/ma_tel_ed.php
fhiiqm/ma_tel_flist.php
fhiiqm/prozess_ed.php
fhiiqm/prozess_flist.php
fhiiqm/pz_report.php
fhiiqm/raum_report.php
fhiiqm/report/abt_ag_aptyp_report.php
fhiiqm/report/fkt_ma_report.php
fhiiqm/report/keytyp_bestand_all_report.php
fhiiqm/report/keytyp_dep_anz_report.php
fhiiqm/report/keytyp_dep_history_report.php
fhiiqm/report/laser_report.php
fhiiqm/report/proz_short_report.php
fhiiqm/report/prozess_report.php
fhiiqm/report/raum_info_as1_report.php
fhiiqm/report/raum_info_as_report.php
fhiiqm/report/vtr_kuend_emaila.php
fhiiqm/start.php
fhiiqm/tel_flist.php
fhiiqm/test/ma_tel_ed_gast.php
Binary file Thumbs.db has changed
--- a/fhiiqm/alpruef_ed.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/alpruef_ed.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,313 +1,323 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 12/2011
- */
-
-    error_reporting(E_ALL ^ E_NOTICE);
-    
-    session_start();
-    if (! isset($_SESSION["userid"]))
-    { 
-        include_once ("inc/func_lib.inc.php");	
-        login($_SERVER["PHP_SELF"]);
-        exit;
-    }
-    
-    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("ar",$_SESSION["recht"]) && !in_array("ae",$_SESSION["recht"])))
-    {
-        header("Location: start.php");
-        exit;
-    }    
-    
-    include_once($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/inc/dbconnect.inc.php");
-    if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-    <link type="text/css" href="/fhiiqm/css/db.css" rel="Stylesheet" media="screen"/>	
-    <link type="text/css" href="/fhiiqm/css/db_print.css" rel="Stylesheet" media="print"/>	
-    <link type="text/css" href="/fhiiqm/css/jquery/ui-lightness-1.8.21/jquery-ui-1.8.21.custom.css" rel="Stylesheet" />	
-    <link type="text/css" href="/fhiiqm/css/jquery/jquery-ui-timepicker-addon.css" rel="Stylesheet" />	
-    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-1.7.2.min.js"></script>
-    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-ui-1.8.21.custom.min.js"></script>
-    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-ui-timepicker-addon-1.0.1.js"></script>
-    <title>Anlage Pruefung</title>
- </head>
- 
- <body>
-
-<?php
-    echo "&nbsp;";  
-    echo "<div class=\"float-br smaller\" valign='top'>";
-    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
-    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
-    echo "<div class=\"float-r\"><img src=\"img/rotate_01.png\" border=\"0\" alt=\"Anlage\" title=\"Anlage\"/></div>\n";
-?>
-
-    <div align='center'>
-
-    <script>
-      $(document).ready(function() {
-        $("#albez").focus();
-        $("#albez").autocomplete({
-                source: "/fhiiqm/inc/al_list_ac.inc.php",
-    			minLength: 2,
-                select: function(event,ui){$("#alid").val(ui.item.id);}
-    		});
-        $("#alpdat").datetimepicker({
-            dateFormat: 'yy-mm-dd', 
-            timeFormat: 'hh:mm:ss', //damit kann auch Uhrzeit angegeben werden
-            yearRange: '2000:2020',
-            changeMonth: true,
-			changeYear: true,
-            firstDay: 1,
-            dayNamesMin: ['So','Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa' ],
-            monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez'],
-            timeText: 'Uhrzeit',
-            hourText: 'Stunde',
-            currentText: 'Jetzt',
-            closeText: 'OK'  
-        });
-        $("input[id='albez']").addClass("long20");
-        $("input[id='alpdat']").addClass("long10");
-        });
-    </script>
-<?php
-        $al     = $_POST["al"];
-        $alpid   = $_GET["i"];
-        $sub    = $_POST["eintragen"];
-    	$ok		= $_POST["ok"];
-        if (!$al['okn']) $ok=false;
-//        print_r($al);
-        
-        if ($alpid) $text = "editieren"; else $text = "erfassen";
-        echo "<h3>Pr&uuml;fung Anlage $text<h3>";
-        
-        if ($_FILES["pfile"]["error"] == 1 || $_FILES["pfile"]["error"] == 2)
-        {
-            if ($_FILES["pfile"]["error"] == 2)
-                echo "<p class='red'><b>Uploadfile zu ID '$alpid' > 10 MByte!</b></p>\n";
-            $ok = 0;
-        }
-        
-        echo "</div>\n";
-        
-        if (!$ok || !$sub)
-        {
-            // form anzeigen
-            if ($alpid && !$sub)
-            {
-                // Inhalte zu Pruefung holen
-                $sql = "SELECT p.al_ID,al_bez,pruef_date,pruef_file,pruef_bem 
-                        FROM fhiiqm.A_Pruefung p INNER JOIN fhiiqm.Anlage a ON p.al_ID=a.al_ID
-                        WHERE alp_ID = $alpid";
-                if ($result = $dbc -> queryObjectArray($sql))
-                {
-                    foreach ($result as $row)
-                    {
-                        $al["id"]   = $row->al_ID;
-                        $al["bez"]  = $row->al_bez;
-                        $al["pdat"] = $row->pruef_date;
-                        $al["bem"]  = $row->pruef_bem;
-                        $al["pfname"]  = $row->pruef_file;
-                    }
-                }
-            }
-            include ($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/form/alpruef_form.inc.php");     
-            if ($sub)
-    		{
-            echo            
-            "<tr>
-        		<td>Upload  Protokoll </td>
-        		<td><input type=\"file\" name=\"pfile\" size=\"50\" maxlength=\"50\" value=\"" .
-            $_FILES["pfile"]["name"] . "\"/></td>
-            </tr>";
-    		  	$frage = "Alle Angaben ok?<br>
-                        erst wenn Haken gesetzt, Upload-File w&auml;hlen!";
-    			echo "<tr>
-    			  <td class=\"red\" valign=\"top\" align=\"left\">$frage</td>
-    			        <td><input type=\"checkbox\" name=\"ok\" value=\"1\"";
-    			        if ($ok)  echo "checked"; 
-    			echo "></td>\n</tr>\n"; 
-    		}
-            if (!is_null($_SESSION["recht"]) && in_array("ae",$_SESSION["recht"]))
-            {
-                echo "
-               	<tr><td>&nbsp;</td>\n
-                	<td><input  class=\"button\" type=\"submit\" name=\"eintragen\" value=\"  eintragen  \" /></td>\n
-               	</tr>\n";
-            }
-            echo "</table>\n";
-            echo "</div>\n";
-            if (!is_null($_SESSION["recht"]) && !in_array("ae", $_SESSION["recht"]))
-                echo "<p class='sc'>&nbsp;&nbsp;&nbsp;<a href=\"alpruef_flist.php\" target=\"_self\" title=\"Anlagen pruefen\">&laquo; zur Liste der Anlagenpr&uuml;fungen</a></p>\n"; 
-            echo "</form>\n";   
-        }
-        else
-        {
-            // Daten speichern
-            echo "<div align='center'>\n";
-                
-            if ($alpid)
-            {
-                //update
-                // alte Bezeichnung Protokoll holen
-                $sql = "SELECT pruef_file
-                        FROM fhiiqm.A_Pruefung
-                        WHERE alp_ID = $alpid";
-                $al["pfname_old"]  = $dbc -> querySingleItem($sql);
-                // upload File
-                if (is_uploaded_file($_FILES["pfile"]["tmp_name"]) && isset($_FILES["pfile"]["name"]) && $_FILES["pfile"]["name"] )
-                {
-                    include ("inc/file_upload.inc.php");
-                    if ($al['pfname']<"!") $al['pfname']="al_pruefung";
-                    $fname  = gen_filename($al['pfname'],"pfile",$alpid);
-                    $retdf  = mod_file("/var/www/fhiiqm/alprot",$alpid,"","del");  // Loeschen alte Datei
-                    $retf   = upload("pfile", $fname, $alpid, "alprot");           // Datei prüfen und in Dokumentenverzeichnis verschieben
-                    if ($retf) 
-                    {
-                        $sql = "UPDATE A_Pruefung SET pruef_file = '" . $alpid . "_" . $fname ."' WHERE alp_ID=$alpid";
-                        $retp=$dbc->execute($sql);
-                        if (!$retp) 
-                            echo $dbc -> error . "<br>\n";
-                    }
-                }
-                else
-                {   // nur Aenderung Dateiname
-                    include ("inc/file_upload.inc.php");
-                    $fname = gen_filename($al["pfname"],$al["pfname_old"],$alpid,0);
-                    $len = strlen($alpid)+1;
-                    if (substr($fname,0,$len) != "$alpid" . "_") $fname = $alpid . "_" . $fname;
-                    if ($al["pfname"] != $al["pfname_old"])
-                    {
-                        if ($al["pfname"]>"!")
-                        {
-                            $retf  = mod_file("/var/www/fhiiqm/alprot",$alpid,$fname,"upd");  // Umbenennen alte Datei
-                            if ($retf) 
-                            {
-                                $sql = "UPDATE A_Pruefung SET pruef_file = '" . $fname . "' WHERE alp_ID=$alpid";
-                                $retp=$dbc->execute($sql);
-                                if (!$retp) 
-                                    echo $dbc -> error . "<br>\n";
-                                if (substr($fname,0,$len) == "$alpid" . "_") $fname = substr($fname,$len,50);
-                            }
-                        }
-                        else
-                        {
-                            $retf=1; $retp=1;
-                            if ($al["pfname_old"])
-                            {    // Loeschen alte Datei
-                                $retf  = mod_file("/var/www/fhiiqm/alprot",$alpid,"","del");
-                                if ($retf) 
-                                {
-                                    $sql = "UPDATE A_Pruefung SET pruef_file = null WHERE alp_ID=$alpid";
-                                    $retp=$dbc->execute($sql);
-                                    if (!$retp) 
-                                        echo $dbc -> error . "<br>\n";
-                                }
-                            }    
-                            
-                        }
-                        
-                    }
-                    else
-                    {
-                        //kein Upload, keine Dateinamenaenderung
-                        if (substr($fname,0,$len) == "$alpid" . "_") $fname = substr($fname,$len,50);
-                        $retf=1; $retp=1;
-                    }    
-                }    
-                $stmt = $dbc -> stmtinit();
-                if (is_object($stmt))
-                {
-                    $stmt -> prepare ("UPDATE A_Pruefung SET 
-                                al_ID = ?,
-                                pruef_date = ?,
-                                pruef_bem = ?
-                                WHERE alp_ID = $alpid");
-                    $stmt -> bind_param('iss', $al["id"], $al["pdat"],$al["bem"]);
-                    $result = $stmt -> execute();      
-                    if ($stmt->error) echo "UPDATE error: " . $stmt->errno . " - ". $stmt->error . "<br><br>\n";
-                }
-            }
-            else
-            {
-                //insert
-                $stmt = $dbc -> stmtinit();
-                if (is_object($stmt))
-                {
-                    $stmt -> prepare ("INSERT INTO A_Pruefung (al_ID,pruef_date,pruef_bem) VALUES (?,?,?)");
-                    $stmt -> bind_param('iss', $al["id"], $al["pdat"],$al["bem"]);
-                    $result = $stmt -> execute();      
-                    if ($stmt->error) echo "INSERT error: " . $stmt->errno . " - ". $stmt->error . "<br><br>\n";
-                }
-//$result=1;
-                if ($result)
-                { // INSERT o.k.
-                  // info_ID ermitteln
-                    $alpid = $dbc -> insertId();
-                    
-                    // upload File
-                    if (is_uploaded_file($_FILES["pfile"]["tmp_name"]) && isset($_FILES["pfile"]["name"]) && $_FILES["pfile"]["name"] )
-                    {
-                        include ("inc/file_upload.inc.php");
-                        if ($al['pfname']<"!") $al['pfname']="al_pruefung";
-                        $fname = gen_filename($al['pfname'],"pfile",$alpid);
-//echo $fname;
-
-                        $retf   = upload("pfile", $fname, $alpid, "alprot");              // Datei prüfen und in Dokumentenverzeichnis verschieben
-
-                        
-                        if ($retf)
-                        {   // upload o.k.
-                            //UPDATE des Filenamens
-                            $sql = "UPDATE A_Pruefung SET pruef_file = '" . $alpid . "_" . $fname ."' WHERE alp_ID=$alpid";
-                            $retp=$dbc->execute($sql);
-                            if (!$retp) 
-                                echo $dbc -> error . "<br>\n";
-                        }
-                       
-                    }
-                    else 
-                    {
-                        $retf=1; //kein Protokoll hochgeladen
-                        $retp=1;
-                    }
-                }
-            }
-            if ($result && $retf && $retp) // INSERT/UPDATE Pruefung
-            {
-                //Eingabe Daten, Upload File erfolgreich 
-                    echo "<p class='green'><b>Pr&uuml;fdaten zu Anlage '".$al["bez"]."' wurden erfolgreich gespeichert.</b></p>\n";
-                    echo "<br /><br />\n";
-
-                // Anzeigen gespeicherte Pruefdaten
-                if ($fname)
-                    $pfile = $alpid . "_" . $fname;
-                else
-                    $pfile = $al['pfname'];
-                echo "<table>\n";
-                echo "<tr><td>Anlagen-ID: </td><td>" . $al["id"] . "<td></td></tr>\n";
-                echo "<tr><td>Anlagenbezeichnung: </td><td>" . $al['bez'] . "<td></td></tr>\n";
-                $pdat = new DateTime($al["pdat"]);
-                if (is_object($pdat)) $pdat = $pdat->format('d.m.Y H:i:s'); else $pdat = "&nbsp;";
-                echo "<tr><td>Prüfdatum: </td><td>" . $pdat. "</td></tr>\n";
-                if ($fname>"!") echo "<tr><td>Dateiname Prüfprotokoll: </td><td>" . $pfile. "</td></tr>\n";
-                echo "<tr><td>Bemerkung: </td><td>" . nl2br($al['bem']) . "<td></td></tr>\n";
-                echo "</table>\n";   
-            }            
-            $dbc -> close();
-            echo "</div>\n";
-            echo "<p class=\"sc\">&nbsp;&nbsp;&nbsp;<a href=\"alpruef_ed.php\" target=\"_self\" title=\"Pr&uuml;fung erfassen\">Weitere Anlagen-Pr&uuml;fung erfassen</a></p>\n";    
-            echo "<p class=\"sc\">&nbsp;&nbsp;&nbsp;<a href=\"alpruef_flist.php\" target=\"_self\" title=\"Anlagen pruefen\" class=\"sc\">Liste der Anlagenpr&uuml;fungen</a>";
-            echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"anlage_flist.php\" target=\"_self\" title=\"Anlagen\">Anlagenenliste</a></p>\n";    
-        }
- ?>
- </body>
- </html>
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 12/2011
+ */
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    session_start();
+    if (! isset($_SESSION["userid"]))
+    { 
+        include_once ("inc/func_lib.inc.php");	
+        login($_SERVER["PHP_SELF"]);
+        exit;
+    }
+    
+    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("ar",$_SESSION["recht"]) && !in_array("ae",$_SESSION["recht"])))
+    {
+        header("Location: start.php");
+        exit;
+    }    
+    
+    include_once($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/inc/dbconnect.inc.php");
+    if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+    <link type="text/css" href="/fhiiqm/css/db.css" rel="Stylesheet" media="screen"/>	
+    <link type="text/css" href="/fhiiqm/css/db_print.css" rel="Stylesheet" media="print"/>	
+    <link type="text/css" href="/fhiiqm/css/jquery/ui-lightness-1.8.21/jquery-ui-1.8.21.custom.css" rel="Stylesheet" />	
+    <link type="text/css" href="/fhiiqm/css/jquery/jquery-ui-timepicker-addon.css" rel="Stylesheet" />	
+    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-1.7.2.min.js"></script>
+    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-ui-1.8.21.custom.min.js"></script>
+    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-ui-timepicker-addon-1.0.1.js"></script>
+    <title>Anlage Pruefung</title>
+ </head>
+ 
+ <body>
+
+<?php
+    echo "&nbsp;";  
+    echo "<div class=\"float-br smaller\" valign='top'>";
+    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+    echo "<div class=\"float-r\"><img src=\"img/rotate_01.png\" border=\"0\" alt=\"Anlage\" title=\"Anlage\"/></div>\n";
+?>
+
+    <div align='center'>
+
+    <script>
+      $(document).ready(function() {
+        $("#albez").focus();
+        $("#albez").autocomplete({
+                source: "/fhiiqm/inc/al_list_ac.inc.php",
+    			minLength: 2,
+                select: function(event,ui){$("#alid").val(ui.item.id);}
+    		});
+        $("#alpdat").datetimepicker({
+            dateFormat: 'yy-mm-dd', 
+            timeFormat: 'hh:mm:ss', //damit kann auch Uhrzeit angegeben werden
+            yearRange: '2000:2020',
+            changeMonth: true,
+			changeYear: true,
+            firstDay: 1,
+            dayNamesMin: ['So','Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa' ],
+            monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez'],
+            timeText: 'Uhrzeit',
+            hourText: 'Stunde',
+            currentText: 'Jetzt',
+            closeText: 'OK'  
+        });
+        $("input[id='albez']").addClass("long20");
+        $("input[id='alpdat']").addClass("long10");
+        });
+    </script>
+<?php
+        $al     = $_POST["al"];
+        $alpid   = $_GET["i"];
+        $sub    = $_POST["eintragen"];
+    	$ok		= $_POST["ok"];
+        if (!$al['okn']) $ok=false;
+
+        $zeil = $_GET["z"];
+        if (!$zeil) $zeil = $_POST["z"];
+        if (!$zeil) $zeil = 25; // Anzahl der gezeigten Zeilen
+        $start = $_GET["st"];
+        if (!$start) $start=0;
+    	$sort   = $_GET["s"];   // Sortierung nach Spalte
+        $dir    = $_GET["d"];   // Sortierrichtung
+        $fnum   = $_GET["f"];   // Spaltennummer, nach der aktuell gefiltert wird
+        $filter =  $_GET["b"];  // Filterbegriff 
+        $getp = "?s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil"; // Parameter Listenanzeige
+//        print_r($al);
+        
+        if ($alpid) $text = "editieren"; else $text = "erfassen";
+        echo "<h3>Pr&uuml;fung Anlage $text<h3>";
+        
+        if ($_FILES["pfile"]["error"] == 1 || $_FILES["pfile"]["error"] == 2)
+        {
+            if ($_FILES["pfile"]["error"] == 2)
+                echo "<p class='red'><b>Uploadfile zu ID '$alpid' > 10 MByte!</b></p>\n";
+            $ok = 0;
+        }
+        
+        echo "</div>\n";
+        
+        if (!$ok || !$sub)
+        {
+            // form anzeigen
+            if ($alpid && !$sub)
+            {
+                // Inhalte zu Pruefung holen
+                $sql = "SELECT p.al_ID,al_bez,pruef_date,pruef_file,pruef_bem 
+                        FROM fhiiqm.A_Pruefung p INNER JOIN fhiiqm.Anlage a ON p.al_ID=a.al_ID
+                        WHERE alp_ID = $alpid";
+                if ($result = $dbc -> queryObjectArray($sql))
+                {
+                    foreach ($result as $row)
+                    {
+                        $al["id"]   = $row->al_ID;
+                        $al["bez"]  = $row->al_bez;
+                        $al["pdat"] = $row->pruef_date;
+                        $al["bem"]  = $row->pruef_bem;
+                        $al["pfname"]  = $row->pruef_file;
+                    }
+                }
+            }
+            include ($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/form/alpruef_form.inc.php");     
+            if ($sub)
+    		{
+            echo            
+            "<tr>
+        		<td>Upload  Protokoll </td>
+        		<td><input type=\"file\" name=\"pfile\" size=\"50\" maxlength=\"50\" value=\"" .
+            $_FILES["pfile"]["name"] . "\"/></td>
+            </tr>";
+    		  	$frage = "Alle Angaben ok?<br>
+                        erst wenn Haken gesetzt, Upload-File w&auml;hlen!";
+    			echo "<tr>
+    			  <td class=\"red\" valign=\"top\" align=\"left\">$frage</td>
+    			        <td><input type=\"checkbox\" name=\"ok\" value=\"1\"";
+    			        if ($ok)  echo "checked"; 
+    			echo "></td>\n</tr>\n"; 
+    		}
+            if (!is_null($_SESSION["recht"]) && in_array("ae",$_SESSION["recht"]))
+            {
+                echo "
+               	<tr><td>&nbsp;</td>\n
+                	<td><input  class=\"button\" type=\"submit\" name=\"eintragen\" value=\"  eintragen  \" /></td>\n
+               	</tr>\n";
+            }
+            echo "</table>\n";
+            echo "</div>\n";
+            echo "<p class='sc'>&nbsp;&nbsp;&nbsp;<a href=\"alpruef_flist.php$getp\" target=\"_self\" title=\"Anlagen pruefen\">&laquo; zur Liste der Anlagenpr&uuml;fungen</a></p>\n"; 
+            echo "</form>\n";   
+        }
+        else
+        {
+            // Daten speichern
+            echo "<div align='center'>\n";
+                
+            if ($alpid)
+            {
+                //update
+                // alte Bezeichnung Protokoll holen
+                $sql = "SELECT pruef_file
+                        FROM fhiiqm.A_Pruefung
+                        WHERE alp_ID = $alpid";
+                $al["pfname_old"]  = $dbc -> querySingleItem($sql);
+                // upload File
+                if (is_uploaded_file($_FILES["pfile"]["tmp_name"]) && isset($_FILES["pfile"]["name"]) && $_FILES["pfile"]["name"] )
+                {
+                    include ("inc/file_upload.inc.php");
+                    if ($al['pfname']<"!") $al['pfname']="al_pruefung";
+                    $fname  = gen_filename($al['pfname'],"pfile",$alpid);
+                    $retdf  = mod_file("/var/www/fhiiqm/alprot",$alpid,"","del");  // Loeschen alte Datei
+                    $retf   = upload("pfile", $fname, $alpid, "alprot");           // Datei prüfen und in Dokumentenverzeichnis verschieben
+                    if ($retf) 
+                    {
+                        $sql = "UPDATE A_Pruefung SET pruef_file = '" . $alpid . "_" . $fname ."' WHERE alp_ID=$alpid";
+                        $retp=$dbc->execute($sql);
+                        if (!$retp) 
+                            echo $dbc -> error . "<br>\n";
+                    }
+                }
+                else
+                {   // nur Aenderung Dateiname
+                    include ("inc/file_upload.inc.php");
+                    $fname = gen_filename($al["pfname"],$al["pfname_old"],$alpid,0);
+                    $len = strlen($alpid)+1;
+                    if (substr($fname,0,$len) != "$alpid" . "_") $fname = $alpid . "_" . $fname;
+                    if ($al["pfname"] != $al["pfname_old"])
+                    {
+                        if ($al["pfname"]>"!")
+                        {
+                            $retf  = mod_file("/var/www/fhiiqm/alprot",$alpid,$fname,"upd");  // Umbenennen alte Datei
+                            if ($retf) 
+                            {
+                                $sql = "UPDATE A_Pruefung SET pruef_file = '" . $fname . "' WHERE alp_ID=$alpid";
+                                $retp=$dbc->execute($sql);
+                                if (!$retp) 
+                                    echo $dbc -> error . "<br>\n";
+                                if (substr($fname,0,$len) == "$alpid" . "_") $fname = substr($fname,$len,50);
+                            }
+                        }
+                        else
+                        {
+                            $retf=1; $retp=1;
+                            if ($al["pfname_old"])
+                            {    // Loeschen alte Datei
+                                $retf  = mod_file("/var/www/fhiiqm/alprot",$alpid,"","del");
+                                if ($retf) 
+                                {
+                                    $sql = "UPDATE A_Pruefung SET pruef_file = null WHERE alp_ID=$alpid";
+                                    $retp=$dbc->execute($sql);
+                                    if (!$retp) 
+                                        echo $dbc -> error . "<br>\n";
+                                }
+                            }    
+                            
+                        }
+                        
+                    }
+                    else
+                    {
+                        //kein Upload, keine Dateinamenaenderung
+                        if (substr($fname,0,$len) == "$alpid" . "_") $fname = substr($fname,$len,50);
+                        $retf=1; $retp=1;
+                    }    
+                }    
+                $stmt = $dbc -> stmtinit();
+                if (is_object($stmt))
+                {
+                    $stmt -> prepare ("UPDATE A_Pruefung SET 
+                                al_ID = ?,
+                                pruef_date = ?,
+                                pruef_bem = ?
+                                WHERE alp_ID = $alpid");
+                    $stmt -> bind_param('iss', $al["id"], $al["pdat"],$al["bem"]);
+                    $result = $stmt -> execute();      
+                    if ($stmt->error) echo "UPDATE error: " . $stmt->errno . " - ". $stmt->error . "<br><br>\n";
+                }
+            }
+            else
+            {
+                //insert
+                $stmt = $dbc -> stmtinit();
+                if (is_object($stmt))
+                {
+                    $stmt -> prepare ("INSERT INTO A_Pruefung (al_ID,pruef_date,pruef_bem) VALUES (?,?,?)");
+                    $stmt -> bind_param('iss', $al["id"], $al["pdat"],$al["bem"]);
+                    $result = $stmt -> execute();      
+                    if ($stmt->error) echo "INSERT error: " . $stmt->errno . " - ". $stmt->error . "<br><br>\n";
+                }
+//$result=1;
+                if ($result)
+                { // INSERT o.k.
+                  // info_ID ermitteln
+                    $alpid = $dbc -> insertId();
+                    
+                    // upload File
+                    if (is_uploaded_file($_FILES["pfile"]["tmp_name"]) && isset($_FILES["pfile"]["name"]) && $_FILES["pfile"]["name"] )
+                    {
+                        include ("inc/file_upload.inc.php");
+                        if ($al['pfname']<"!") $al['pfname']="al_pruefung";
+                        $fname = gen_filename($al['pfname'],"pfile",$alpid);
+//echo $fname;
+
+                        $retf   = upload("pfile", $fname, $alpid, "alprot");              // Datei prüfen und in Dokumentenverzeichnis verschieben
+
+                        
+                        if ($retf)
+                        {   // upload o.k.
+                            //UPDATE des Filenamens
+                            $sql = "UPDATE A_Pruefung SET pruef_file = '" . $alpid . "_" . $fname ."' WHERE alp_ID=$alpid";
+                            $retp=$dbc->execute($sql);
+                            if (!$retp) 
+                                echo $dbc -> error . "<br>\n";
+                        }
+                       
+                    }
+                    else 
+                    {
+                        $retf=1; //kein Protokoll hochgeladen
+                        $retp=1;
+                    }
+                }
+            }
+            if ($result && $retf && $retp) // INSERT/UPDATE Pruefung
+            {
+                //Eingabe Daten, Upload File erfolgreich 
+                    echo "<p class='green'><b>Pr&uuml;fdaten zu Anlage '".$al["bez"]."' wurden erfolgreich gespeichert.</b></p>\n";
+                    echo "<br /><br />\n";
+
+                // Anzeigen gespeicherte Pruefdaten
+                if ($fname)
+                    $pfile = $alpid . "_" . $fname;
+                else
+                    $pfile = $al['pfname'];
+                echo "<table>\n";
+                echo "<tr><td>Anlagen-ID: </td><td>" . $al["id"] . "<td></td></tr>\n";
+                echo "<tr><td>Anlagenbezeichnung: </td><td>" . $al['bez'] . "<td></td></tr>\n";
+                $pdat = new DateTime($al["pdat"]);
+                if (is_object($pdat)) $pdat = $pdat->format('d.m.Y H:i:s'); else $pdat = "&nbsp;";
+                echo "<tr><td>Prüfdatum: </td><td>" . $pdat. "</td></tr>\n";
+                if ($fname>"!") echo "<tr><td>Dateiname Prüfprotokoll: </td><td>" . $pfile. "</td></tr>\n";
+                echo "<tr><td>Bemerkung: </td><td>" . nl2br($al['bem']) . "<td></td></tr>\n";
+                echo "</table>\n";   
+            }            
+            $dbc -> close();
+            echo "</div>\n";
+            echo "<p class=\"sc\">&nbsp;&nbsp;&nbsp;<a href=\"alpruef_ed.php\" target=\"_self\" title=\"Pr&uuml;fung erfassen\">Weitere Anlagen-Pr&uuml;fung erfassen</a></p>\n";    
+            echo "<p class=\"sc\">&nbsp;&nbsp;&nbsp;<a href=\"alpruef_flist.php$getp\" target=\"_self\" title=\"Anlagen pruefen\" class=\"sc\">Liste der Anlagenpr&uuml;fungen</a>";
+            echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"anlage_flist.php\" target=\"_self\" title=\"Anlagen\">Anlagenenliste</a></p>\n";    
+        }
+ ?>
+ </body>
+ </html>
--- a/fhiiqm/alpruef_flist.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/alpruef_flist.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,193 +1,204 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 12/2011
- * 
- * Liste der Anlagenpruefungen (sortieren, filtern)
- */
-
-    error_reporting(E_ALL ^ E_NOTICE);
-    
-    session_start();
-    if (! isset($_SESSION["userid"]))
-    { 
-        include_once ("inc/func_lib.inc.php");	
-        login($_SERVER["PHP_SELF"]);
-        exit;
-    }
-    
-    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("ar",$_SESSION["recht"]) && !in_array("ae",$_SESSION["recht"])))
-    {
-        header("Location: start.php");
-        exit;
-    }    
-    
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-   	<link href="css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen" /> 
-   	<link href="css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print" /> 
-
-	<title>Liste Anlagenpruefungen</title>
-</head>
-
-<body onload="document.ffilter.filter.focus();">
-    
-<?php
-    echo "&nbsp;";  
-    echo "<div class=\"float-br smaller\" valign='top'>";
-    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
-    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
-    echo "<div class=\"float-r\"><img src=\"img/rotate_01.png\" border=\"0\" alt=\"Anlage\" title=\"Anlage\"/></div>\n";
-
-    // Felder, nach denen gefiltert werden kann
-    $fields = array(2=>"Bezeichnung",3=>"Pr&uuml;fdatum",5=>"Anlagen-ID");
-
-    $zeil = $_GET["z"];
-    if (!$zeil) $zeil = $_POST["z"];
-    if (!$zeil) $zeil = 25; // Anzahl der gezeigten Zeilen
-    $start = $_GET["st"];
-    if (!$start) $start=0;
-    
-	$sort   = $_GET["s"];   // Sortierung nach Spalte
-    if (!isset($sort) && !$sort) $sort = $_POST["s"];      
-
-    $dir    = $_GET["d"];   // Sortierrichtung
-    if (!isset($dir) && !$dir) $dir = $_POST["d"];
-
-    $fnum   = $_GET["f"];   // Spaltennummer, nach der aktuell gefiltert wird
-    if (!isset($fnum) && !$fnum) $fnum = $_POST["f"];
-
-    $filter = $_POST["filter"];
-    if (!isset($filter) && !$filter) $filter = $_GET["b"];   
-
-    $subf   = $_POST["subf"]; // submit
-    
-    if (!isset($fnum) || !$fnum) $fnum = 1;
-    if (!isset($filter) || !$filter) $filter = "";
-    if (!isset($sort) || !$sort) $sort = 2;
-    if (!isset($dir) || !$dir)  $dir = "";
-
-    include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
-	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
-	$dbc = new dbconnection();
-
-    $sql = "CALL alpruef_flist($sort,'" . $dir . "',$fnum, '" . $filter . "',$start,$zeil,@anz);"; 
-    // Parameter: Nr. Sortfeld, Sortierrichtung, Nr. Filterfeld, Filterbegriff, Anzahl gefundener Anlagen
-    // liefert: alp_ID,al_bez,pruef_date,pruef_file,pruef_bem,al_id
-//    echo "sql = $sql<br />";  
-    $result = $dbc ->queryObjectArray($sql);
-    if ($dbc ->error) echo "error: " . $dbc ->error . "<br />";
-
-    if ($result)
-    {
-		$bg1 = "#F8F8F8";
-		$bg2 = "#DEDFE1";
-		$bg = "#FFFFFF";
-     
-        echo "<div align='center'>\n";
- 
-        echo "<p><b>Anlagenpr&uuml;fungen</b></p>\n";
-        
-        echo "<table border='0' cellspacing='0'>\n";
-        echo "<tr><td class='bigger'>Mittels '<img src='/fhiiqm/img/auf.gif' border='0' width='11' hight='11' />' / '<img src='/fhiiqm/img/ab.gif' border='0' width='11' hight='11' />' 
-            können Sie nach relevanten Spalten auf- bzw. absteigend sortieren</td></tr>
-            <tr><td class='bigger'>'<img src='/fhiiqm/img/filter.gif' border='0' width='14' hight='11' />' erm&ouml;glicht das Filtern nach ausgew&auml;hlten Spalten der Liste</td></tr>
-            <tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten der Anlagenpr&uuml;fung</td></tr>\n";
-        echo "</table>\n";
-
-        $panz = $dbc -> querySingleItem("SELECT @anz");
-        printf ("<p>Anzahl Anlagenpr&uuml;fungen: %s</p>", $panz);
-        
-        if (isset($fnum) && $fnum>1 && !$filter && !$subf)
-        {
-            // Formular anzeigen fuer Filterbegriff
-            $text = $fields[$fnum];
-            echo "<form action=" . $_SERVER['PHP_SELF'] . " method='post' enctype='application/x-www-form-urlencoded' id='ffilter' name='ffilter' target='_self'>\n";
-            echo "<table width=\"25%\" border=\"0\" cellspacing=\"1\" cellpadding=\"0\">\n";
-            echo "<tr><td>filtern nach $text: ";
-            echo "</td>";
-            echo "<td><input id='filter' name='filter' type=\"text\" size=\"10\" maxlength=\"30\" value=\"$filter\"/></td>";
-            echo "<td><input class=\"button\" type=\"submit\" value=\"finden\" name=\"subf\" title=\"subf\" /></td></tr>\n";
-            if ($fnum == 3) echo "<tr><td colspan='3'>Datum im Format 'jjjj-mm-tt' angeben oder Teilbereich davon</td></tr>\n";
-            echo "<input type='hidden' name='s' value='$sort' />";
-            echo "<input type='hidden' name='d' value='$dir' />";
-            echo "<input type='hidden' name='f' value='$fnum' />";
-            echo "</table>\n";
-            echo "</form>\n";
-            echo "<p>&nbsp;&nbsp;&nbsp;";
-            if ($fnum == 3) echo "<br />&nbsp;&nbsp;&nbsp;</p>\n"; else echo "</p>\n";
-        }
-
-        echo "<table>\n";
-        
-        if ($filter>'!') echo "<tr><td class='bigger' colspan=5>Filter: ". $fields["$fnum"] . " wie '$filter'</td><tr>\n";
-
-        // Listenkopf generieren
-        echo "<tr bgcolor='#68ACBF'>";
-        tab_column(2,"Anlage",$sort,$dir,2,$fnum,$filter,$start,$zeil);
-        tab_column(3,"Prüfdatum",$sort,$dir,3,$fnum,$filter,$start,$zeil);
-        tab_column(4,"Protokoll",$sort,$dir,0,$fnum,$filter,$start,$zeil);
-        echo "<th>Bemerkung</th>";
-
-        echo "<th>&nbsp;</th></tr>\n";
-        
-        foreach ($result as $row)
-        {
-			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-            echo "<tr bgcolor='" . $bg . "'><td>$row->al_bez</a></td>";
-            echo "<td>$row->pruef_date</td>";
-            if (file_exists("alprot/".$row->pruef_file))
-            {
-                $prot = substr($row->pruef_file,strpos($row->pruef_file,"_")+1); 
-                echo "<td><a href='alprot/$row->pruef_file'>$prot</a></td>";
-            }
-            else    
-                echo "<td>$row->pruef_file</td>";
-            echo "<td>" .nl2br($row->pruef_bem)."</td>";    
-            echo "<td><a href='/fhiiqm/alpruef_ed.php?i=$row->alp_ID'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td></tr>\n";
-        }
-        echo "</table></div>\n";
-
-        echo "<br />&nbsp;&nbsp;&nbsp;";
-        
-        // Sortierung und Filter aus $_GET fuer weitere Seiten
-        foreach ($_GET as $key=>$val)
-        {
-            if ($key != "st") $liste .= "&" . $key ."=".$val;
-        }    
-        // Sortierung und Filter aus $_POST fuer weitere Seiten
-        if ($subf)
-        foreach ($_POST as $key=>$val)
-        {
-            if ($key != "st" && $key != "subf" && $key != "filter") $liste .= "&" . $key ."=".$val;
-            if ($key == "filter") $liste .= "&b=" . $val;
-        }    
-        
-        // Links auf andere Seiten generieren
-        liste_links($start,$zeil,$panz,$liste);
-
-    }
-    else
-    {
-        if ($dbc -> error)  
-            echo "error: " . $dbc -> error . "<br />\n";
-        else
-        {
-            echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider nichts gefunden f&uuml;r ". $fields["$fnum"] . " wie '$filter'!</p><br />";
-            echo "&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Anlagen\" class=\"sc\">Anlagenpr&uuml;fungen</a></p>\n";
-        }
-        
-    }
-    $dbc -> close();
-    if (!is_null($_SESSION["recht"]) && in_array("ae",$_SESSION["recht"]))
-        echo "<p>&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/alpruef_ed.php\" target=\"_self\" title=\"Anlagenpruefung erfassen\" class=\"sc\">Weitere Anlagenpr&uuml;fung erfassen</a></p>\n";    
-    echo "<p>&nbsp;&nbsp;&nbsp;<a href=\"anlage_flist.php\" target=\"_self\" title=\"Anlagen\" class=\"sc\">Anlagenenliste</a>\n";    
-
-?>
-</body>
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 12/2011
+ * 
+ * Liste der Anlagenpruefungen (sortieren, filtern)
+ */
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    session_start();
+    if (! isset($_SESSION["userid"]))
+    { 
+        include_once ("inc/func_lib.inc.php");	
+        login($_SERVER["PHP_SELF"]);
+        exit;
+    }
+    
+    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("ar",$_SESSION["recht"]) && !in_array("ae",$_SESSION["recht"])))
+    {
+        header("Location: start.php");
+        exit;
+    }    
+    
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen" /> 
+   	<link href="css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print" /> 
+
+	<title>Liste Anlagenpruefungen</title>
+</head>
+
+<body onload="document.ffilter.filter.focus();">
+    
+<?php
+    echo "&nbsp;";  
+    echo "<div class=\"float-br smaller\" valign='top'>";
+    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+    echo "<div class=\"float-r\"><img src=\"img/rotate_01.png\" border=\"0\" alt=\"Anlage\" title=\"Anlage\"/></div>\n";
+
+    // Felder, nach denen gefiltert werden kann
+    $fields = array(2=>"Bezeichnung",3=>"Pr&uuml;fdatum",5=>"Anlagen-ID");
+
+    $zeil = $_GET["z"];
+    if (!$zeil) $zeil = $_POST["z"];
+    if (!$zeil) $zeil = 25; // Anzahl der gezeigten Zeilen
+    $start = $_GET["st"];
+    if (!$start) $start=0;
+    
+	$sort   = $_GET["s"];   // Sortierung nach Spalte
+    if (!isset($sort) && !$sort) $sort = $_POST["s"];      
+
+    $dir    = $_GET["d"];   // Sortierrichtung
+    if (!isset($dir) && !$dir) $dir = $_POST["d"];
+
+    $fnum   = $_GET["f"];   // Spaltennummer, nach der aktuell gefiltert wird
+    if (!isset($fnum) && !$fnum) $fnum = $_POST["f"];
+
+    $filter = $_POST["filter"];
+    if (!isset($filter) && !$filter) $filter = $_GET["b"];   
+
+    $subf   = $_POST["subf"]; // submit
+    
+    if (!isset($fnum) || !$fnum) $fnum = 1;
+    if (!isset($filter) || !$filter) $filter = "";
+    if (!isset($sort) || !$sort) $sort = 2;
+    if (!isset($dir) || !$dir)  $dir = "";
+
+    include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+	$dbc = new dbconnection();
+
+    $sql = "CALL alpruef_flist($sort,'" . $dir . "',$fnum, '" . $filter . "',$start,$zeil,@anz);"; 
+    // Parameter: Nr. Sortfeld, Sortierrichtung, Nr. Filterfeld, Filterbegriff, Anzahl gefundener Anlagen
+    // liefert: alp_ID,al_bez,pruef_date,pruef_file,pruef_bem,al_id
+//    echo "sql = $sql<br />";  
+    $result = $dbc ->queryObjectArray($sql);
+    if ($dbc ->error) echo "error: " . $dbc ->error . "<br />";
+
+    if ($result)
+    {
+		$bg1 = "#F8F8F8";
+		$bg2 = "#DEDFE1";
+		$bg = "#FFFFFF";
+        $getp = "&s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil"; // Parameter Listenanzeige
+     
+        echo "<div align='center'>\n";
+ 
+        echo "<p><b>Anlagenpr&uuml;fungen</b></p>\n";
+        
+        echo "<table border='0' cellspacing='0'>\n";
+        echo "<tr><td class='bigger'>Mittels '<img src='/fhiiqm/img/auf.gif' border='0' width='11' hight='11' />' / '<img src='/fhiiqm/img/ab.gif' border='0' width='11' hight='11' />' 
+            können Sie nach relevanten Spalten auf- bzw. absteigend sortieren</td></tr>
+            <tr><td class='bigger'>'<img src='/fhiiqm/img/filter.gif' border='0' width='14' hight='11' />' erm&ouml;glicht das Filtern nach ausgew&auml;hlten Spalten der Liste</td></tr>
+            <tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten der Anlagenpr&uuml;fung</td></tr>\n";
+        echo "</table>\n";
+
+        $panz = $dbc -> querySingleItem("SELECT @anz");
+        printf ("<p>Anzahl Anlagenpr&uuml;fungen: %s</p>", $panz);
+        
+        if (isset($fnum) && $fnum>1 && !$filter && !$subf)
+        {
+            // Formular anzeigen fuer Filterbegriff
+            $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
+            $text = $fields[$fnum];
+            echo "<form action=" . $_SERVER['PHP_SELF'] . " method='post' enctype='application/x-www-form-urlencoded' id='ffilter' name='ffilter' target='_self'>\n";
+            echo "<table width=\"30%\" border=\"0\" cellspacing=\"1\" cellpadding=\"0\">\n";
+            echo "<tr><td>filtern nach $text: ";
+            echo "</td>";
+            echo "<td><input id='filter' name='filter' type=\"text\" size=\"10\" maxlength=\"30\" value=\"$filter\"/></td>";
+            echo "<td>Zeilen/Seite?   <select name='z'>\n";
+            foreach ($azeil as $key=>$val)
+            {
+                if ($key == $zeil) $select = "selected"; else $select = "";
+                echo "<option $select value='$key'>$val</option>\n";
+            }
+            echo "</select></td>\n";
+            echo "<td><input class=\"button\" type=\"submit\" value=\"finden\" name=\"subf\" title=\"subf\" /></td></tr>\n";
+            if ($fnum == 3) echo "<tr><td colspan='3'>Datum im Format 'jjjj-mm-tt' angeben oder Teilbereich davon</td></tr>\n";
+            echo "<input type='hidden' name='s' value='$sort' />";
+            echo "<input type='hidden' name='d' value='$dir' />";
+            echo "<input type='hidden' name='f' value='$fnum' />";
+            echo "</table>\n";
+            echo "</form>\n";
+            echo "<p>&nbsp;&nbsp;&nbsp;";
+            if ($fnum == 3) echo "<br />&nbsp;&nbsp;&nbsp;</p>\n"; else echo "</p>\n";
+        }
+
+        echo "<table>\n";
+        
+        if ($filter>'!') echo "<tr><td class='bigger' colspan=5>Filter: ". $fields["$fnum"] . " wie '$filter'</td><tr>\n";
+
+        // Listenkopf generieren
+        echo "<tr bgcolor='#68ACBF'>";
+        tab_column(2,"Anlage",$sort,$dir,2,$fnum,$filter,$start,$zeil);
+        tab_column(3,"Prüfdatum",$sort,$dir,3,$fnum,$filter,$start,$zeil);
+        tab_column(4,"Protokoll",$sort,$dir,0,$fnum,$filter,$start,$zeil);
+        echo "<th>Bemerkung</th>";
+
+        echo "<th>&nbsp;</th></tr>\n";
+        
+        foreach ($result as $row)
+        {
+			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+            echo "<tr bgcolor='" . $bg . "'><td>$row->al_bez</a></td>";
+            $pdat = new DateTime($row->pruef_date);
+             
+            echo "<td>". $pdat->format('d.m.Y h:i:s') ."</td>";
+            if (file_exists("alprot/".$row->pruef_file))
+            {
+                $prot = substr($row->pruef_file,strpos($row->pruef_file,"_")+1); 
+                echo "<td><a href='alprot/$row->pruef_file'>$prot</a></td>";
+            }
+            else    
+                echo "<td>$row->pruef_file</td>";
+            echo "<td>" .nl2br($row->pruef_bem)."</td>";    
+            echo "<td><a href='/fhiiqm/alpruef_ed.php?i=$row->alp_ID$getp'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td></tr>\n";
+        }
+        echo "</table></div>\n";
+
+        echo "<br />&nbsp;&nbsp;&nbsp;";
+        
+        // Sortierung und Filter aus $_GET fuer weitere Seiten
+        foreach ($_GET as $key=>$val)
+        {
+            if ($key != "st") $liste .= "&" . $key ."=".$val;
+        }    
+        // Sortierung und Filter aus $_POST fuer weitere Seiten
+        if ($subf)
+        foreach ($_POST as $key=>$val)
+        {
+            if ($key != "st" && $key != "subf" && $key != "filter") $liste .= "&" . $key ."=".$val;
+            if ($key == "filter") $liste .= "&b=" . $val;
+        }    
+        
+        // Links auf andere Seiten generieren
+        liste_links($start,$zeil,$panz,$liste);
+
+    }
+    else
+    {
+        if ($dbc -> error)  
+            echo "error: " . $dbc -> error . "<br />\n";
+        else
+        {
+            echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider nichts gefunden f&uuml;r ". $fields["$fnum"] . " wie '$filter'!</p><br />";
+            echo "&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Anlagen\" class=\"sc\">Anlagenpr&uuml;fungen</a></p>\n";
+        }
+        
+    }
+    $dbc -> close();
+    if (!is_null($_SESSION["recht"]) && in_array("ae",$_SESSION["recht"]))
+        echo "<p>&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/alpruef_ed.php\" target=\"_self\" title=\"Anlagenpruefung erfassen\" class=\"sc\">Weitere Anlagenpr&uuml;fung erfassen</a></p>\n";    
+    echo "<p>&nbsp;&nbsp;&nbsp;<a href=\"anlage_flist.php\" target=\"_self\" title=\"Anlagen\" class=\"sc\">Anlagenenliste</a>\n";    
+
+?>
+</body>
 </html>
\ No newline at end of file
--- a/fhiiqm/css/db.css	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/css/db.css	Fri Dec 20 15:19:32 2013 +0100
@@ -132,10 +132,6 @@
 {
     display: inline;
 }
-.red
-{
-  color: #FF0000;
-}
 
 .bgmark
 {
@@ -164,6 +160,10 @@
 {
   background-color: #A8BBBB  
 }
+.red
+{
+  color: #FF0000;
+}
 .green
 {
   color: #008000;
@@ -174,6 +174,10 @@
     font-size: 1.1em;    
     text-align: left;
 }
+.big
+{
+    font-size: 1.2em;    
+}
 .smaller
 {
     font-size: .9em;    
--- a/fhiiqm/css/db_print.css	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/css/db_print.css	Fri Dec 20 15:19:32 2013 +0100
@@ -92,6 +92,11 @@
     font-size: 1.1em;    
     text-align: left;
 }
+.big
+{
+    font-family: sans-serif;
+    font-size: 1.2em;    
+}
 .smaller
 {
     font-size: .9em;    
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/deprecated/ma_ed_form.inc.php	Fri Dec 20 15:19:32 2013 +0100
@@ -0,0 +1,342 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 11/2012
+ * 
+ * Form Mitarbeiter/Objekte FHI
+ */
+
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+    $okn = true;
+    if (!$ma) 
+    {
+       $ma['geb'] = 'A';
+       $ma['abt'][0] = $dbc -> querySingleItem("SELECT abt_ID FROM Abteilung ORDER BY abt_ID+0 LIMIT 0,1");
+       $ma['so'][0] = 1;
+    }
+
+?>
+<div align="center">
+<h5>* - Felder sind erforderlich!</h5>
+</div>
+<form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_ma">
+<div align="center"> 
+<table width="60%" border="0" cellspacing="3" cellpadding="3">
+    <tr>
+        <td>
+            <u>Mitarbeiter</u> FHI?
+        </td>
+        <td><input name="ma[fhi]" id="fhi" type="checkbox" value="1" <?php if ($ma['fhi']) echo "checked=\"checked\""; ?> onchange="this.form.submit();" />
+        </td>    
+    </tr>        
+	<tr>
+        <?php if (!$ma["fhi"]) echo "<td>Bezeichnung 1 *</td>\n";
+	           else echo "<td>Name *</td>\n"; ?>
+	   <td><input name="ma[name]" id="nname" type="text" size="30" maxlength="50" value="<?php echo $ma['name']; ?>" />
+        <?php
+			     if (isset($ma['name']) && $ma['name']<'!')
+				{
+					echo "<br><span class=\"red\">Name ist erforderlich!</span>\n";
+					$okn = false;
+				}
+        ?>
+        </td>
+    </tr>
+	<tr>
+        <?php if (!$ma["fhi"]) echo "<td>Bezeichnung 2 </td>\n";
+	           else echo "<td>Vorname </td>\n"; ?>
+	   <td><input name="ma[vname]" id="vname" type="text" size="30" maxlength="50" value="<?php echo $ma['vname']; ?>" />
+        <?php
+		/*	     if (isset($ma['vname']) && $ma['vname']<'!')
+				{
+					echo "<br><span class=\"red\">Vorname ist erforderlich!</span>\n";
+					$okn = false;
+				}   */
+        ?>
+        </td>
+    </tr>
+    <?php if ($ma["fhi"]) {   ?>   
+	<tr>
+	   <td>Titel</td>
+	   <td><input name="ma[titel]" type="text" size="30" maxlength="30" value="<?php echo $ma['titel']; ?>" /></td>
+    </tr>
+    <?php } ?>
+    <tr><td>Ort</td>
+        <td valign="top">Haus&nbsp;
+             <select name="ma[geb]" onchange="this.form.submit();">
+            <?php 
+                if ($ma['geb'] == -1) $select = " selected "; else $select = "";
+                echo "<option $select value=\"-1\"></option>\n";
+                $sql = "SELECT geb_ID, geb_name FROM `fhiiqm`.`Haus` ORDER BY 1";
+                if ($result = $dbc->queryObjectArray($sql))
+                {
+                    foreach ($result as $row)
+                    {
+                        if ($row->geb_ID == $ma['geb'])
+    					   echo "<option selected value=\"$row->geb_ID\">$row->geb_ID: $row->geb_name</option>\n";
+    				    else
+    					   echo "<option value=\"$row->geb_ID\">$row->geb_ID: $row->geb_name</option>\n";
+                    }
+            }
+            ?>
+            </select>
+            &nbsp;&nbsp;Raum&nbsp;            
+             <select name="ma[raum]">
+            <?php 
+                if ($ma['raum'] == -1) $select = " selected "; else $select = "";
+                echo "<option $select value=\"-1\"></option>\n";
+                $sql = "SELECT raum_ID, raum_nr, raum_name FROM `fhiiqm`.`Raum` WHERE geb_ID='" . $ma['geb'] ."' ORDER BY 2";
+                if ($result = $dbc->queryObjectArray($sql))
+                {
+                    foreach ($result as $row)
+                    {
+                        if ($row->raum_ID == $ma['raum'])
+    					   echo "<option selected value=\"$row->raum_ID\">$row->raum_nr $row->raum_name</option>\n";
+    				    else
+    					   echo "<option value=\"$row->raum_ID\">$row->raum_nr $row->raum_name</option>\n";
+                    }
+            }
+            ?>
+            </select>
+        </td>
+    </tr>
+<?php
+/*  // deaktiviert am 08.01.2013, Kaendler, Schwarzer
+    echo
+    "<tr>
+        <td>Arbeitsgruppe</td>
+        <td><select name=\"ma[rag]\">";
+                if ($ma['rag'] == -1) $select = " selected "; else $select = "";
+                echo "<option $select value=\"-1\"></option>\n";
+                $sql = "SELECT rag_ID, rag_bez, abt_name FROM RaumArb_Gruppe g INNER JOIN Abteilung a 
+                        ON g.abt_ID = a.abt_ID ORDER BY g.abt_ID,rag_ID";
+                if ($result = $dbc->queryObjectArray($sql))
+                {
+                    foreach ($result as $row)
+                    {
+                        if ($row->rag_ID == $ma['rag'])
+                        {
+    					   echo "<option selected value=\"$row->rag_ID\">$row->abt_name: $row->rag_bez</option>\n";
+                        }  
+    				    else
+    					   echo "<option value=\"$row->rag_ID\">$row->abt_name: $row->rag_bez</option>\n";
+                    }
+            }
+    echo
+            "</select>
+        </td>
+    </tr>";
+*/
+?>
+    <tr>
+        <td>Telefon</td>
+        <td><div id="addtel">
+        <select name="ma[tel][]" size="1">
+            <?php
+                $select = null;
+                $select = ( "-1"==$ma['tel'][0] ) ? " selected='selected'" : "";
+                echo "<option $select value=\"-1\"></option>\n";
+/*                $sql = "SELECT telefon_nr,geb_ID,raum_nr, telefon_typ FROM fhiiqm.Telefon t
+                        LEFT OUTER JOIN Raum r ON t.raum_ID=r.Raum_ID 
+                        ORDER BY telefon_nr";   */
+                $sql = "SELECT telefon_nr, telefon_typ FROM fhiiqm.Telefon 
+                        ORDER BY telefon_nr";
+                if ($result = $dbc->queryObjectArray($sql))
+                {
+                    foreach ($result as $row)
+                    {
+                        if ($row->telefon_typ == "fax") $teln = $row->telefon_nr." FAX"; else $teln = $row->telefon_nr;
+//                        if ($row->raum_nr) $telr = "[". $row->geb_ID. " ". $row->raum_nr . "]"; else $telr = "";
+                        $select = ( $row->telefon_nr==$ma['tel'][0] ) ? " selected='selected'" : "";
+    					echo "<option $select value=\"$row->telefon_nr\">$teln</option>\n";
+//                        $tel .= "'".$row->telefon_nr. "':'" . $teln ."&nbsp;&nbsp;&nbsp;". $telr. "',";
+                        $tel .= "'".$row->telefon_nr. "':'" . $teln . "',";
+                    }
+                }
+                $tel = substr($tel,0,strlen($tel)-1);
+            ?>
+            </select>
+            <script type="text/javascript">
+            <!--
+                arr = {<?php echo ($tel); ?>}; // Ergebnis: {key:'value',key:'value',...} 
+            //-->
+            </script>
+            &nbsp;&nbsp;&nbsp;oder neu&nbsp;&nbsp;&nbsp;<input name="ma[ntel][]" type="text" size="20" maxlength="20" value="<?php echo $ma['ntel'][0]; ?>" />
+            &nbsp;&nbsp;&nbsp;Priorit&auml;t&nbsp;&nbsp;&nbsp;<select name="ma[so][]" size="1">
+            <?php
+            $select = ($ma["so"][0] == '-1')? " selected='selected'" : "";
+            echo "<option$select value=-1></option>\n";
+            for ($i=1; $i<10; $i++)
+            {
+                $select=($ma["so"][0] == $i)? " selected='selected'" : "";
+                echo "<option$select value=$i>$i</option>\n";
+            }
+            ?>
+            </select>
+            &nbsp;&nbsp;&nbsp;&ouml;ffentlich&nbsp;&nbsp;&nbsp;<input name="ma[pub][]" type="checkbox" value="1" <?php if ($ma['pub'][0]) echo "checked"; ?> />
+            &nbsp;&nbsp;&nbsp;<a href="<?php echo "javascript:addInput('addtel');" ?>" title="weitere Telefon-Nr."><img src="/fhiiqm/img/add.png" /></a>
+            &nbsp;&nbsp;&nbsp;<a href="<?php echo "javascript:delInput('addtel');" ?>" title="l&ouml;schen letzte Telefon-Nr."><img src="/fhiiqm/img/delete.png" /></a><br />
+            <?php
+                if (isset($ma) && (!$ok || $sub))
+                {
+                    if (count($ma['ntel'])>1 || count($ma['tel'])>1)
+                    {
+                        $i=0;
+                        foreach ($ma['tel'] as $atel)
+                        {
+                            if ($i>0)
+                            {
+                                echo "<span></span><select name=\"ma[tel][]\" size=\"1\">";
+                
+                                $select = ( "-1" == $atel ) ? ' selected' : null;
+                                echo "<option $select value=\"-1\"></option>\n";
+                                foreach ($result as $row)
+                                {
+                                    if ($row->telefon_typ == "fax") $teln = $row->telefon_nr." FAX"; else $teln = $row->telefon_nr;
+//                                    if ($row->raum_nr) $telr = "[". $row->geb_ID. " ". $row->raum_nr . "]"; else $telr = "";
+                                    $select = ( $row->telefon_nr == $atel ) ? ' selected' : null;
+                					echo "<option $select value=\"$row->telefon_nr\">$teln</option>\n";
+                                }
+                                echo "</select>";
+                                echo "&nbsp;&nbsp;&nbsp;&nbsp;oder neu&nbsp;&nbsp;&nbsp;<input name=\"ma[ntel][]\" type=\"text\" size=\"20\" maxlength=\"20\" value=\"".$ma['ntel'][$i]."\" />";
+                                echo "&nbsp;&nbsp;&nbsp;&nbsp;Priorit&auml;t&nbsp;&nbsp;&nbsp;<select name=\"ma[so][]\" size=\"1\">";
+                
+                                $select = ( $ma["so"][$i] == "-1" ) ? " selected='selected'" : "";
+                                echo "<option$select value=\"-1\"></option>\n";
+                                for ($j=1; $j<10; $j++)
+                                {
+                                    $select=($ma["so"][$i] == $j)? " selected='selected'" : "";
+                                    echo "<option$select value=$j>$j</option>\n";
+                                }
+                                echo "</select>\n";
+                                echo "&nbsp;&nbsp;&nbsp;&ouml;ffentlich&nbsp;&nbsp;&nbsp;<input name=\"ma[pub][$i]\" type=\"checkbox\" value=\"1\""; 
+                                $check = ($ma['pub'][$i]) ? " checked='checked'" : "" ;
+                                echo "$check /><br />\n";
+                            }
+                            $i++;
+                        }
+                    }
+                }
+        ?>
+        </div>
+        </td>   
+    </tr>
+    <?php if ($ma["fhi"]) {   ?>   
+	<tr>
+	   <td>E-Mail</td>
+	   <td><input name="ma[email]" id="email" type="text" size="30" maxlength="100" value="<?php echo $ma['email']; ?>" /></td>
+    </tr>
+    <?php } ?>
+    <tr><td>Abteilung *</td>
+        <td valign="top"><div id="addabt">
+             <select name="ma[abt][]" onchange="this.form.submit();">
+            <?php 
+                $sql = "SELECT abt_ID, abt_name, abt_long FROM `fhiiqm`.`Abteilung` ORDER BY abt_ID+0";
+                if ($result = $dbc->queryObjectArray($sql))
+                {
+                    foreach ($result as $row)
+                    {
+                        if ($row->abt_ID == $ma['abt'][0])
+    					   echo "<option selected value=\"$row->abt_ID\">$row->abt_name: $row->abt_long</option>\n";
+    				    else
+    					   echo "<option value=\"$row->abt_ID\">$row->abt_name: $row->abt_long</option>\n";
+                        $abt .= "'".$row->abt_ID. "':'" . $row->abt_name .": ". $row->abt_long . "',";
+                    }
+                    $abt = substr($abt,0,strlen($abt)-1);
+                }
+            ?>
+            </select>
+        &nbsp;&nbsp;&nbsp;   
+        Arbeitsgruppe&nbsp;&nbsp;&nbsp;
+             <select name="ma[rag][]">
+            <?php 
+                if ($ma['rag'] == -1) $select = " selected "; else $select = "";
+                echo "<option $select value=\"-1\"></option>\n";
+                $sql = "SELECT rag_ID, rag_bez FROM `fhiiqm`.`RaumArb_Gruppe` WHERE abt_ID = " .$ma["abt"][0] . " ORDER BY rag_bez";
+                if ($resrag = $dbc->queryObjectArray($sql))
+                {
+                    foreach ($resrag as $row)
+                    {
+                        if ($row->rag_ID == $ma['rag'][0])
+    					   echo "<option selected value=\"$row->rag_ID\">$row->rag_bez</option>\n";
+    				    else
+    					   echo "<option value=\"$row->rag_ID\">$row->rag_bez</option>\n";
+//                        $rag .= "'".$row->rag_ID. "':'" . $row->rag_bez . "',";
+                    }
+//                    $rag = substr($rag,0,strlen($rag)-1);
+                }
+                $sql = "SELECT rag_ID, rag_bez, abt_name FROM RaumArb_Gruppe g INNER JOIN Abteilung a 
+                        ON g.abt_ID = a.abt_ID ORDER BY g.abt_ID,rag_ID";
+                if ($res = $dbc->queryObjectArray($sql))
+                {
+                    foreach ($res as $row)
+                        $rag .= "'".$row->rag_ID. "':'" . $row->abt_name . ": ". $row->rag_bez . "',";
+                    $rag = substr($rag,0,strlen($rag)-1);
+                }
+            ?>
+            </select>
+            <script type="text/javascript">
+            <!--
+                arra = {<?php echo ($abt); ?>}; // Ergebnis: {key:'value',key:'value',...} 
+                arrg = {<?php echo ($rag); ?>}; // Ergebnis: {key:'value',key:'value',...} 
+            //-->
+            </script>
+            &nbsp;&nbsp;&nbsp;<a href="<?php echo "javascript:addInput('addabt');" ?>" title="weitere Arbeitsgruppe"><img src="/fhiiqm/img/add.png" /></a>
+            &nbsp;&nbsp;&nbsp;<a href="<?php echo "javascript:delInput('addabt');" ?>" title="l&ouml;schen letzte Arbeitsgruppe"><img src="/fhiiqm/img/delete.png" /></a><br />
+            <?php
+                if (isset($ma) && (!$ok || $sub))
+                {
+                    if (count($ma['abt'])>1 || count($ma['rag'])>1)
+                    {
+                        $i=0;
+                        foreach ($ma['abt'] as $eabt)
+                        {
+                            if ($i>0)
+                            {
+                                echo "<span></span><select name=\"ma[abt][]\" size=\"1\">";
+                
+                                foreach ($result as $row)
+                                {
+                                    $select = ( $row->abt_ID == $eabt ) ? ' selected' : null;
+                					echo "<option $select value=\"$row->abt_ID\">$row->abt_name: $row->abt_long</option>\n";
+                                }
+                                echo "</select>";
+                                echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Arbeitsgruppe&nbsp;&nbsp;&nbsp;&nbsp;";
+                                echo "<select name='ma[rag][]' size=1>";
+                                $select = ( $ma["rag"][$i] == "-1" ) ? " selected='selected'" : "";
+                                echo "<option$select value=\"-1\"></option>\n";
+                                foreach ($res as $row)
+                                {
+                                    $select = ( $row->rag_ID == $ma['rag'][$i] ) ? ' selected' : null;
+                					echo "<option $select value=\"$row->rag_ID\">$row->abt_name: $row->rag_bez</option>\n";
+                                }
+                                echo "</select><br />";
+                            }
+                            $i++;
+                        }
+                    }
+                }
+            ?>
+            </div>
+        </td>   
+    </tr>
+<?php
+                if ($ma["tstmp"] && $ma["tstmp"]>0)
+                {
+                    echo "<tr><td>letzte &Auml;nderung</td>";
+                    $ts = new DateTime($ma["tstmp"]);    
+                    echo "<td>".$ts->format('d.m.Y H:i:s');   
+                }
+                if (isset($ma["uid"]) && $ma["uid"]) 
+                    echo "&nbsp;&nbsp;&nbsp;(".$ma["uid"] .")";
+                echo "</td></tr>\n"; 
+?>
+            <input type="hidden" name="ma[abtm]" value="<?php echo $ma['abtm']; ?>" />
+            <input type="hidden" name="okn" value="<?php echo $okn; ?>" />
+<!--
+</table>
+ </div>   
+</form>       
+-->
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/deprecated/ma_tel_og_ed.php	Fri Dec 20 15:19:32 2013 +0100
@@ -0,0 +1,429 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 12/2012
+ * 
+ * INSERT/UPDATE/(DELETE) Mitarbeiter
+ * 
+ */
+
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    session_start();
+    if (! isset($_SESSION["userid"]))
+    { 
+        include_once ("inc/func_lib.inc.php");	
+        login($_SERVER["PHP_SELF"]);
+        exit;
+    }
+    
+    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("mtr",$_SESSION["recht"]) && !in_array("mte",$_SESSION["recht"])))
+    {
+        header("Location: start.php");
+        exit;
+    }    
+
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+
+    $sub = $_POST["eintragen"];
+    $del = $_POST["del"];
+    $ma  = $_POST["ma"];
+    $okn = $_POST["okn"];
+    $ok  = $_POST["ok"];
+    if (!$okn) $ok=0;
+    $pid = $_GET["i"]; // persknr
+
+	$sort   = $_GET["s"];   // Sortierung nach Spalte
+    $dir    = $_GET["d"];   // Sortierrichtung
+    $fnum   = $_GET["f"];   // Spaltennummer, nach der aktuell gefiltert wird
+    $filter =  $_GET["b"];  // Filterbegriff 
+    $getp = "&s=$sort&d=$dir&f=$fnum&b=$filter"; // Parameter Listenanzeige
+    
+//    print_r ($ma); echo "<br />sub = $sub<br /><br />"; 
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/> 
+   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/> 
+    <link type="text/css" href="/fhiiqm/css/jquery/ui-lightness-1.8.21/jquery-ui-1.8.21.custom.css" rel="Stylesheet" />	
+    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-1.7.2.min.js"></script>
+    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-ui-1.8.21.custom.min.js"></script>
+	<title>MA/O bearbeiten</title>
+
+    <script type="text/javascript">
+    <!--
+    var counter = 0;
+    var limit = 99;
+    var arr = new Array();
+    var arra = new Array();
+    var arrg = new Array();
+    function addInput(divName){
+         if (counter == limit)  {
+              alert("Das Limit von " + counter + " zusätzlichen inputs ist erreicht");
+         }
+         else 
+         {
+            if (divName == 'addtel')
+            {            
+              var newdiv = document.createElement('div');
+              var opt="<option value='-1'></option>";
+              var i;
+              for (var key in arr)  
+              {
+                opt = opt.concat("<option value='",key,"'>",arr[key],"</option>\n" );
+              }
+              opt += "</select>\n";
+              newdiv.innerHTML = "<span></span><select name='ma[tel][]'>"+opt;
+              newdiv.innerHTML += "&nbsp;&nbsp;&nbsp;oder neu&nbsp;&nbsp;&nbsp;<input type='text' name='ma[ntel][]' size='20' maxlength='20' />";
+              opt = "<option value='-1'></option>";
+              for (i=1; i<10; i++)
+              {
+                opt = opt.concat("<option value=",i,">",i,"</option>\n");
+              }
+              opt += "</select>\n";
+              newdiv.innerHTML += "&nbsp;&nbsp;&nbsp;&nbsp;Priorit&auml;t&nbsp;&nbsp;&nbsp;<select name='ma[so][]'>"+opt;
+              newdiv.innerHTML += "&nbsp;&nbsp;&nbsp;&ouml;ffentlich&nbsp;&nbsp;&nbsp;<input type='checkbox' name='ma[pub][" + (counter+1) + "]' value='1' />\n";
+              document.getElementById(divName).appendChild(newdiv);
+              counter++;
+            }
+            else
+            {
+              var newdiv = document.createElement('div');
+              var opt="";
+              var optg="<option value='-1'></option>";
+              for (var key in arra)  
+              {
+                opt = opt.concat("<option value='",key,"'>",arra[key],"</option>\n" );
+              }
+              opt += "</select>\n";
+              newdiv.innerHTML = "<span></span><select name='ma[abt][]'>"+opt;
+              for (var key in arrg)  
+              {
+                optg = optg.concat("<option value='",key,"'>",arrg[key],"</option>\n" );
+              }
+              optg += "</select>\n";
+              newdiv.innerHTML += "&nbsp;&nbsp;&nbsp;&nbsp;Arbeitsgruppe&nbsp;&nbsp;&nbsp;&nbsp;<select name='ma[rag][]'>"+optg;                
+              document.getElementById(divName).appendChild(newdiv);
+              counter++;
+            }  
+         }
+    }
+    function delInput(divId){
+            var kn = document.getElementById(divId); 
+            while (kn.childNodes.length>0 && kn.lastChild.nodeName != "SPAN" && kn.lastChild.nodeName != "A")
+            {
+//                alert ("vor "+kn.lastChild.nodeName+", nodetyp = "+ kn.lastChild.nodeType);
+                var knc = kn.lastChild;
+                    document.getElementById(divId).removeChild(knc);
+            }
+//            if (kn.lastChild.nodeName == "SELECT") document.getElementById(divId).removeChild(kn.lastChild);
+            if (kn.lastChild.nodeName == "SPAN") document.getElementById(divId).removeChild(kn.lastChild);
+    }
+    //-->
+    </script>
+
+</head>
+
+<body>
+    <script type="text/javascript">
+    <!--
+      $(document).ready(function() {
+        $("#fhi").focus();
+        $("#nname").autocomplete({
+                source: "/fhiiqm/inc/ma_ldap_ac.inc.php",
+    			minLength: 2,
+                select: function(event,ui){// $("#nname").val(ui.item.id);
+                                           $("#vname").val(ui.item.id2); 
+                                           $("#email").val(ui.item.id3); }
+    		});
+        });
+    //-->
+    </script>
+
+<?php
+    echo "&nbsp;";  
+    echo "<div class=\"float-br smaller\" valign='top'>";
+    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+    echo "<div class=\"float-r\"><img src=\"img/group.png\" border=\"0\" alt=\"Mitarbeiter bearbeiten\" title=\"Mitarbeiter bearbeiten\"/></div>\n";
+
+    if ($pid) $text = "editieren"; else $text = "erfassen";
+    echo "<div align=\"center\">";
+    echo "<h3>Mitarbeiter/Objekte $text</h3>";
+    echo "</div>\n";
+    if ((!$sub && !$del) || !isset($ma) || !$ok) 
+    {
+        
+        if ($pid && (!$sub || !$del) && !isset($ma))
+        {
+            $sql = "SELECT nachname,vorname,titel,abt_tel,email,aktiv,timestamp,userid FROM Mitarbeiter WHERE persknr=$pid";
+            if ($result = $dbc -> queryObjectArray($sql))
+            {
+                foreach ($result as $row)
+                {
+                    $ma['name']     = $row->nachname;
+                    $ma['vname']    = $row->vorname;
+                    $ma['titel']    = $row->titel;
+                    $ma['abtm']     = $row->abt_tel;
+                    $ma['email']    = $row->email;
+                    $ma['fhi']      = ($row->aktiv == 1)? 1 : 0;
+                    $ma["tstmp"]    = $row->timestamp;
+                    $ma["uid"]      = $row->userid;
+                }    
+            }
+            // Arbeitsgruppe, Abteilung
+            $sql = "SELECT mr.rag_ID, abt_ID FROM fhiiqm.MA_RaumArbGruppe mr INNER JOIN RaumArb_Gruppe r ON mr.rag_ID=r.rag_ID 
+                    WHERE  persknr=$pid";
+            if ($result = $dbc -> queryObjectArray($sql))
+            {
+                foreach ($result as $row)
+                {
+                   $ma['abt'][] = $row->abt_ID;  
+                   $ma['rag'][] = $row->rag_ID;  
+                }
+            }
+            if (count($ma['abt']) == 0) $ma['abt'][] = $ma['abtm']; 
+            // Haus,Raum
+            $sql = "SELECT ma.raum_ID, geb_ID FROM Mitarbeiter_Raum ma INNER JOIN Raum r ON ma.raum_ID=r.raum_ID 
+                    WHERE persknr=$pid ORDER BY raum_ID"; 
+            if ($result = $dbc -> queryObjectArray($sql))
+            {
+                foreach ($result as $row)
+                {
+                   $ma['geb'] = $row->geb_ID;  
+                   $ma['raum'] = $row->raum_ID;  
+                }
+            }
+            // Telefon
+            $sql = "SELECT m.telefon_nr,public,sort
+                    FROM fhiiqm.MA_Telefon m INNER JOIN Telefon t ON m.telefon_nr=t.telefon_nr 
+                    WHERE persknr = $pid ORDER BY IFNULL(sort,99)" ;
+            if ($result = $dbc -> queryObjectArray($sql))
+            {
+                foreach ($result as $row)
+                {
+                    $ma['tel'][] = $row->telefon_nr;
+                    $ma['pub'][] = ($row->public)? 1 : 0;
+                    $ma['so'][]  = $row->sort;   
+                }
+            }
+        }
+        include ($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/form/ma_ed_form.inc.php");
+        
+	  	if ($sub || $del)
+        {
+		  	if ($sub)
+                $frage = "Alle Angaben ok?";
+            elseif ($del)
+                $frage = "Mitarbeiter wirklich l&ouml;schen?";
+			echo "<tr>
+			  <td class=\"red\" valign=\"top\" align=\"left\">$frage</td>
+			        <td><input type=\"checkbox\" name=\"ok\" value=\"1\"";
+			        if ($ok)  echo "checked=\"checked\""; 
+			echo " /></td>\n</tr>\n";
+        }
+        if (!is_null($_SESSION["recht"]) && in_array("mte",$_SESSION["recht"]))
+        {
+            echo "
+           	<tr><td>&nbsp;</td>\n
+            	<td><input  class=\"button\" type=\"submit\" name=\"eintragen\" value=\"  eintragen  \" />";
+            if ($pid)
+            {
+                echo "&nbsp;&nbsp;&nbsp;<input class=\"buttonr\" type=\"submit\" value=\"l&ouml;schen\" name=\"del\" title=\"delete\" />";
+//                echo "&nbsp;&nbsp;&nbsp;<input class=\"button\" type=\"submit\" value=\"duplizieren\" name=\"dup\" title=\"delete\" />";
+            }    
+           	echo "</td></tr>\n";
+        }
+        echo "</table>\n";
+        echo "</div>\n";
+    echo "<p class='sc'>&nbsp;&nbsp;&nbsp;<a href=\"ma_tel_flist.php?e=1$getp\" target=\"_self\" title=\"Telefon-Liste\">&laquo; zur Telefon-Liste</a></p>\n"; 
+    echo "</form>\n";
+    }
+    else
+    {
+        echo "<div align='center'>\n";
+        $userid = $_SESSION["userid"];
+        if ($del)
+        {   
+            if ($ma["fhi"])
+            {
+                // nur aktiv auf 0 setzen
+                $sql = "UPDATE Mitarbeiter SET aktiv=0, userid='$userid' WHERE persknr = $pid";
+                $retdi = $dbc -> execute($sql);
+                $sql = "DELETE FROM Mitarbeiter_Raum WHERE persknr = $pid";
+                $retdi = $dbc -> execute($sql);
+                $sql = "DELETE FROM MA_Telefon WHERE persknr = $pid";
+                $retdi = $dbc -> execute($sql);
+                $sql = "DELETE FROM MA_RaumArbGruppe WHERE persknr = $pid";
+                $retdi = $dbc -> execute($sql);
+            }
+            else
+            {
+                $sql = "DELETE FROM Mitarbeiter WHERE persknr = $pid";
+                $retdi = $dbc -> execute($sql);
+            }
+            if ($retdi)
+            {
+                echo "<p class='green'><b>DELETE: Daten  zu '".$ma["name"]. ", ". $ma['vname'] ."' wurden erfolgreich gel&ouml;scht.</b></p>\n";
+            }                
+            else
+            {
+                echo "<p class='red'><b>DELETE: Daten  zu '".$ma["name"]. ", ". $ma['vname'] ."' konnten nicht gel&ouml;scht werden!</b></p>\n";
+                echo "sql = $sql<br />";
+                echo "error DELETE: " . $dbc->error . "<br />";
+            }
+            include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/ma_tel_dat_show.inc.php");
+        }
+        else //INSERT oder UPDATE
+        {
+            $stmt = $dbc -> stmtinit();
+            if (is_object($stmt))
+            {
+                if ($ma['fhi']) $aktiv = 1; else $aktiv = 2;
+                if ($ma['email'])
+                {
+                    if (strpos($ma['email'],"@") > 0) $ma['email'] = $ma['email']; else $ma['email'] = $ma['email'] . "@fhi-berlin.mpg.de";
+                } 
+                foreach ($ma as &$elem) if (!$elem) $elem = null;  // NULL-Eintrag in Leerfelder  
+                if ($pid) //UPDATE
+                {
+                    // Abt. alt in aktualisierten Abteilungen?
+                    if (!in_array($ma['abtm'],$ma['abt'])) $ma['abtm'] = $ma['abt'][0];
+                    $stmt -> prepare("UPDATE Mitarbeiter SET 
+                                        nachname = ?,
+                                        vorname = ?,
+                                        titel = ?,
+                                        email = ?,
+                                        abt_tel = ?,
+                                        aktiv = ?,
+                                        userid = ?
+                                        WHERE persknr = $pid");
+                    $stmt -> bind_param('ssssiis',$ma['name'],$ma['vname'],$ma['titel'],$ma['email'],$ma['abtm'], $aktiv, $userid);
+//                    echo "UPDATE: ". var_dump($stmt);
+                    $result = $stmt -> execute();
+                    if ($stmt->error) echo "error UPDATE Mitarbeiter: " . $stmt->error . "<br><br>\n";
+                }
+                else
+                {
+                    $sql = "SELECT MAX(persknr) FROM Mitarbeiter WHERE persknr < 9500";
+                    $pid = $dbc -> querySingleItem($sql) + 1;
+                    $stmt -> prepare ("INSERT INTO Mitarbeiter (persknr, nachname, vorname, titel,email,abt_tel,aktiv,userid) VALUES (?,?,?,?,?,?,?,?)"); 
+                    $stmt -> bind_param('issssiis',$pid,$ma['name'],$ma['vname'],$ma['titel'],$ma['email'],$ma['abt'][0], $aktiv, $userid);
+                    $result = $stmt -> execute();
+                    if ($stmt->error) echo "error INSERT Mitarbeiter: " . $stmt->error . "<br><br>\n";
+                    $ma['abtm'] = $ma['abt'][0];
+                }
+                if ($result)
+                {
+                    $ret = 1;
+                    // raum
+                    if ($ma["raum"] > "-1")
+                    {
+                        $sql = "DELETE FROM Mitarbeiter_Raum WHERE persknr=$pid";
+                        $redr = $dbc -> execute($sql);
+                        if ($redr)
+                        {
+                            $sql = "INSERT INTO Mitarbeiter_Raum (persknr, raum_ID) VALUES ($pid, " . $ma["raum"] . ")";
+                            $ret = $dbc -> execute($sql);
+                        } 
+                    }
+                    if (is_array($ma["rag"]) && count($ma["rag"])>0)
+                    {
+                        $sql = "DELETE FROM MA_RaumArbGruppe WHERE persknr=$pid";
+                        $redr = $dbc -> execute($sql);
+                        if ($redr)
+                        {
+                            foreach ($ma['rag'] as $rag)
+                            {
+                                if ($rag > 0)
+                                {
+                                    $sql = "INSERT INTO MA_RaumArbGruppe (persknr, rag_ID) VALUES ($pid, $rag)";
+                                    $retn = $dbc -> execute($sql);
+                                    if ($retn && $ret) $ret = 1; else $ret = 0;
+                                }
+                            }    
+                        } 
+                    }
+                    if (is_array($ma['ntel']))
+                    {
+                        foreach ($ma['ntel'] as $tel)
+                        {
+                            if ($tel > "!")
+                            {
+                                $sql = "SELECT COUNT(*) FROM Telefon WHERE telefon_nr ='$tel'";
+                                $anz = $dbc -> querySingleItem($sql);
+                                if ( $anz == 0)
+                                {
+                                    $sql = "INSERT INTO Telefon (telefon_nr) VALUES('$tel')";
+                                    $rest = $dbc -> execute($sql);
+                                    if ($rest && $ret) $ret = 1; else $ret = 0;
+                                }
+                            }    
+                        }
+                    }
+                    if ($ret)
+                    {
+                        foreach ($ma['so'] as &$prio)
+                            if ($prio == '-1') $prio = null; 
+                        $sql = "DELETE FROM MA_Telefon WHERE persknr = $pid";
+                        $redmt = $dbc -> execute($sql);
+                        if ($redmt)
+                        {
+                            $i=0;        
+                            foreach ($ma['tel'] as $tel)
+                            {
+                                if ($tel >"!" && $tel != "-1")
+                                {
+                                    if (!isset($ma['pub'][$i])) $ma['pub'][$i] = 'NULL';
+                                    if (!isset($ma['so'][$i])) $ma['so'][$i] = 'NULL';
+                                    $sql = "INSERT INTO MA_Telefon (persknr, telefon_nr, public, sort) VALUES ($pid,'$tel'," . $ma['pub'][$i] . ",". $ma['so'][$i] . ")";
+                                    $rest = $dbc -> execute($sql);
+                                    if ($rest && $ret) $ret = 1; else $ret = 0;
+                                }
+                                $i++;
+                            }
+                            $i=0;        
+                            foreach ($ma['ntel'] as $tel)
+                            {
+                                if ($tel >"!")
+                                {
+                                    if (!isset($ma['pub'][$i])) $ma['pub'][$i] = 'NULL';
+                                    if (!isset($ma['so'][$i])) $ma['so'][$i] = 'NULL';
+                                    $sql = "INSERT INTO MA_Telefon (persknr, telefon_nr, public, sort) VALUES ($pid,'$tel'," . $ma['pub'][$i] . ",". $ma['so'][$i] . ")";
+                                    $rest = $dbc -> execute($sql);
+                                    if ($rest && $ret) $ret = 1; else $ret = 0;
+                                }
+                                $i++;
+                            }
+                        }
+                    }
+                }
+            }
+            if ($result && $redmt && $ret) // INSERT/UPDATE Info
+            {
+                //Eingabe Daten erfolgreich 
+                    echo "<p class='green'><b>Mitarbeiterdaten zu " . $ma['name']. ", ". $ma['vname'] . " wurden erfolgreich gespeichert.</b></p>\n";
+                    echo "<br /><br />\n";
+            }
+            else
+            {
+                    echo "<p class='red'><b>Mitarbeiterdaten zu " . $ma['name']. ", ". $ma['vname'] . " wurden nicht oder nur teilweise gespeichert.</b></p>\n";
+                    echo "error: ". $dbc -> error;    
+                    echo "<br /><br />\n";                
+            }
+            include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/ma_tel_dat_show.inc.php");
+        }
+        echo "</div>";
+        echo "<p class='sc'>&nbsp;&nbsp;&nbsp;<a href=\"ma_tel_flist.php?e=1$getp\" target=\"_self\" title=\"Telefonliste\">&laquo; zur Telefon-Liste</a></p>\n"; 
+        echo "<p class='sc'>&nbsp;&nbsp;&nbsp;<a href=\"".$_SERVER["PHP_SELF"]."\" target=\"_self\" title=\"Mitarbeiter erfassen\">Neuen Mitarbeiter erfassen</a></p>\n";    
+    }
+?>
+</body>
+</html>
\ No newline at end of file
Binary file fhiiqm/img/Thumbs.db has changed
--- a/fhiiqm/inc/func_lib.inc.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/inc/func_lib.inc.php	Fri Dec 20 15:19:32 2013 +0100
@@ -273,7 +273,7 @@
                     if ($ldapbind = @ldap_bind($ldapconn, $ldaprdn, $ldappwd))
                     {
                         ldap_close($ldapconn);
-                        $_SESSION = array();
+                        if (!isset($_SESSION['user'])) $_SESSION = array();  // zerstoert alle Session-Variablen,wenn keine Anmeldung an apartvw
                         $_SESSION["userid"] = $userid;
 
                         // Recht
@@ -600,33 +600,53 @@
             $base="ou=people,dc=ppb,dc=rz-berlin,dc=mpg,dc=de";
             $su = array("ä","ö","ü","ß","Ä","Ö","Ü");
             $rp = array("ae","oe","ue","ss","Ae","Oe","Ue");
-            $afields = array ("uid");
-            $filter = "(cn=" . $gn . " " . $sn .")"; 
-            $search=@ldap_search($ldapconn,$base,$filter,$afields);
+            $afields = array ("uid","cn","mail");
+            $gnr = str_replace($su,$rp,$gn);
+            $snr = str_replace($su,$rp,$sn); 
+            $gnu = utf8_encode($gn);
+            $snu = utf8_encode($sn);
             if (!ldap_count_entries($ldapconn,$search))
             {
-                $gnr = str_replace($su,$rp,$gn);
-                $snr = str_replace($su,$rp,$sn); 
-                $filter = "(cn=" . $gnr . " " . $snr .")"; 
+                if ($gn && $sn)
+                    $filter = "(|(&(sn=$sn*)(givenName=$gn*))(mail=$gn*)(mail=$sn*))";
+                if ($sn && !$gn)
+                    $filter = "(|(&(sn=$sn*)(givenName=$gn*))(mail=$sn*))";
+                if (!$sn && $gn)
+                    $filter = "(|(&(sn=$sn*)(givenName=$gn*))(mail=$gn*))";
                 $search=@ldap_search($ldapconn,$base,$filter,$afields);
             }
             if (!ldap_count_entries($ldapconn,$search))
-
             {
-                $gn = utf8_encode($gn);
-                $sn = utf8_encode($sn);    
-                $filter = "(cn=" . $gn . " " . $sn .")"; 
+                if ($gn && $sn)
+                    $filter = "(|(&(sn=$snr*)(givenName=$gnr*))(mail=$gnr*)(mail=$snr*))";
+                if ($sn && !$gn)
+                    $filter = "(|(&(sn=$snr*)(givenName=$gnr*))(mail=$snr*))";
+                if (!$sn && $gn)
+                    $filter = "(|(&(sn=$snr*)(givenName=$gnr*))(mail=$gnr*))";
+                $search=@ldap_search($ldapconn,$base,$filter,$afields);
+            }
+            if (!ldap_count_entries($ldapconn,$search))
+            {
+                if ($gn && $sn)
+                    $filter = "(|(&(sn=$snu*)(givenName=$gnu*))(mail=$gnu*)(mail=$snu*))";
+                if ($sn && !$gn)
+                    $filter = "(|(&(sn=$snu*)(givenName=$gnu*))(mail=$snu*))";
+                if (!$sn && $gn)
+                    $filter = "(|(&(sn=$snu*)(givenName=$gnu*))(mail=$gnu*))";
                 $search=@ldap_search($ldapconn,$base,$filter,$afields);
             }
             if (ldap_count_entries($ldapconn,$search))
             {
                 $info = ldap_get_entries($ldapconn, $search);
-                for ($i=0; $i<$info["count"]; $i++) 
-                    $uid = $info[$i]["uid"][0];
+                for ($i=0; $i<$info["count"]; $i++)
+                { 
+                    $inf[$i][0] = $info[$i]["uid"][0];
+                    $inf[$i][1] = $info[$i]["cn"][0];
+                    $inf[$i][2] = $info[$i]["mail"][0];
+                }    
             }
-            echo "&nbsp;&nbsp;&nbsp;$filter<br />";
-            if (isset($uid) && $uid) return $uid;
-            else return null;
+//            echo "&nbsp;&nbsp;&nbsp;$filter<br />";
+            return $inf;
         }
     }
 ?>
\ No newline at end of file
--- a/fhiiqm/inc/ma_list_ac.inc.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/inc/ma_list_ac.inc.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,42 +1,50 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 09/2011
- *
- * Autocomplete Mitarbeitersuche
- */
-
-    header('Content-type: text/html; charset="iso-8859-1',true); //wg. jquery ui autocomplete
-    error_reporting(E_ALL ^ E_NOTICE);
-    
-    $q = strtolower(utf8_decode($_GET["term"])); // wird in jquery in 'term' uebergeben, term UTF-8 codiert
-
-    $abt = $_GET["s"]; // Sortierung zuerst nach Abteilung (laser)
-    
-	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
-	$dbc = new dbconnection();
-    // label = angezeigter ListenWert, val = Wert im Eingabefeld nach Klick
-/*    $sql = "SELECT  CONCAT (nachname, ', ',vorname, ' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as label, 
-            CONCAT (nachname, ', ',vorname, ' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as val,persknr as id 
-            FROM fhiiqm.Mitarbeiter
-            WHERE nachname LIKE '%".$q."%' COLLATE latin1_general_ci 
-            ORDER BY 1";
-*/
-    if (isset($abt) && $abt == "a") $ord = "abt_ID, "; else $ord = "";
-    $sql = "SELECT CONCAT (nachname, ', ',IFNULL(vorname,''), ', ' , IFNULL(abt_name,''),' (',CASE aktiv WHEN 0 THEN 'inaktiv' ELSE 'aktiv' END, ')') as label, 
-            CONCAT (nachname, ', ',vorname, ', ' , IFNULL(abt_name,''), ' (',CASE aktiv WHEN 0 THEN 'inaktiv' ELSE 'aktiv' END, ')') as val,persknr as id 
-            FROM fhiiqm.Mitarbeiter m LEFT OUTER JOIN fhiiqm.Abteilung a ON m.abt_tel=a.abt_ID
-            WHERE aktiv < 2 AND nachname LIKE '%".$q."%' COLLATE latin1_general_ci 
-            ORDER BY ". $ord ."1";
-    $result = $dbc ->queryObjectArray($sql);
-    if ($result)
-    {
-        foreach ($result as $row)
-        {
- 			$clist[] = "{\"label\": \"" . $row->label . "\",\"value\": \"" . $row->val . "\",\"id\": " . $row->id . "}";
-		}
-        echo "[" . implode(", ", $clist) . "]"; // Format, das jquery source erwartet
-    }
-    $dbc -> close();
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 09/2011
+ * 
+ * 17.12.2013 aktiv in Mitarbeiter
+ *  -1 -> Gast
+ *   0 -> inaktiv
+ *   1 -> aktiv
+ *   2 -> Objekt
+ *
+ * Autocomplete Mitarbeitersuche
+ */
+
+    header('Content-type: text/html; charset="iso-8859-1',true); //wg. jquery ui autocomplete
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    $q = strtolower(utf8_decode($_GET["term"])); // wird in jquery in 'term' uebergeben, term UTF-8 codiert
+
+    $abt = $_GET["s"]; // Sortierung zuerst nach Abteilung (laser)
+    $gast = $_GET["g"]; // Gaeste zulassen
+    
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+	$dbc = new dbconnection();
+    // label = angezeigter ListenWert, val = Wert im Eingabefeld nach Klick
+/*    $sql = "SELECT  CONCAT (nachname, ', ',vorname, ' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as label, 
+            CONCAT (nachname, ', ',vorname, ' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE 'inaktiv' END, ')') as val,persknr as id 
+            FROM fhiiqm.Mitarbeiter
+            WHERE nachname LIKE '%".$q."%' COLLATE latin1_general_ci 
+            ORDER BY 1";
+*/
+    if (isset($abt) && $abt == "a") $ord = "abt_ID, "; else $ord = "";
+    if (isset($gast) && $gast) $aktiv = ""; else $aktiv = "aktiv>=0 AND ";    
+    $sql = "SELECT CONCAT (nachname, IF (vorname>'',CONCAT(', ',vorname), ''), ', ' , IFNULL(abt_name,''),' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE (CASE aktiv WHEN -1 THEN 'Gast' ELSE 'inaktiv' END) END, ')') as label, 
+            CONCAT (nachname, IF (vorname>'',CONCAT(', ',vorname), ''), ', ' , IFNULL(abt_name,''), ' (',CASE aktiv WHEN 1 THEN 'aktiv' ELSE (CASE aktiv WHEN -1 THEN 'Gast' ELSE 'inaktiv' END) END, ')') as val,persknr as id 
+            FROM fhiiqm.Mitarbeiter m LEFT OUTER JOIN fhiiqm.Abteilung a ON m.abt_tel=a.abt_ID
+            WHERE $aktiv aktiv<2 AND nachname LIKE '%".$q."%' COLLATE latin1_general_ci 
+            ORDER BY ". $ord ."1";
+    $result = $dbc ->queryObjectArray($sql);
+    if ($result)
+    {
+        foreach ($result as $row)
+        {
+ 			$clist[] = "{\"label\": \"" . $row->label . "\",\"value\": \"" . $row->val . "\",\"id\": " . $row->id . "}";
+		}
+        echo "[" . implode(", ", $clist) . "]"; // Format, das jquery source erwartet
+    }
+    $dbc -> close();
 ?>
\ No newline at end of file
--- a/fhiiqm/inc/ma_tel_dat_show.inc.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/inc/ma_tel_dat_show.inc.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,74 +1,74 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 11/2012
- * 
- * Anlisten INSERT/UPDATE Daten Mitarbeiter - Telefon
- */
-
-            echo "<table>\n";
-            echo "<tr><td>Name: </td><td>" . $ma["name"] . "</td></tr>\n";
-            echo "<tr><td>Vorname: </td><td>" . $ma["vname"] . "</td></tr>\n";
-            echo "<tr><td>Titel: </td><td>" . $ma["titel"] . "</td></tr>\n";
-            echo "<tr><td>E-Mail: </td><td>" . $ma["email"] . "</td></tr>\n";
-            if ($ma['abtm'])
-            {
-                $sql = "SELECT abt_name FROM Abteilung WHERE abt_ID = ".$ma['abtm'];
-                $abt = $dbc -> querySingleItem($sql);
-                echo "<tr><td>Abteilung: </td><td>$abt</td></tr>\n";
-            }
-            else
-                echo "<tr><td>Abteilung: </td><td>&nbst;</td></tr>\n";
-            // Arbeitsgruppe
-            if ($ma['rag'])
-            {
-                foreach ($ma['rag'] as $rag)
-                {
-                    $sql = "SELECT rag_bez, abt_name 
-                            FROM fhiiqm.RaumArb_Gruppe r INNER JOIN Abteilung a ON r.abt_ID=a.abt_ID
-                            WHERE rag_ID = $rag";
-                    if ($ragr = $dbc->queryObjectArray($sql))
-                    {
-                        foreach ($ragr as $row)
-                        echo "<tr><td>AG: </td><td>" . $row->rag_bez . " [". $row->abt_name . "]</td></tr>\n";
-                    }
-                }
-            }
-            $i=0;
-            foreach ($ma['tel'] as $tel)
-            {
-                if ($tel > "!" && $tel != "-1")
-                {
-                    $pub = ($ma["pub"][$i] == 'NULL')? "&nbsp;" : "[&ouml;ffentlich]";
-                    echo "<tr><td>Telefon: </td><td>$tel $pub</td></tr>\n";
-                }
-                $i++;
-            }
-            $i=0;
-            foreach ($ma['ntel'] as $tel)
-            {
-                if ($tel > "!")
-                {
-                    $pub = ($ma["pub"][$i] == 'NULL')? "&nbsp;" : "[&ouml;ffentlich]";
-                    echo "<tr><td>Telefon: </td><td>$tel $pub</td></tr>\n";
-                }
-                $i++;
-            }
-            if ($ma["raum"] > "-1")
-            {
-                $sql = "SELECT raum_nr, geb_ID FROM Raum WHERE raum_ID=" . $ma["raum"];
-                if ($res = $dbc -> queryObjectArray($sql))
-                {
-                    foreach ($res as $row)
-                    echo "<tr><td>Ort: </td><td>" . $row->geb_ID . "&nbsp;" . $row->raum_nr ."</td></tr>\n";
-                }
-                    
-            }
-            else
-                echo "<tr><td>Ort: </td><td>&nbsp;</td></tr>\n";
-            
-            $fhi = ($ma["fhi"])? "ja" : "&nbsp;"; 
-            echo "<tr><td>Mitarbeiter FHI: </td><td>$fhi</td></tr>\n";
-            echo "</table>\n";
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 11/2012
+ * 
+ * Anlisten INSERT/UPDATE Daten Mitarbeiter - Telefon
+ */
+
+            echo "<table>\n";
+            echo "<tr><td>Name: </td><td>" . $ma["name"] . "</td></tr>\n";
+            echo "<tr><td>Vorname: </td><td>" . $ma["vname"] . "</td></tr>\n";
+            echo "<tr><td>Titel: </td><td>" . $ma["titel"] . "</td></tr>\n";
+            echo "<tr><td>E-Mail: </td><td>" . $ma["email"] . "</td></tr>\n";
+            if ($ma['abtm'])
+            {
+                $sql = "SELECT abt_name FROM Abteilung WHERE abt_ID = ".$ma['abtm'];
+                $abt = $dbc -> querySingleItem($sql);
+                echo "<tr><td>Abteilung: </td><td>$abt</td></tr>\n";
+            }
+            else
+                echo "<tr><td>Abteilung: </td><td>&nbst;</td></tr>\n";
+            // Arbeitsgruppe
+            if ($ma['rag'])
+            {
+                foreach ($ma['rag'] as $rag)
+                {
+                    $sql = "SELECT rag_bez, abt_name 
+                            FROM fhiiqm.RaumArb_Gruppe r INNER JOIN Abteilung a ON r.abt_ID=a.abt_ID
+                            WHERE rag_ID = $rag";
+                    if ($ragr = $dbc->queryObjectArray($sql))
+                    {
+                        foreach ($ragr as $row)
+                        echo "<tr><td>AG: </td><td>" . $row->rag_bez . " [". $row->abt_name . "]</td></tr>\n";
+                    }
+                }
+            }
+            $i=0;
+            foreach ($ma['tel'] as $tel)
+            {
+                if ($tel > "!" && $tel != "-1")
+                {
+                    $pub = ($ma["pub"][$i] == 'NULL')? "&nbsp;" : "[&ouml;ffentlich]";
+                    echo "<tr><td>Telefon: </td><td>$tel $pub</td></tr>\n";
+                }
+                $i++;
+            }
+            $i=0;
+            foreach ($ma['ntel'] as $tel)
+            {
+                if ($tel > "!")
+                {
+                    $pub = ($ma["pub"][$i] == 'NULL')? "&nbsp;" : "[&ouml;ffentlich]";
+                    echo "<tr><td>Telefon: </td><td>$tel $pub</td></tr>\n";
+                }
+                $i++;
+            }
+            if ($ma["raum"] > "-1")
+            {
+                $sql = "SELECT raum_nr, geb_ID FROM Raum WHERE raum_ID=" . $ma["raum"];
+                if ($res = $dbc -> queryObjectArray($sql))
+                {
+                    foreach ($res as $row)
+                    echo "<tr><td>Ort: </td><td>" . $row->geb_ID . "&nbsp;" . $row->raum_nr ."</td></tr>\n";
+                }
+                    
+            }
+            else
+                echo "<tr><td>Ort: </td><td>&nbsp;</td></tr>\n";
+            
+            if ($ma["fhi"] == 1) $fhi = "ja"; elseif ($ma["fhi"] == -1) $fhi = "Gast"; else $fhi = "&nbsp;"; 
+            echo "<tr><td>Mitarbeiter FHI: </td><td>$fhi</td></tr>\n";
+            echo "</table>\n";
 ?>
\ No newline at end of file
--- a/fhiiqm/inc/menu.inc.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/inc/menu.inc.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,248 +1,250 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 09/2011
- * 
- * Menusteuerung mittels $_SESSION["recht"]
- */
-
-
-    if (is_array($_SESSION["recht"]))
-    {
-        foreach ($_SESSION["recht"] as $val)
-            $list .= ",'" .$val . "'";
-        $list = substr($list,1);
-        
-        include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
-    	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
-        $sql = "SELECT DISTINCT recht_group_ID FROM recht WHERE recht_ID IN ($list)";
-        if ($result = $dbc -> queryObjectArray($sql))
-        {
-            foreach ($result as $row)
-                $arg[] = $row->recht_group_ID;
-    
-        }
-    }
-    // maximal moegliche Rechte (11.07.2013):
-    // 'ae','ar','ase','asr','dde','ddr','fme','fmr','ie','ir','kr','ke','le','lr','mtr','mte','pe','pr','pze','pzr','re','rr','rtr','rte','ve','vpe','vpr','vr'
-    // Rechtegruppen: a, v, i, s
-    if (is_null($_SESSION["recht"]))
-        echo "<p>&nbsp;&nbsp;&nbsp;Sie haben keine Rechte, um mit dieser Anwendung zu arbeiten.</p>
-              <p>&nbsp;&nbsp;&nbsp;Bitte kontaktieren Sie <a href='mailto:kaendler@fhi-berlin.mpg.de'>Dr. K&auml;ndler</a>.</p>\n";
-    else
-    {
-        echo "
-        <div id=\"navio\">
-            <ul>";
-        if (is_array($arg) && in_array("v",$arg))
-        {
-          echo "<li>Vertragscontrolling\n
-            	   <ul>\n";
-          if (in_array("vr",$_SESSION["recht"]) || in_array("ve",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/vertrag_flist1.php?g=1\" target=\"_blank\" title=\"Vertragsliste\">Vertr&auml;ge sortieren, filtern, bearbeiten</a></li>\n
-            		<li><a href=\"/fhiiqm/vertrag_search.php\" target=\"_blank\" title=\"Vertrag suchen\">Vertrag suchen, bearbeiten</a></li>\n";
-          if (in_array("ve",$_SESSION["recht"]))
-//            		echo "<li><a href=\"/fhiiqm/vertrag_ins.php\" target=\"_blank\" title=\"Vertrag erfassen\">Vertrag erfassen</a></li>\n";
-            		echo "<li><a href=\"/fhiiqm/vertrag_ed.php?g=1\" target=\"_blank\" title=\"Vertrag erfassen\">Vertrag erfassen</a></li>\n";
-          if (in_array("vpr",$_SESSION["recht"]) || in_array("vpe",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/partner_flist.php\" target=\"_blank\" title=\"Partnerliste\">Vertragspartner sortieren, filtern, bearbeiten</a></li>\n";
-          if (in_array("vpe",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/partner_ins.php\" target=\"_blank\" title=\"Partner erfassen\">Vertragspartner erfassen</a></li>\n";
-          if (in_array("vr",$_SESSION["recht"]) || in_array("ve",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/vertrag_report.php\" target=\"_blank\" title=\"Berichte\">Berichte</a></li>\n";
-    	  echo "	</ul>\n
-                </li>\n"; 
-        }   
-        if ((is_array($arg) && in_array("i",$arg)) || in_array("ddr",$_SESSION["recht"]) || in_array("dde",$_SESSION["recht"]))
-        {
-          echo "<li>Informationen zu FHI-Leistungen und Produkten\n
-            	   <ul>\n";
-          if (in_array("ir",$_SESSION["recht"]) || in_array("ie",$_SESSION["recht"]) || in_array("ddr",$_SESSION["recht"]) || in_array("dde",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/info_flist.php\" target=\"_blank\" title=\"Infoliste\">Informationen sortieren, filtern, bearbeiten</a></li>\n";
-          if (in_array("ie",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/info_ed.php\" target=\"_blank\" title=\"Info erfassen\">Information erfassen</a></li>\n";
-          if (in_array("ie",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/info_ed3.php?t=6\" target=\"_blank\" title=\"Info GVP erfassen\">Gesch&auml;ftsverteilungsplan erfassen</a></li>\n";
-          if (in_array("ie",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/info_betrst_ed.php?t=7\" target=\"_blank\" title=\"Betriebsst&ouml;rung erfassen\">Betriebsst&ouml;rung erfassen</a></li>\n";
-          if (in_array("dde",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/info_betrst_ed.php?t=71\" target=\"_blank\" title=\"Betriebsst&ouml;rung dezentrale Technikerfassen\">Betriebsst&ouml;rung dezentrale Technik erfassen</a></li>\n";
-          if (in_array("ie",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/info_betrst_ed.php?t=8\" target=\"_blank\" title=\"Betriebsanweisung erfassen\">Betriebsanweisung erfassen</a></li>\n";
-          if (in_array("ie",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/info_betrst_ed.php?t=81\" target=\"_blank\" title=\"Betriebsanweisung Anlage erfassen\">Betriebsanweisung Anlage erfassen</a></li>\n";
-          if (in_array("ir",$_SESSION["recht"]) || in_array("ie",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/info_report.php\" target=\"_blank\" title=\"Report GVP\">Berichte Informationen</a></li>\n";
-    	  echo "   </ul>\n
-                </li>\n";
-        }	
-        if (is_array($arg) && in_array("p",$arg))
-        {
-          echo "<li>Projekte\n
-            	   <ul>\n";
-          if (in_array("pzr",$_SESSION["recht"]) || in_array("pze",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/prozess_flist.php\" target=\"_blank\" title=\"Projektliste\">Projekte sortieren, filtern, bearbeiten</a></li>\n";
-          if (in_array("pze",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/prozess_ed.php\" target=\"_blank\" title=\"Projekt erfassen\">Projekt erfassen</a></li>\n";
-          if (in_array("pzr",$_SESSION["recht"]) || in_array("pze",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/pz_report.php\" target=\"_blank\" title=\"ReportProjekt\">Berichte Projekte</a></li>\n";
-    	  echo "   </ul>\n
-                </li>\n";
-        }	
-        if (is_array($arg) && in_array("a",$arg))
-        {
-          echo "<li>Anlagen\n
-            	   <ul>\n";
-          if (in_array("ar",$_SESSION["recht"]) || in_array("ae",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/anlage_flist.php\" target=\"_blank\" title=\"Anlagenliste\">Anlagen sortieren, filtern, bearbeiten</a></li>\n";
-          if (in_array("ae",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/anlage_ed.php\" target=\"_blank\" title=\"Anlage erfassen\">Anlage erfassen</a></li>\n";
-          if (in_array("ae",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/anlage_ed.php?k=6\" target=\"_blank\" title=\"Gasflasche erfassen\">Gasflasche erfassen</a></li>\n";
-          if (in_array("ar",$_SESSION["recht"]) || in_array("ae",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/alpruef_flist.php\" target=\"_blank\" title=\"Anlagenpr&uuml;fungen\">Anlagenpr&uuml;fungen sortieren, filtern, bearbeiten</a></li>\n";
-          if (in_array("ae",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/alpruef_ed.php\" target=\"_blank\" title=\"Anlagenpr&uuml;fung erfassen\">Anlagenpr&uuml;fung erfassen</a></li>\n";
-          if (in_array("ar",$_SESSION["recht"]) || in_array("ae",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/alrisk_flist.php\" target=\"_blank\" title=\"Anlagenrisiken\">Anlagenrisiken sortieren, filtern, bearbeiten</a></li>\n";
-          if (in_array("ae",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/alrisk_ed.php\" target=\"_blank\" title=\"Anlagenrisiko erfassen\">Anlagenrisiko erfassen</a></li>\n";
-          if (in_array("ar",$_SESSION["recht"]) || in_array("ae",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/alvtr_flist.php\" target=\"_blank\" title=\"Anlagen-Vertr&auml;ge\">Anlagen-Vertr&auml;ge sortieren, filtern, bearbeiten</a></li>\n";
-          if (in_array("ae",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/alvtr_ed.php\" target=\"_blank\" title=\"Anlage-Vertrag erfassen\">Anlage-Vertrag erfassen</a></li>\n";
-    	  echo "   </ul>\n
-                </li>\n";
-        }	
-        if (is_array($arg) && in_array("l",$arg))
-        {
-          echo "<li>Laser\n
-            	   <ul>\n";
-          if (in_array("lr",$_SESSION["recht"]) || in_array("le",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/laser_flist.php\" target=\"_blank\" title=\"Laserliste\">Laser sortieren, filtern, bearbeiten</a></li>\n";
-            		echo "<li><a href=\"/fhiiqm/laser_log_flist_ed.php\" target=\"_blank\" title=\"Laser-Logbuch\">Laser-Logbuch sortieren, filtern, bearbeiten</a></li>\n";
-          if (in_array("le",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/laser_ed.php\" target=\"_blank\" title=\"Laser erfassen\">Laser erfassen</a></li>\n";
-    	  echo "   </ul>\n
-                </li>\n";
-        }	
-
-//        if (is_array($arg) && in_array("s",$arg))
-//        {
-          if (in_array("asr",$_SESSION["recht"]) || in_array("ase",$_SESSION["recht"]) || in_array("re",$_SESSION["recht"]))
-          {
-            echo "<li>Arbeitssicherheit\n
-                       <ul>\n";
-                if (in_array("asr",$_SESSION["recht"]) || in_array("ase",$_SESSION["recht"]))
-                {
-                    echo "<li><a href=\"/fhiiqm/ap_vorsorge_flist.php\" target=\"_blank\" title=\"Arbeitsplatztyp-Vorsorge-Liste\">Arb.platztypen - Vorsorge filtern, bearbeiten</a></li>\n";            
-                    echo "<li><a href=\"/fhiiqm/ap_gefahr_flist.php\" target=\"_blank\" title=\"Arbeitsplatztyp-Gefährdung-Liste\">Arb.platztypen - Gefährdung sortieren, filtern, bearb.</a></li>\n";            
-                    echo "<li><a href=\"/fhiiqm/gefahr_massn_flist.php\" target=\"_blank\" title=\"AS-Ma&szlig;nahmen\">Gefährdung - Ma&szlig;nahmen sortieren, filtern, bearb.</a></li>\n";            
-                    echo "<li><a href=\"/fhiiqm/gefahr_massn_ed.php\" target=\"_blank\" title=\"AS-Ma&szlig;nahmen\">Gefährdung - Ma&szlig;nahmen erfassen</a></li>\n";            
-                }    
-                if (in_array("re",$_SESSION["recht"]))
-                	echo "<li><a href=\"/fhiiqm/raum_aptyp_flist.php\" target=\"_blank\" title=\"Raum-Arbeitsplatztyp-Liste edit\">R&auml;ume - Arb.platztypen sortieren, filtern,  bearbeiten</a></li>\n";
-                if (in_array("asr",$_SESSION["recht"]) || in_array("ase",$_SESSION["recht"]))
-                {
-                    echo "<li><a href=\"/fhiiqm/raumarbgr_flist.php\" target=\"_blank\" title=\"Raum-Arbeits-Gruppe-Liste\">Raum-Arbeits-Gruppe sortieren, filtern, bearbeiten</a></li>\n";            
-                    echo "<li><a href=\"/fhiiqm/as_report.php\" target=\"_blank\" title=\"Report Arbeitssicherheit\">Berichte Arbeitssicherheit</a></li>\n";
-                }    
-            echo "   </ul>\n
-                    </li>\n";
-          }
-          if (in_array("fmr",$_SESSION["recht"]) || in_array("fme",$_SESSION["recht"]))
-          {
-                echo "<li>Funktionen\n";
-                echo "<ul>\n";    // Bearbeitung von ausgewaehlten Stamm-Daten
-                if (in_array("fmr",$_SESSION["recht"]) || in_array("fme",$_SESSION["recht"]))
-                		echo "<li><a href=\"/fhiiqm/ma_fkt_flist.php\" target=\"_blank\" title=\"MA-Funktionen-Liste\">Mitarbeiter - Funktion sort., filtern, bearbeiten</a></li>\n";
-                if (in_array("fme",$_SESSION["recht"]))
-                		echo "<li><a href=\"/fhiiqm/ma_fkt_ed.php\" target=\"_blank\" title=\"MA-Funktionen\">Mitarbeiter - Funktion erfassen</a></li>\n";
-                if (in_array("fmr",$_SESSION["recht"]) || in_array("fme",$_SESSION["recht"]))
-                        echo "<li><a href=\"/fhiiqm/report/fkt_ma_report.php\" target=\"_blank\" title=\"Beauftragte\">Bericht Beauftragte</a></li>\n";
-                echo "   </ul>\n
-                    </li>\n";
-          }      
-          if (in_array("rr",$_SESSION["recht"]) || in_array("re",$_SESSION["recht"]) || in_array("ddr",$_SESSION["recht"]) || in_array("dde",$_SESSION["recht"]))
-          {
-              echo "<li>R&auml;ume\n
-                	   <ul>\n";
-              if (in_array("rr",$_SESSION["recht"]) || in_array("re",$_SESSION["recht"]))
-                		echo "<li><a href=\"/fhiiqm/raum_flist.php\" target=\"_blank\" title=\"Raumliste\">R&auml;ume sortieren, filtern, bearbeiten</a></li>\n";
-              if (in_array("re",$_SESSION["recht"]))
-                    {                
-                		echo "<li><a href=\"/fhiiqm/raum_ins.php\" target=\"_blank\" title=\"Raum erfassen\">Raum erfassen</a></li>\n";
-                    	echo "<li><a href=\"/fhiiqm/raum_flist_ed.php\" target=\"_blank\" title=\"Raumliste edit\">R&auml;ume - Reinig.-Daten sortieren, filtern, bearbeiten</a></li>\n";
-                    }
-              if (in_array("ddr",$_SESSION["recht"]) || in_array("dde",$_SESSION["recht"]))
-                		echo "<li><a href=\"/fhiiqm/raum_vma_flist.php\" target=\"_blank\" title=\"Raumliste\">Raumverantwortliche sortieren, filtern, bearbeiten</a></li>\n";
-              if (in_array("rr",$_SESSION["recht"]) || in_array("re",$_SESSION["recht"]))
-                        echo "<li><a href=\"/fhiiqm/raum_report.php\" target=\"_blank\" title=\"Report R&auml;ume\">Berichte R&auml;ume</a></li>\n";
-        	  echo "   </ul>\n
-                    </li>\n";
-          }      
-//        }
-          if (in_array("kr",$_SESSION["recht"]) || in_array("ke",$_SESSION["recht"]))
-          {
-                $sql = "SELECT depot_ID,edit FROM KeyDepot_userweb WHERE userid = '".$_SESSION["userid"]."'";
-                $res = $dbc -> queryObjectArray($sql);
-                foreach ($res as $row) if ($row->edit) $adep[] = $row->depot_ID;
-                echo "<li>Schl&uuml;sselverwaltung\n";
-                echo "<ul>\n";
-                    if (isset($adep) && $adep)
-              		    echo "<li><a href=\"/fhiiqm/keytyp_tract_ma.php\" target=\"_blank\" title=\"Keytyp Transfer MA\">Transfer Schl&uuml;ssel Depot - MA</a></li>\n";
-              		echo "<li><a href=\"/fhiiqm/keytyp_ma_search.php\" target=\"_blank\" title=\"MA-Keytyp Suche\">Suche Schl&uuml;ssel - Mitarbeiter</a></li>\n";
-                    if (isset($adep) && $adep)
-              		    echo "<li><a href=\"/fhiiqm/keytyp_korr_dep.php\" target=\"_blank\" title=\"Keytyp Korrektur Depot\">Korrektur Schl&uuml;sseltyp Depot</a></li>\n";
-              		echo "<li><a href=\"/fhiiqm/keytyp_search.php\" target=\"_blank\" title=\"Keytyp Suche\">Schl&uuml;sseltyp suchen, bearbeiten</a></li>\n";
-                    if (in_array("ke",$_SESSION["recht"]) && in_array("FHI",$adep))
-                    {
-              		    echo "<li><a href=\"/fhiiqm/keytyp_tract_dep.php\" target=\"_blank\" title=\"Keytyp Transfer Depot\">Transfer Schl&uuml;ssel zwischen Depots</a></li>\n";
-                  		echo "<li><a href=\"/fhiiqm/keytyp_del_dep.php\" target=\"_blank\" title=\"Keytyp Delete Depot\">Schl&uuml;sseltyp aus Depot l&ouml;schen</a></li>\n";
-                  		echo "<li><a href=\"/fhiiqm/keytyp_ed.php\" target=\"_blank\" title=\"Keytyp erfassen\">Schl&uuml;sseltyp erfassen</a></li>\n";
-                  		echo "<li><a href=\"/fhiiqm/keydepot_user_list.php\" target=\"_blank\" title=\"KeyDepot-User Liste\">Verwalterliste Schl&uuml;sseltyp-Depot</a></li>\n";
-                    }    
-              		echo "<li><a href=\"/fhiiqm/keytyp_report.php\" target=\"_blank\" title=\"Report Keytyp\">Berichte Schl&uuml;sseltyp</a></li>\n";
-                echo "</ul>\n
-                    </li>\n";
-          }
-          echo "<li>Mitarbeiter - Telefon\n
-            	   <ul>\n";
-          if (in_array("mte",$_SESSION["recht"]))
-                {
-                    echo "<li><a href=\"/fhiiqm/ma_tel_flist.php?e=1\" target=\"_blank\" title=\"MA-Telefonliste\">Mitarbeiter - Telefon sortieren, filtern, bearbeiten</a></li>\n";
-                    echo "<li><a href=\"/fhiiqm/ma_tel_ed.php\" target=\"_blank\" title=\"MA-Telefon\">Mitarbeiter - Telefon erfassen</a></li>\n";
-                    echo "<li><a href=\"/fhiiqm/tel_flist.php\" target=\"_blank\" title=\"Telefonliste\">Telefone sortieren, filtern, bearbeiten</a></li>\n";
-                    echo "<li><a href=\"/fhiiqm/tel_ed.php\" target=\"_blank\" title=\"Telefon\">Telefon erfassen</a></li>\n";
-                }
-          if (in_array("mtr",$_SESSION["recht"]) || in_array("mte",$_SESSION["recht"]))
-                    echo "<li><a href=\"/fhiiqm/ma_obj_report.php\" target=\"_blank\" title=\"Report Mitarbeiter\">Berichte Mitarbeiter - Telefon</a></li>\n";
-          else
-            echo "<li><a href=\"/fhiiqm/ma_tel_flist.php\" target=\"_blank\" title=\"MA-Telefonliste\">Mitarbeiter - Telefon sortieren, filtern</a></li>\n";
-    	  echo "   </ul>\n
-                </li>\n";
-                    
-        // 's' wie 'Sonstige' oder 'Stammdaten' - Rechtegruppe
-//        if (is_array($arg) && in_array("s",$arg))
-        if (in_array("pr",$_SESSION["recht"]) || in_array("pe",$_SESSION["recht"]) || in_array("rtr",$_SESSION["recht"]) || in_array("rte",$_SESSION["recht"]))
-        {
-          echo "<li>Stammdaten\n
-            	   <ul>\n";
-          if (in_array("pr",$_SESSION["recht"]) || in_array("pe",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/prod_hier.php\" target=\"_blank\" title=\"Produkthierarchie\">Produkthierarchie</a></li>\n";
-          if (in_array("pe",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/produkt_ins.php\" target=\"_blank\" title=\"Produkt erfassen\">Produkt erfassen</a></li>\n";
-          if (in_array("rtr",$_SESSION["recht"]) || in_array("rte",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/recht_list.php\" target=\"_blank\" title=\"Nutzerliste\">Nutzer - Rechte bearbeiten</a></li>\n";
-          if (in_array("rte",$_SESSION["recht"]))
-            		echo "<li><a href=\"/fhiiqm/recht_ed.php\" target=\"_blank\" title=\"Rechte\">Rechteverwaltung neuer Nutzer</a></li>\n";
-    //<!--				<li><a href="#">Anleitungen</a></li> -->
-    	  echo "   </ul>\n
-                </li>\n";
-        }
-                
-        echo "    </ul>
-        </div>";
-    }
-?>
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 09/2011
+ * 
+ * Menusteuerung mittels $_SESSION["recht"]
+ */
+
+
+    if (is_array($_SESSION["recht"]))
+    {
+        foreach ($_SESSION["recht"] as $val)
+            $list .= ",'" .$val . "'";
+        $list = substr($list,1);
+        
+        include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+    	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+        $sql = "SELECT DISTINCT recht_group_ID FROM recht WHERE recht_ID IN ($list)";
+        if ($result = $dbc -> queryObjectArray($sql))
+        {
+            foreach ($result as $row)
+                $arg[] = $row->recht_group_ID;
+    
+        }
+    }
+    // maximal moegliche Rechte (11.07.2013):
+    // 'ae','ar','ase','asr','dde','ddr','fme','fmr','ie','ir','kr','ke','le','lr','mtr','mte','pe','pr','pze','pzr','re','rr','rtr','rte','ve','vpe','vpr','vr'
+    // Rechtegruppen: a, v, i, s
+    if (is_null($_SESSION["recht"]))
+        echo "<p>&nbsp;&nbsp;&nbsp;Sie haben keine Rechte, um mit dieser Anwendung zu arbeiten.</p>
+              <p>&nbsp;&nbsp;&nbsp;Bitte kontaktieren Sie <a href='mailto:kaendler@fhi-berlin.mpg.de'>Dr. K&auml;ndler</a>.</p>\n";
+    else
+    {
+        echo "
+        <div id=\"navio\">
+            <ul>";
+        if (is_array($arg) && in_array("v",$arg))
+        {
+          echo "<li>Vertragscontrolling\n
+            	   <ul>\n";
+          if (in_array("vr",$_SESSION["recht"]) || in_array("ve",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/vertrag_flist1.php?g=1\" target=\"_blank\" title=\"Vertragsliste\">Vertr&auml;ge sortieren, filtern, bearbeiten</a></li>\n
+            		<li><a href=\"/fhiiqm/vertrag_search.php\" target=\"_blank\" title=\"Vertrag suchen\">Vertrag suchen, bearbeiten</a></li>\n";
+          if (in_array("ve",$_SESSION["recht"]))
+//            		echo "<li><a href=\"/fhiiqm/vertrag_ins.php\" target=\"_blank\" title=\"Vertrag erfassen\">Vertrag erfassen</a></li>\n";
+            		echo "<li><a href=\"/fhiiqm/vertrag_ed.php?g=1\" target=\"_blank\" title=\"Vertrag erfassen\">Vertrag erfassen</a></li>\n";
+          if (in_array("vpr",$_SESSION["recht"]) || in_array("vpe",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/partner_flist.php\" target=\"_blank\" title=\"Partnerliste\">Vertragspartner sortieren, filtern, bearbeiten</a></li>\n";
+          if (in_array("vpe",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/partner_ins.php\" target=\"_blank\" title=\"Partner erfassen\">Vertragspartner erfassen</a></li>\n";
+          if (in_array("vr",$_SESSION["recht"]) || in_array("ve",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/vertrag_report.php\" target=\"_blank\" title=\"Berichte\">Berichte</a></li>\n";
+    	  echo "	</ul>\n
+                </li>\n"; 
+        }   
+        if ((is_array($arg) && in_array("i",$arg)) || in_array("ddr",$_SESSION["recht"]) || in_array("dde",$_SESSION["recht"]))
+        {
+          echo "<li>Informationen zu FHI-Leistungen und Produkten\n
+            	   <ul>\n";
+          if (in_array("ir",$_SESSION["recht"]) || in_array("ie",$_SESSION["recht"]) || in_array("ddr",$_SESSION["recht"]) || in_array("dde",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/info_flist.php\" target=\"_blank\" title=\"Infoliste\">Informationen sortieren, filtern, bearbeiten</a></li>\n";
+          if (in_array("ie",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/info_ed.php\" target=\"_blank\" title=\"Info erfassen\">Information erfassen</a></li>\n";
+          if (in_array("ie",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/info_ed3.php?t=6\" target=\"_blank\" title=\"Info GVP erfassen\">Gesch&auml;ftsverteilungsplan erfassen</a></li>\n";
+          if (in_array("ie",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/info_betrst_ed.php?t=7\" target=\"_blank\" title=\"Betriebsst&ouml;rung erfassen\">Betriebsst&ouml;rung erfassen</a></li>\n";
+          if (in_array("dde",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/info_betrst_ed.php?t=71\" target=\"_blank\" title=\"Betriebsst&ouml;rung dezentrale Technikerfassen\">Betriebsst&ouml;rung dezentrale Technik erfassen</a></li>\n";
+          if (in_array("ie",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/info_betrst_ed.php?t=8\" target=\"_blank\" title=\"Betriebsanweisung erfassen\">Betriebsanweisung erfassen</a></li>\n";
+          if (in_array("ie",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/info_betrst_ed.php?t=81\" target=\"_blank\" title=\"Betriebsanweisung Anlage erfassen\">Betriebsanweisung Anlage erfassen</a></li>\n";
+          if (in_array("ir",$_SESSION["recht"]) || in_array("ie",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/info_report.php\" target=\"_blank\" title=\"Report GVP\">Berichte Informationen</a></li>\n";
+    	  echo "   </ul>\n
+                </li>\n";
+        }	
+        if (is_array($arg) && in_array("p",$arg))
+        {
+          echo "<li>Projekte\n
+            	   <ul>\n";
+          if (in_array("pzr",$_SESSION["recht"]) || in_array("pze",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/prozess_flist.php\" target=\"_blank\" title=\"Projektliste\">Projekte sortieren, filtern, bearbeiten</a></li>\n";
+          if (in_array("pze",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/prozess_ed.php\" target=\"_blank\" title=\"Projekt erfassen\">Projekt erfassen</a></li>\n";
+          if (in_array("pzr",$_SESSION["recht"]) || in_array("pze",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/pz_report.php\" target=\"_blank\" title=\"ReportProjekt\">Berichte Projekte</a></li>\n";
+    	  echo "   </ul>\n
+                </li>\n";
+        }	
+        if (is_array($arg) && in_array("a",$arg))
+        {
+          echo "<li>Anlagen\n
+            	   <ul>\n";
+          if (in_array("ar",$_SESSION["recht"]) || in_array("ae",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/anlage_flist.php\" target=\"_blank\" title=\"Anlagenliste\">Anlagen sortieren, filtern, bearbeiten</a></li>\n";
+          if (in_array("ae",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/anlage_ed.php\" target=\"_blank\" title=\"Anlage erfassen\">Anlage erfassen</a></li>\n";
+          if (in_array("ae",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/anlage_ed.php?k=6\" target=\"_blank\" title=\"Gasflasche erfassen\">Gasflasche erfassen</a></li>\n";
+          if (in_array("ar",$_SESSION["recht"]) || in_array("ae",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/alpruef_flist.php\" target=\"_blank\" title=\"Anlagenpr&uuml;fungen\">Anlagenpr&uuml;fungen sortieren, filtern, bearbeiten</a></li>\n";
+          if (in_array("ae",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/alpruef_ed.php\" target=\"_blank\" title=\"Anlagenpr&uuml;fung erfassen\">Anlagenpr&uuml;fung erfassen</a></li>\n";
+          if (in_array("ar",$_SESSION["recht"]) || in_array("ae",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/alrisk_flist.php\" target=\"_blank\" title=\"Anlagenrisiken\">Anlagenrisiken sortieren, filtern, bearbeiten</a></li>\n";
+          if (in_array("ae",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/alrisk_ed.php\" target=\"_blank\" title=\"Anlagenrisiko erfassen\">Anlagenrisiko erfassen</a></li>\n";
+          if (in_array("ar",$_SESSION["recht"]) || in_array("ae",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/alvtr_flist.php\" target=\"_blank\" title=\"Anlagen-Vertr&auml;ge\">Anlagen-Vertr&auml;ge sortieren, filtern, bearbeiten</a></li>\n";
+          if (in_array("ae",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/alvtr_ed.php\" target=\"_blank\" title=\"Anlage-Vertrag erfassen\">Anlage-Vertrag erfassen</a></li>\n";
+    	  echo "   </ul>\n
+                </li>\n";
+        }	
+        if (is_array($arg) && in_array("l",$arg))
+        {
+          echo "<li>Laser\n
+            	   <ul>\n";
+          if (in_array("lr",$_SESSION["recht"]) || in_array("le",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/laser_flist.php\" target=\"_blank\" title=\"Laserliste\">Laser sortieren, filtern, bearbeiten</a></li>\n";
+            		echo "<li><a href=\"/fhiiqm/laser_log_flist_ed.php\" target=\"_blank\" title=\"Laser-Logbuch\">Laser-Logbuch sortieren, filtern, bearbeiten</a></li>\n";
+          if (in_array("le",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/laser_ed.php\" target=\"_blank\" title=\"Laser erfassen\">Laser erfassen</a></li>\n";
+          if (in_array("lr",$_SESSION["recht"]) || in_array("le",$_SESSION["recht"]))
+                    echo "<li><a href=\"/fhiiqm/laser_report.php\" target=\"_blank\" title=\"Report Laser\">Berichte Laser</a></li>\n";
+    	  echo "   </ul>\n
+                </li>\n";
+        }	
+
+//        if (is_array($arg) && in_array("s",$arg))
+//        {
+          if (in_array("asr",$_SESSION["recht"]) || in_array("ase",$_SESSION["recht"]) || in_array("re",$_SESSION["recht"]))
+          {
+            echo "<li>Arbeitssicherheit\n
+                       <ul>\n";
+                if (in_array("asr",$_SESSION["recht"]) || in_array("ase",$_SESSION["recht"]))
+                {
+                    echo "<li><a href=\"/fhiiqm/ap_vorsorge_flist.php\" target=\"_blank\" title=\"Arbeitsplatztyp-Vorsorge-Liste\">Arb.platztypen - Vorsorge filtern, bearbeiten</a></li>\n";            
+                    echo "<li><a href=\"/fhiiqm/ap_gefahr_flist.php\" target=\"_blank\" title=\"Arbeitsplatztyp-Gefährdung-Liste\">Arb.platztypen - Gefährdung sortieren, filtern, bearb.</a></li>\n";            
+                    echo "<li><a href=\"/fhiiqm/gefahr_massn_flist.php\" target=\"_blank\" title=\"AS-Ma&szlig;nahmen\">Gefährdung - Ma&szlig;nahmen sortieren, filtern, bearb.</a></li>\n";            
+                    echo "<li><a href=\"/fhiiqm/gefahr_massn_ed.php\" target=\"_blank\" title=\"AS-Ma&szlig;nahmen\">Gefährdung - Ma&szlig;nahmen erfassen</a></li>\n";            
+                }    
+                if (in_array("re",$_SESSION["recht"]))
+                	echo "<li><a href=\"/fhiiqm/raum_aptyp_flist.php\" target=\"_blank\" title=\"Raum-Arbeitsplatztyp-Liste edit\">R&auml;ume - Arb.platztypen sortieren, filtern,  bearbeiten</a></li>\n";
+                if (in_array("asr",$_SESSION["recht"]) || in_array("ase",$_SESSION["recht"]))
+                {
+                    echo "<li><a href=\"/fhiiqm/raumarbgr_flist.php\" target=\"_blank\" title=\"Raum-Arbeits-Gruppe-Liste\">Raum-Arbeits-Gruppe sortieren, filtern, bearbeiten</a></li>\n";            
+                    echo "<li><a href=\"/fhiiqm/as_report.php\" target=\"_blank\" title=\"Report Arbeitssicherheit\">Berichte Arbeitssicherheit</a></li>\n";
+                }    
+            echo "   </ul>\n
+                    </li>\n";
+          }
+          if (in_array("fmr",$_SESSION["recht"]) || in_array("fme",$_SESSION["recht"]))
+          {
+                echo "<li>Funktionen\n";
+                echo "<ul>\n";    // Bearbeitung von ausgewaehlten Stamm-Daten
+                if (in_array("fmr",$_SESSION["recht"]) || in_array("fme",$_SESSION["recht"]))
+                		echo "<li><a href=\"/fhiiqm/ma_fkt_flist.php\" target=\"_blank\" title=\"MA-Funktionen-Liste\">Mitarbeiter - Funktion sort., filtern, bearbeiten</a></li>\n";
+                if (in_array("fme",$_SESSION["recht"]))
+                		echo "<li><a href=\"/fhiiqm/ma_fkt_ed.php\" target=\"_blank\" title=\"MA-Funktionen\">Mitarbeiter - Funktion erfassen</a></li>\n";
+                if (in_array("fmr",$_SESSION["recht"]) || in_array("fme",$_SESSION["recht"]))
+                        echo "<li><a href=\"/fhiiqm/report/fkt_ma_report.php\" target=\"_blank\" title=\"Beauftragte\">Bericht Beauftragte</a></li>\n";
+                echo "   </ul>\n
+                    </li>\n";
+          }      
+          if (in_array("rr",$_SESSION["recht"]) || in_array("re",$_SESSION["recht"]) || in_array("ddr",$_SESSION["recht"]) || in_array("dde",$_SESSION["recht"]))
+          {
+              echo "<li>R&auml;ume\n
+                	   <ul>\n";
+              if (in_array("rr",$_SESSION["recht"]) || in_array("re",$_SESSION["recht"]))
+                		echo "<li><a href=\"/fhiiqm/raum_flist.php\" target=\"_blank\" title=\"Raumliste\">R&auml;ume sortieren, filtern, bearbeiten</a></li>\n";
+              if (in_array("re",$_SESSION["recht"]))
+                    {                
+                		echo "<li><a href=\"/fhiiqm/raum_ins.php\" target=\"_blank\" title=\"Raum erfassen\">Raum erfassen</a></li>\n";
+                    	echo "<li><a href=\"/fhiiqm/raum_flist_ed.php\" target=\"_blank\" title=\"Raumliste edit\">R&auml;ume - Reinig.-Daten sortieren, filtern, bearbeiten</a></li>\n";
+                    }
+              if (in_array("ddr",$_SESSION["recht"]) || in_array("dde",$_SESSION["recht"]))
+                		echo "<li><a href=\"/fhiiqm/raum_vma_flist.php\" target=\"_blank\" title=\"Raumliste\">Raumverantwortliche sortieren, filtern, bearbeiten</a></li>\n";
+              if (in_array("rr",$_SESSION["recht"]) || in_array("re",$_SESSION["recht"]))
+                        echo "<li><a href=\"/fhiiqm/raum_report.php\" target=\"_blank\" title=\"Report R&auml;ume\">Berichte R&auml;ume</a></li>\n";
+        	  echo "   </ul>\n
+                    </li>\n";
+          }      
+//        }
+          if (in_array("kr",$_SESSION["recht"]) || in_array("ke",$_SESSION["recht"]))
+          {
+                $sql = "SELECT depot_ID,edit FROM KeyDepot_userweb WHERE userid = '".$_SESSION["userid"]."'";
+                $res = $dbc -> queryObjectArray($sql);
+                foreach ($res as $row) if ($row->edit) $adep[] = $row->depot_ID;
+                echo "<li>Schl&uuml;sselverwaltung\n";
+                echo "<ul>\n";
+                    if (isset($adep) && $adep)
+              		    echo "<li><a href=\"/fhiiqm/keytyp_tract_ma.php\" target=\"_blank\" title=\"Keytyp Transfer MA\">Transfer Schl&uuml;ssel Depot - MA</a></li>\n";
+              		echo "<li><a href=\"/fhiiqm/keytyp_ma_search.php\" target=\"_blank\" title=\"MA-Keytyp Suche\">Suche Schl&uuml;ssel - Mitarbeiter</a></li>\n";
+                    if (isset($adep) && $adep)
+              		    echo "<li><a href=\"/fhiiqm/keytyp_korr_dep.php\" target=\"_blank\" title=\"Keytyp Korrektur Depot\">Korrektur Schl&uuml;sseltyp Depot</a></li>\n";
+              		echo "<li><a href=\"/fhiiqm/keytyp_search.php\" target=\"_blank\" title=\"Keytyp Suche\">Schl&uuml;sseltyp suchen, bearbeiten</a></li>\n";
+                    if (in_array("ke",$_SESSION["recht"]) && in_array("FHI",$adep))
+                    {
+              		    echo "<li><a href=\"/fhiiqm/keytyp_tract_dep.php\" target=\"_blank\" title=\"Keytyp Transfer Depot\">Transfer Schl&uuml;ssel zwischen Depots</a></li>\n";
+                  		echo "<li><a href=\"/fhiiqm/keytyp_del_dep.php\" target=\"_blank\" title=\"Keytyp Delete Depot\">Schl&uuml;sseltyp aus Depot l&ouml;schen</a></li>\n";
+                  		echo "<li><a href=\"/fhiiqm/keytyp_ed.php\" target=\"_blank\" title=\"Keytyp erfassen\">Schl&uuml;sseltyp erfassen</a></li>\n";
+                  		echo "<li><a href=\"/fhiiqm/keydepot_user_list.php\" target=\"_blank\" title=\"KeyDepot-User Liste\">Verwalterliste Schl&uuml;sseltyp-Depot</a></li>\n";
+                    }    
+              		echo "<li><a href=\"/fhiiqm/keytyp_report.php\" target=\"_blank\" title=\"Report Keytyp\">Berichte Schl&uuml;sseltyp</a></li>\n";
+                echo "</ul>\n
+                    </li>\n";
+          }
+          echo "<li>Mitarbeiter - Telefon\n
+            	   <ul>\n";
+          if (in_array("mte",$_SESSION["recht"]))
+                {
+                    echo "<li><a href=\"/fhiiqm/ma_tel_flist.php?e=1\" target=\"_blank\" title=\"MA-Telefonliste\">Mitarbeiter - Telefon sortieren, filtern, bearbeiten</a></li>\n";
+                    echo "<li><a href=\"/fhiiqm/ma_tel_ed.php\" target=\"_blank\" title=\"MA-Telefon\">Mitarbeiter - Telefon erfassen</a></li>\n";
+                    echo "<li><a href=\"/fhiiqm/tel_flist.php\" target=\"_blank\" title=\"Telefonliste\">Telefone sortieren, filtern, bearbeiten</a></li>\n";
+                    echo "<li><a href=\"/fhiiqm/tel_ed.php\" target=\"_blank\" title=\"Telefon\">Telefon erfassen</a></li>\n";
+                }
+          if (in_array("mtr",$_SESSION["recht"]) || in_array("mte",$_SESSION["recht"]))
+                    echo "<li><a href=\"/fhiiqm/ma_obj_report.php\" target=\"_blank\" title=\"Report Mitarbeiter\">Berichte Mitarbeiter - Telefon</a></li>\n";
+          else
+            echo "<li><a href=\"/fhiiqm/ma_tel_flist.php\" target=\"_blank\" title=\"MA-Telefonliste\">Mitarbeiter - Telefon sortieren, filtern</a></li>\n";
+    	  echo "   </ul>\n
+                </li>\n";
+                    
+        // 's' wie 'Sonstige' oder 'Stammdaten' - Rechtegruppe
+//        if (is_array($arg) && in_array("s",$arg))
+        if (in_array("pr",$_SESSION["recht"]) || in_array("pe",$_SESSION["recht"]) || in_array("rtr",$_SESSION["recht"]) || in_array("rte",$_SESSION["recht"]))
+        {
+          echo "<li>Stammdaten\n
+            	   <ul>\n";
+          if (in_array("pr",$_SESSION["recht"]) || in_array("pe",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/prod_hier.php\" target=\"_blank\" title=\"Produkthierarchie\">Produkthierarchie</a></li>\n";
+          if (in_array("pe",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/produkt_ins.php\" target=\"_blank\" title=\"Produkt erfassen\">Produkt erfassen</a></li>\n";
+          if (in_array("rtr",$_SESSION["recht"]) || in_array("rte",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/recht_list.php\" target=\"_blank\" title=\"Nutzerliste\">Nutzer - Rechte bearbeiten</a></li>\n";
+          if (in_array("rte",$_SESSION["recht"]))
+            		echo "<li><a href=\"/fhiiqm/recht_ed.php\" target=\"_blank\" title=\"Rechte\">Rechteverwaltung neuer Nutzer</a></li>\n";
+    //<!--				<li><a href="#">Anleitungen</a></li> -->
+    	  echo "   </ul>\n
+                </li>\n";
+        }
+                
+        echo "    </ul>
+        </div>";
+    }
+?>
--- a/fhiiqm/inc/prozess_dat_show.inc.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/inc/prozess_dat_show.inc.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,81 +1,101 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 03/2012
- * 
- * Anlisten Prozess - INDERT/UPDATE - Daten
- */
-
-
-            echo "<table>\n";
-            echo "<tr><td>Prozess-Bezeichnung: </td><td>" . $pz["bez"] . "<td></td></tr>\n";
-            echo "<tr><td>Prozess-Beschreibung: </td><td>" . nl2br($pz["bezl"]) . "<td></td></tr>\n";
-            // Produkt
-            $prod = $dbc->querySingleItem("SELECT prod_name FROM Produkt WHERE produkt_ID = ".$pz["prid"]);
-            echo "<tr><td>zu Produkt: </td><td>$prod<td></td></tr>\n";
-            // Auftraggeber
-            $aname = $dbc -> querySingleItem("SELECT CONCAT(nachname,', ',vorname) FROM Mitarbeiter WHERE persknr = " .$pz["persknra"]);
-            echo "<tr><td>Auftraggeber: </td><td>$aname<td></td></tr>\n";
-            // Verantwortlicherer
-            $vname = $dbc -> querySingleItem("SELECT CONCAT(nachname,', ',vorname) FROM Mitarbeiter WHERE persknr = " .$pz["persknr"]);
-            echo "<tr><td>Verantwortlicher: </td><td>$vname<td></td></tr>\n";
-            // zu Prozess
-            if ($pz['pzref'])
-            {
-                $prozref = $dbc -> querySingleItem("SELECT proz_bez FROM Prozess WHERE proz_ID = " .$pz['pzref']);
-                echo "<tr><td>geh&ouml;rt zu Prozess: </td><td>$prozref<td></td></tr>\n";
-            }
-            // Datums
-            if ($pz["psdat"])
-                {$sdat = new DateTime($pz["psdat"]); $sdat = $sdat->format("d.m.Y");}
-            else $sdat = "&nbsp;";
-            echo "<tr><td>Plan Startdatum: </td><td>$sdat</td></tr>\n";
-            if ($pz["pedat"])
-                {$sdat = new DateTime($pz["pedat"]); $sdat = $sdat->format("d.m.Y");}
-            else $sdat = "&nbsp;";
-            echo "<tr><td>Plan Enddatum: </td><td>$sdat</td></tr>\n";
-            echo "<tr><td>Plan Kosten: </td><td>".number_format($pz["pkost"],2,",",".")." &euro;</td></tr>\n";
-            if ($pz["sdat"])
-                {$sdat = new DateTime($pz["sdat"]); $sdat = $sdat->format("d.m.Y");}
-            else $sdat = "&nbsp;";
-            echo "<tr><td>Startdatum: </td><td>$sdat</td></tr>\n";
-            if ($pz["edat"])
-                {$sdat = new DateTime($pz["edat"]); $sdat = $sdat->format("d.m.Y");}
-            else $sdat = "&nbsp;";
-            echo "<tr><td>Enddatum: </td><td>$sdat</td></tr>\n";
-            echo "<tr><td>Kosten: </td><td>".number_format($pz["kost"],2,",",".")." &euro;</td></tr>\n";
-            // Arbeitsschritte
-            if (is_array($pz["step"]))
-            {
-                $arrstat = $dbc -> queryObjectArray("SELECT proz_stat_ID,proz_stat_bez FROM Proz_Status");
-                foreach ($arrstat as $row)
-                    $as[$row->proz_stat_ID] = $row->proz_stat_bez;
-                echo "<tr><td>Arbeitsschritte: </td>";
-                $i=0;
-                foreach ($pz["step"] as $step)
-                { 
-                    if ($next) $next ="<tr><td>&nbsp;</td>"; else $next =" ";
-                    if ($pz["del"][$i]) $stdel = "<span class='red'>&nbsp;GEL&Ouml;SCHT</span>"; else $stdel = "";
-                    if ($step) echo "$next<td>(".$pz["sort"][$i].")&nbsp;$step;&nbsp;<i>".$as[$pz["ststat"][$i]]."</i>;&nbsp;" .$pz["stbem"][$i]."$stdel</td></tr>\n";
-                    $i++;
-                }
-            }
-            // Dringlichkeit
-            if ($pz["urg"])
-            {
-                $urg = $dbc -> querySingleItem("SELECT proz_urg_bez FROM Proz_Dringlichkeit WHERE proz_urg_ID=".$pz["urg"]);
-                echo "<tr><td>Dringlichkeit: </td><td>$urg<td></td></tr>\n";                
-            }
-            // Status
-            if ($pz["stat"])
-            {
-                $stat = $dbc -> querySingleItem("SELECT proz_stat_bez FROM Proz_Status WHERE proz_stat_ID=".$pz["stat"]);
-                echo "<tr><td>Status: </td><td>$stat<td></td></tr>\n";                
-            }
-            // Bemerkung
-            if ($pz["bem"])
-                echo "<tr><td>Bemerkung: </td><td>" . nl2br($pz["bem"]) . "<td></td></tr>\n";
-            echo "</table>\n";
-
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 03/2012
+ * 
+ * Anlisten Prozess - INDERT/UPDATE - Daten
+ */
+
+
+            echo "<table>\n";
+            echo "<tr><td>Prozess-Bezeichnung: </td><td>" . $pz["bez"] . "<td></td></tr>\n";
+            echo "<tr><td>Prozess-Beschreibung: </td><td>" . nl2br($pz["bezl"]) . "<td></td></tr>\n";
+            // Produkt
+            $prod = $dbc->querySingleItem("SELECT prod_name FROM Produkt WHERE produkt_ID = ".$pz["prid"]);
+            echo "<tr><td>zu Produkt: </td><td>$prod<td></td></tr>\n";
+            // Auftraggeber
+            $aname = $dbc -> querySingleItem("SELECT CONCAT(nachname,', ',vorname) FROM Mitarbeiter WHERE persknr = " .$pz["persknra"]);
+            echo "<tr><td>Auftraggeber: </td><td>$aname<td></td></tr>\n";
+            // Verantwortlicherer
+            $vname = $dbc -> querySingleItem("SELECT CONCAT(nachname,', ',vorname) FROM Mitarbeiter WHERE persknr = " .$pz["persknr"]);
+            echo "<tr><td>Verantwortlicher: </td><td>$vname<td></td></tr>\n";
+            // zu Prozess
+            if ($pz['pzref'])
+            {
+                $prozref = $dbc -> querySingleItem("SELECT proz_bez FROM Prozess WHERE proz_ID = " .$pz['pzref']);
+                echo "<tr><td>geh&ouml;rt zu Prozess: </td><td>$prozref<td></td></tr>\n";
+            }
+            // Datums
+            if ($pz["psdat"])
+                {$sdat = new DateTime($pz["psdat"]); $sdat = $sdat->format("d.m.Y");}
+            else $sdat = "&nbsp;";
+            echo "<tr><td>Plan Startdatum: </td><td>$sdat</td></tr>\n";
+            if ($pz["pedat"])
+                {$sdat = new DateTime($pz["pedat"]); $sdat = $sdat->format("d.m.Y");}
+            else $sdat = "&nbsp;";
+            echo "<tr><td>Plan Enddatum: </td><td>$sdat</td></tr>\n";
+            echo "<tr><td>Plan Kosten: </td><td>".number_format($pz["pkost"],2,",",".")." &euro;</td></tr>\n";
+            if ($pz["sdat"])
+                {$sdat = new DateTime($pz["sdat"]); $sdat = $sdat->format("d.m.Y");}
+            else $sdat = "&nbsp;";
+            echo "<tr><td>Startdatum: </td><td>$sdat</td></tr>\n";
+            if ($pz["edat"])
+                {$sdat = new DateTime($pz["edat"]); $sdat = $sdat->format("d.m.Y");}
+            else $sdat = "&nbsp;";
+            echo "<tr><td>Enddatum: </td><td>$sdat</td></tr>\n";
+            echo "<tr><td>Kosten: </td><td>".number_format($pz["kost"],2,",",".")." &euro;</td></tr>\n";
+            // Arbeitsschritte
+            if (is_array($pz["step"]))
+            {
+                $arrstat = $dbc -> queryObjectArray("SELECT proz_stat_ID,proz_stat_bez FROM Proz_Status");
+                foreach ($arrstat as $row)
+                    $as[$row->proz_stat_ID] = $row->proz_stat_bez;
+                echo "<tr><td>Arbeitsschritte: </td>";
+                $i=0;
+                foreach ($pz["step"] as $step)
+                { 
+                    if ($next) $next ="<tr><td>&nbsp;</td>"; else $next =" ";
+                    if ($pz["del"][$i]) $stdel = "<span class='red'>&nbsp;GEL&Ouml;SCHT</span>"; else $stdel = "";
+                    if ($step) echo "$next<td>(".$pz["sort"][$i].")&nbsp;$step;&nbsp;<i>".$as[$pz["ststat"][$i]]."</i>;&nbsp;" .$pz["stbem"][$i]."$stdel</td></tr>\n";
+                    $i++;
+                }
+            }
+            // Dringlichkeit
+            if ($pz["urg"])
+            {
+                $urg = $dbc -> querySingleItem("SELECT proz_urg_bez FROM Proz_Dringlichkeit WHERE proz_urg_ID=".$pz["urg"]);
+                echo "<tr><td>Dringlichkeit: </td><td>$urg<td></td></tr>\n";                
+            }
+            // Status
+            if ($pz["stat"])
+            {
+                $stat = $dbc -> querySingleItem("SELECT proz_stat_bez FROM Proz_Status WHERE proz_stat_ID=".$pz["stat"]);
+                echo "<tr><td>Status: </td><td>$stat<td></td></tr>\n";                
+            }
+            // Raum-Arbeitsgruppen            
+            if (is_array($pz["rag"]) && count($pz["rag"])>0)
+            {
+                $arrag = $dbc -> queryObjectArray("SELECT rag_ID,CONCAT(abt_name,': ',rag_bez) AS rag 
+                                                    FROM fhiiqm.RaumArb_Gruppe rag
+                                                    LEFT OUTER JOIN Abteilung a ON rag.abt_ID=a.abt_ID
+                                                    ORDER BY rag.abt_ID,rag_bez");
+                foreach ($arrag as $row)
+                    $rag[$row->rag_ID] = $row->rag;
+                echo "<tr><td>betroffene Arbeitsgruppen: </td>";
+                $i=0;
+                $next = null;
+                foreach ($pz["rag"] as $ag)
+                { 
+                    if ($next) $next ="<tr><td>&nbsp;</td>"; else $next =" ";
+                    if ($pz["delag"][$i]) $stdel = "<span class='red'>&nbsp;GEL&Ouml;SCHT</span>"; else $stdel = "";
+                    if ($ag > 0) echo "$next<td>".$rag[$pz["rag"][$i]]."$stdel</td></tr>\n";
+                    $i++;
+                }
+            }
+            // Bemerkung
+            if ($pz["bem"])
+                echo "<tr><td>Bemerkung: </td><td>" . nl2br($pz["bem"]) . "<td></td></tr>\n";
+            echo "</table>\n";
+
 ?>
\ No newline at end of file
--- a/fhiiqm/info_ed3.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/info_ed3.php	Fri Dec 20 15:19:32 2013 +0100
@@ -255,7 +255,7 @@
     echo "<div align='center'>";
     if ($infid) $text = "editieren"; else $text = "erfassen";
     if ($copy) $duptext = " (Kopie)";
-    echo "<h3>Gesch&auml;ftsverteilungsplan $text$duptext<h3>";
+    echo "<h3>Gesch&auml;ftsverteilungsplan $text$duptext</h3>";
 
     echo "</div>\n";
 
--- a/fhiiqm/keydepot_user_list.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/keydepot_user_list.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,112 +1,112 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 07/2013
- * 
- * Liste Depotverwalter+Rechte
- */
-
-    error_reporting(E_ALL ^ E_NOTICE);
-    
-    session_start();
-    if (! isset($_SESSION["userid"]))
-    { 
-        include_once ("inc/func_lib.inc.php");	
-        login($_SERVER['PHP_SELF']);
-        exit;
-    }
-    
-    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("kr",$_SESSION["recht"]) && !in_array("ke",$_SESSION["recht"])))
-    {
-        header("Location: start.php");
-        exit;
-    }    
-
-	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
-	$dbc = new dbconnection();
-    $redit = 0;
-    $uid = $_SESSION["userid"];
-    $sql = "SELECT edit FROM KeyDepot_userweb WHERE depot_ID = 'FHI' AND userid = '$uid'";
-    $redit = $dbc -> querySingleItem($sql);
-    if (!$redit)   
-    {
-        header("Location: start.php");
-        exit;
-    }    
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
-   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
-    <link type="text/css" href="/fhiiqm/css/jquery/ui-lightness-1.8.21/jquery-ui-1.8.21.custom.css" rel="Stylesheet" />	
-    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-1.7.2.min.js"></script>
-    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-ui-1.8.21.custom.min.js"></script>
-	<title>KeyDepot-Verwalter+Rechte</title>
-
-</head>
-
-<body>
-<?php
-    echo "&nbsp;";  
-        echo "<div class=\"float-br smaller sc\" valign='top'>";
-        echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
-        echo "&nbsp;&nbsp;&nbsp;<a href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
-        echo "<div class=\"float-r sc\"><img src=\"/fhiiqm/img/key.png\" border=\"0\" alt=\"key\" title=\"key\"/></div>\n";
-
-    echo "<div align='center'><h3>Schl&uuml;sseltyp-Depot Verwalter und Rechte</h3>\n";
-    echo "<p>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten Rechte Schl&uuml;sseltyp-Depotverwalter</p>";
-    $sql = "SELECT u.userid,
-            	SUM(CASE depot_ID WHEN 'FHI' THEN d.edit+1 END) AS FHI,
-            	SUM(CASE depot_ID WHEN 'AC' THEN d.edit+1 END) AS AC,
-            	SUM(CASE depot_ID WHEN 'CP' THEN d.edit+1 END) AS CP,
-            	SUM(CASE depot_ID WHEN 'ELA' THEN d.edit+1 END) AS ELab,
-            	SUM(CASE depot_ID WHEN 'FWT' THEN d.edit+1 END) AS FWT,
-            	SUM(CASE depot_ID WHEN 'HT' THEN d.edit+1 END) AS HT,
-            	SUM(CASE depot_ID WHEN 'MP' THEN d.edit+1 END) AS MP,
-            	SUM(CASE depot_ID WHEN 'PC' THEN d.edit+1 END) AS PC,
-            	SUM(CASE depot_ID WHEN 'TH' THEN d.edit+1 END) AS TH
-            	FROM user_recht u LEFT OUTER JOIN KeyDepot_userweb d ON u.userid=d.userid
-                WHERE u.recht_ID = 'ke'   
-            	GROUP BY u.userid";
-    $result = $dbc -> queryObjectArray($sql);
-    if ($result)
-    {
-        $adep = array("FHI","AC","CP","MP","PC","TH","ELab","FWT","HT");
-		$bg1 = "#F8F8F8";
-		$bg2 = "#DEDFE1";
-		$bg = "#FFFFFF";
-        echo "<table width='35%' border='0' cellspacing='2' cellpadding='2'>\n";
-        echo "<tr bgcolor='#68ACBF'><th>userid</th><th>FHI</th><th>AC</th><th>CP</th><th>MP</th><th>PC</th><th>TH</th><th>E-Lab</th><th>FWT</th><th>HT</th><th></th></tr>\n";
-        foreach ($result as $row)
-        {
-			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-            echo "<tr bgcolor='" . $bg . "'>";
-            echo "<td><b>$row->userid</b></td>";
-            foreach ($adep as $dep)
-            {
-                if ($row->$dep == 2)
-                    $recht = "x+ed";
-                elseif ($row->$dep == 1)
-                    $recht = "x";
-                else $recht = "";
-                echo "<td class='center'><b>$recht</b></td>";
-            }
-//            echo "<td>".($row->FHI == 2)? "x+ed" : (($row->FHI == 1)? "x" : "")."</td>";
-            if (in_array("ke",$_SESSION["recht"]))
-                echo "<td><a href='/fhiiqm/keydepot_user_ed.php?u=$row->userid'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
-            else echo "<td>&nbsp;</td>";
-            echo "</tr>\n";
-        }
-        echo "</table>\n";
-        echo "<p>Legende: 'x' - Depot verwalten, 'ed' - Depotkorrekturen, Transfer von Schl&uuml;sseltypen zwischen Depots</p>\n";
-        echo "</div>\n";
-//        echo "<p class='sc'>&nbsp;&nbsp;&nbsp;<a href=\"keydepot_user_ed.php\" target=\"_self\" title=\"Rechte DepotVw erfassen\">Schl&uuml;ssel-Depotverwalter Rechte erfassen</a></p>\n"; 
-    }
-?>
-</body>
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 07/2013
+ * 
+ * Liste Depotverwalter+Rechte
+ */
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    session_start();
+    if (! isset($_SESSION["userid"]))
+    { 
+        include_once ("inc/func_lib.inc.php");	
+        login($_SERVER['PHP_SELF']);
+        exit;
+    }
+    
+    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("kr",$_SESSION["recht"]) && !in_array("ke",$_SESSION["recht"])))
+    {
+        header("Location: start.php");
+        exit;
+    }    
+
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+	$dbc = new dbconnection();
+    $redit = 0;
+    $uid = $_SESSION["userid"];
+    $sql = "SELECT edit FROM KeyDepot_userweb WHERE depot_ID = 'FHI' AND userid = '$uid'";
+    $redit = $dbc -> querySingleItem($sql);
+    if (!$redit)   
+    {
+        header("Location: start.php");
+        exit;
+    }    
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
+   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
+    <link type="text/css" href="/fhiiqm/css/jquery/ui-lightness-1.8.21/jquery-ui-1.8.21.custom.css" rel="Stylesheet" />	
+    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-1.7.2.min.js"></script>
+    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-ui-1.8.21.custom.min.js"></script>
+	<title>KeyDepot-Verwalter+Rechte</title>
+
+</head>
+
+<body>
+<?php
+    echo "&nbsp;";  
+        echo "<div class=\"float-br smaller sc\" valign='top'>";
+        echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+        echo "&nbsp;&nbsp;&nbsp;<a href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+        echo "<div class=\"float-r sc\"><img src=\"/fhiiqm/img/key.png\" border=\"0\" alt=\"key\" title=\"key\"/></div>\n";
+
+    echo "<div align='center'><h3>Schl&uuml;sseltyp-Depot Verwalter und Rechte</h3>\n";
+    echo "<p>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten Rechte Schl&uuml;sseltyp-Depotverwalter</p>";
+    $sql = "SELECT u.userid,
+            	SUM(CASE depot_ID WHEN 'FHI' THEN d.edit+1 END) AS FHI,
+            	SUM(CASE depot_ID WHEN 'AC' THEN d.edit+1 END) AS AC,
+            	SUM(CASE depot_ID WHEN 'CP' THEN d.edit+1 END) AS CP,
+            	SUM(CASE depot_ID WHEN 'ELA' THEN d.edit+1 END) AS ELab,
+            	SUM(CASE depot_ID WHEN 'FWT' THEN d.edit+1 END) AS FWT,
+            	SUM(CASE depot_ID WHEN 'HT' THEN d.edit+1 END) AS HT,
+            	SUM(CASE depot_ID WHEN 'MP' THEN d.edit+1 END) AS MP,
+            	SUM(CASE depot_ID WHEN 'PC' THEN d.edit+1 END) AS PC,
+            	SUM(CASE depot_ID WHEN 'TH' THEN d.edit+1 END) AS TH
+            	FROM user_recht u LEFT OUTER JOIN KeyDepot_userweb d ON u.userid=d.userid
+                WHERE u.recht_ID = 'ke'   
+            	GROUP BY u.userid";
+    $result = $dbc -> queryObjectArray($sql);
+    if ($result)
+    {
+        $adep = array("FHI","AC","CP","MP","PC","TH","ELab","FWT","HT");
+		$bg1 = "#F8F8F8";
+		$bg2 = "#DEDFE1";
+		$bg = "#FFFFFF";
+        echo "<table width='35%' border='0' cellspacing='2' cellpadding='2'>\n";
+        echo "<tr bgcolor='#68ACBF'><th>userid</th><th>FHI</th><th>AC</th><th>CP</th><th>MP</th><th>PC</th><th>TH</th><th>E-Lab</th><th>FWT</th><th>HT</th><th></th></tr>\n";
+        foreach ($result as $row)
+        {
+			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+            echo "<tr bgcolor='" . $bg . "'>";
+            echo "<td><b>$row->userid</b></td>";
+            foreach ($adep as $dep)
+            {
+                if ($row->$dep == 2)
+                    $recht = "x+ed";
+                elseif ($row->$dep == 1)
+                    $recht = "x";
+                else $recht = "";
+                echo "<td class='center'><b>$recht</b></td>";
+            }
+//            echo "<td>".($row->FHI == 2)? "x+ed" : (($row->FHI == 1)? "x" : "")."</td>";
+            if (in_array("ke",$_SESSION["recht"]))
+                echo "<td><a href='/fhiiqm/keydepot_user_ed.php?u=$row->userid'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
+            else echo "<td>&nbsp;</td>";
+            echo "</tr>\n";
+        }
+        echo "</table>\n";
+        echo "<p>Legende: 'x' - Depot verwalten, 'ed' - Depotkorrekturen, Transfer von Schl&uuml;sseltypen zwischen Depots</p>\n";
+        echo "</div>\n";
+//        echo "<p class='sc'>&nbsp;&nbsp;&nbsp;<a href=\"keydepot_user_ed.php\" target=\"_self\" title=\"Rechte DepotVw erfassen\">Schl&uuml;ssel-Depotverwalter Rechte erfassen</a></p>\n"; 
+    }
+?>
+</body>
 </html>
\ No newline at end of file
--- a/fhiiqm/keytyp_ma_search.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/keytyp_ma_search.php	Fri Dec 20 15:19:32 2013 +0100
@@ -46,7 +46,7 @@
           $(document).ready(function() {
             $("#ma").focus();
             $("#ma").autocomplete({
-                    source: "/fhiiqm/inc/ma_list_ac.inc.php",
+                    source: "/fhiiqm/inc/ma_list_ac.inc.php?g=1",
         			minLength: 2,
                     select: function(event,ui){$("#pid").val(ui.item.id);
                                                 $("#s").val(1);},
--- a/fhiiqm/keytyp_tract_ma.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/keytyp_tract_ma.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,269 +1,270 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 06/2013
- * 
- * Keytyp Transaktion Depot - MA
- */
-
-    error_reporting(E_ALL ^ E_NOTICE);
-    
-    session_start();
-    if (! isset($_SESSION["userid"]))
-    { 
-        include_once ("inc/func_lib.inc.php");	
-        login($_SERVER["PHP_SELF"]);
-        exit;
-    }
-    
-    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("kr",$_SESSION["recht"]) && !in_array("ke",$_SESSION["recht"])))
-    {
-        header("Location: start.php");
-        exit;
-    }    
-
-	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
-	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
-    
-    // zulaessige Depots
-    $uid = $_SESSION["userid"];
-    $sql = "SELECT depot_ID FROM KeyDepot_userweb WHERE userid = '$uid'";
-    $res = $dbc -> queryObjectArray($sql);
-    foreach ($res as $row)
-        $adep[] = $row->depot_ID;
-//    print_r($adep); echo "<br />";
-    $aaction = array("get" => "R&uuml;cknahme", "out" => "Ausgabe", "lost" => "Verlust"); //Bezeichnung Transfer
-
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/> 
-   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/> 
-	<title>Keytyp MA transferieren</title>
-</head>
-
-<body>
-
-<?php
-    echo "&nbsp;";  
-    echo "<div class=\"float-br smaller\" valign='top'>";
-    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
-    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
-    echo "<div class=\"float-r\"><img src=\"img/key.png\" border=\"0\" alt=\"Keytyp transferieren\" title=\"Depotverwaltung Schl&uuml;sseltyp\"/></div>\n";
-
-    echo "<div align=\"center\">";
-    echo "<h3>Schl&uuml;ssel-Transfer Depot <-> Mitarbeiter</h3>";
-    echo "</div>\n";
-    if (!isset($adep))
-        echo "<p class='red'>&nbsp;&nbsp;&nbsp;Sie haben nicht das Recht, Transfers von Schl&uuml;sseln zu Mitarbeitern vorzunehmen. Bitte wenden Sie sich an Frau Kohl.</p>";
-    else
-    {
-
-        $out = $_POST["out"];
-        $get = $_POST["get"];
-        $lost = $_POST["lost"];
-        $ky  = $_POST["ky"];
-        if (!isset($ky["anz"])) $ky["anz"]=1;
-        
-//print_r($ky); echo "<br />";
-        if (isset($ky) && $get)
-        {
-            $sql = "SELECT IFNULL(SUM(CASE WHEN pers_action='get' THEN IFNULL(pers_anz,0) ELSE 0 END),0) - IFNULL(SUM(CASE WHEN pers_action='out' THEN IFNULL(pers_anz,0) ELSE 0 END),0) - IFNULL(SUM(CASE WHEN pers_action='lost' THEN IFNULL(pers_anz,0) ELSE 0 END),0) AS bestand
-                                FROM fhiiqm.Keytyp_MA WHERE persknr='".$ky["ma"]."' AND keytyp_ID = '". $ky["kt"] ."'";
-            $anzma = $dbc->querySingleItem($sql);
-            if (is_numeric($ky["anz"]) && $anzma < $ky["anz"]) $err = "Rücknahme: Bestand '". $ky["kt"] ."' Mitarbeiter '". $ky["ma"] . "':  <b>$anzma < ".$ky["anz"]."</b> (Transfer-Anzahl)!";
-        }
-        if (isset($ky) && $lost)
-        {
-            $sql = "SELECT IFNULL(SUM(CASE WHEN pers_action='get' THEN IFNULL(pers_anz,0) ELSE 0 END),0) - IFNULL(SUM(CASE WHEN pers_action='out' THEN IFNULL(pers_anz,0) ELSE 0 END),0) - IFNULL(SUM(CASE WHEN pers_action='lost' THEN IFNULL(pers_anz,0) ELSE 0 END),0) AS bestand
-                                FROM fhiiqm.Keytyp_MA WHERE persknr='".$ky["ma"]."' AND keytyp_ID = '". $ky["kt"] ."'";
-            $anzma = $dbc->querySingleItem($sql);
-            if (is_numeric($ky["anz"]) && $anzma < $ky["anz"]) $err = "Verlust: Bestand '". $ky["kt"] ."' Mitarbeiter '". $ky["ma"] . "':  <b>$anzma < ".$ky["anz"]."</b> (Transfer-Anzahl)!";
-        }
-        if (isset($ky) && $out)
-        {
-            $sql = "SELECT IFNULL(SUM(CASE WHEN depot_action='get' THEN IFNULL(depot_anz,0) ELSE 0 END),0) - IFNULL(SUM(CASE WHEN depot_action='out' THEN IFNULL(depot_anz,0) ELSE 0 END),0) - IFNULL(SUM(CASE WHEN depot_action='lost' THEN IFNULL(depot_anz,0) ELSE 0 END),0) AS bestand
-                                FROM fhiiqm.Keytyp_Depot WHERE depot_ID='".$ky["dep"]."' AND keytyp_ID = '". $ky["kt"] ."'";
-            $anzdep = $dbc->querySingleItem($sql);
-            if (is_numeric($ky["anz"]) && $anzdep < $ky["anz"]) $err = "Ausgabe: Bestand '". $ky["kt"] ."' Depot '".$ky["dep"]."':  <b>$anzdep < ".$ky["anz"]."</b> (Transfer-Anzahl)!";
-        }
-        if (isset($ky["anz"]) && !is_numeric($ky["anz"]) && ($out || $get || $lost)) $err = "Anzahl ist ncht numerisch!";
-
-        if (!isset($ky) || (!$out && !$get && !$lost) || $err)
-        {
-            /* form: 'accept-charset="utf-8"' wegen Umlauten in Formfeldern und Nichtnutzen mysqli, sondern sp für INSERTS */
-?>
-            <div align="center">
-            <h5>* - Felder sind erforderlich!</h5>
-            </div>
-            <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_key" accept-charset="utf-8">
-            <div align="center">
-            <?php
-                if ($err) echo "<p class='red'>$err</p>\n";
-            ?>
-            <table width="55%" border="0" cellspacing="3" cellpadding="3">
-
-                <tr>
-                    <td>Depot *</td><td>Schl&uuml;sseltyp *</td><td>Anzahl *</td><td>Mitarbeiter *</td>
-                </tr>
-                <tr>
-                    <td><select name="ky[dep]" onchange="this.form.submit();">
-                        <?php
-                            $strdep = "'". implode("','",$adep) ."'";
-                            $sql = "SELECT * FROM fhiiqm.KeyDepot WHERE depot_ID IN ($strdep)";
-                            if ($res = $dbc -> queryObjectArray($sql))
-                                foreach ($res as $row)
-                                {
-                                   if (!$ky['dep'] && !$beg)  $ky['dep'] = $row->depot_ID;
-                                   if ($row->depot_ID == $ky['dep']) $select = "selected='selected'"; else $select = "";
-        					       echo "<option $select value=\"$row->depot_ID\">$row->depot_ID: $row->depot_bez</option>\n";
-                                   $beg=1;
-                                }
-                            $beg=0;
-                        ?>
-                    </select>
-                    </td>
-                    <td><select name="ky[kt]" onchange="this.form.submit();">
-                        <?php
-                            $sql = "SELECT key_level,d.keytyp_ID,keytyp_bez,
-                                        SUM(CASE WHEN depot_action='get' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='out' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='lost' THEN IFNULL(depot_anz,0) ELSE 0 END) AS bestand
-                                        FROM fhiiqm.Keytyp_Depot d INNER JOIN Keytyp k ON d.keytyp_ID=k.keytyp_ID 
-                                        WHERE depot_ID = '" . $ky['dep'] . "'
-                                    GROUP BY key_level,d.keytyp_ID,keytyp_bez";
-                            if ($res = $dbc -> queryObjectArray($sql))
-                                foreach ($res as $row)
-                                {
-                                   if (!$ky['kt'] && !$beg)
-                                        $ky['kt'] = $row->keytyp_ID;
-                                   if ($row->keytyp_ID == $ky['kt']) $select = "selected='selected'"; else $select = "";
-        					       echo "<option $select value=\"$row->keytyp_ID\">$row->key_level - $row->keytyp_ID [$row->keytyp_bez] ($row->bestand)</option>\n";
-                                   $beg=1;
-                                }
-                            $beg=0;
-                        ?>
-                    </select>
-                    </td>
-                    <td><input class="right" name="ky[anz]" type="text" size="5" maxlength="3" value="<?php echo $ky['anz']; ?>" /></td>
-                    <td><select name="ky[ma]" onchange="this.form.submit();">
-                        <?php
-                            if ($ky['dep'] == 'FHI') $wher = " WHERE 1=1"; 
-                            else $wher = "INNER JOIN KeyDepot_Abteilung k ON a.abt_ID=k.abt_ID WHERE depot_ID = '" . $ky['dep'] . "'"; 
-                            $sql = "SELECT persknr,CONCAT(TRIM(nachname), ', ',IFNULL(vorname,''),' (',CASE aktiv WHEN 0 THEN 'inaktiv' ELSE 'aktiv' END, ')') AS nvname
-                                    FROM fhiiqm.Mitarbeiter m INNER JOIN Abteilung a ON m.abt_tel=a.abt_ID 
-                                    $wher AND m.aktiv<2
-                                    ORDER BY nvname";
-//                            echo "$sql<br />";
-                            if ($res = $dbc -> queryObjectArray($sql))
-                            {
-                                foreach ($res as $row)
-                                    $apers[] = $row->persknr;
-                                if (!in_array($ky['ma'],$apers)) $ky['ma'] = null;
-                                foreach ($res as $row)
-                                {
-                                   if (!$ky['ma'] && !$beg)  $ky['ma'] = $row->persknr;
-                                   if ($row->persknr == $ky['ma']) $select = "selected='selected'"; else $select = "";
-        					       echo "<option $select value=\"$row->persknr\">$row->nvname</option>\n";
-                                   $beg=1;
-                                }
-                                $beg=0;
-                            }
-                        ?>
-                    </select>
-                        <?php
-                            $sql = "SELECT IFNULL(IFNULL(SUM(CASE WHEN pers_action='get' THEN IFNULL(pers_anz,0) ELSE 0 END),0) 
-                                    - IFNULL(SUM(CASE WHEN pers_action='out' THEN IFNULL(pers_anz,0) ELSE 0 END),0) 
-                                    - IFNULL(SUM(CASE WHEN pers_action='lost' THEN IFNULL(pers_anz,0) ELSE 0 END),0),0) AS bestand 
-                                    FROM Keytyp_MA WHERE persknr=".$ky['ma']." AND keytyp_ID='".$ky['kt']."'";
-//                            echo "sql anzahl keytyp_ID = $sql<br />";
-                            $anzkey = $dbc -> querySingleItem($sql);
-                            echo "&nbsp;&nbsp;&nbsp;($anzkey)";
-                        ?>
-                    </td>
-                </tr>
-                <tr><td>Bemerkung</td><td colspan="2"><textarea name="ky[bem]" cols="50" rows="2"><?php echo $ky['bem']; ?></textarea></td>
-                <?php
-                    // Schluessel / MA anzeigen
-                    $sql = "SELECT key_level,m.keytyp_ID,
-                            SUM(CASE WHEN pers_action='get' THEN IFNULL(pers_anz,0) ELSE 0 END) - 
-                            SUM(CASE WHEN pers_action='out' THEN IFNULL(pers_anz,0) ELSE 0 END) - 
-                            SUM(CASE WHEN pers_action='lost' THEN IFNULL(pers_anz,0) ELSE 0 END) AS bestand
-                            FROM fhiiqm.Keytyp_MA m INNER JOIN Keytyp k ON m.keytyp_ID=k.keytyp_ID
-                            WHERE persknr=".$ky['ma']." 
-                            GROUP BY key_level,m.keytyp_ID
-                            ORDER BY key_level,m.keytyp_ID";
-                    if ($res = $dbc -> queryObjectArray($sql))
-                    {
-                        echo "<td>";
-//                            echo "sql alle keytyp_ma = $sql<br />";
-                        foreach ($res as $row)
-                        {
-                            if (!$beg) $br = ""; else $br = "<br />";
-                            echo "$br$row->key_level - $row->keytyp_ID: $row->bestand";
-                            $beg=1;
-                        }
-                        echo "</td>";
-                    }
-                    echo "</tr>";
-                    if (in_array("ke",$_SESSION["recht"]))
-                    {
-                ?>
-                <tr><td></td><td><input class="button" type="submit" name="out" value="-> Ausgabe&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" title="Ausgabe"/></td></tr>
-                <tr><td></td><td><input class="button" type="submit" name="get" value="<- R&uuml;cknahme" title="Rueckgabe"/></td></tr>
-                <tr><td></td><td><input class="button" type="submit" name="lost" value="<- Verlust&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" title="Verlust"/></td></tr> 
-                <?php
-                    }
-                ?>
-            </table>
-<?php
-        }
-        else
-        {
-            echo "<div align=\"center\">";
-//            print_r($ky); echo "$get,$out,$lost<br />";
-            $umls = array("Ä","Ö","Ü","ä","ö","ü","ß");
-            $umlr = array("Ae","Oe","Ue","ae","oe","ue","ss");
-            if ($get) $action = "get";
-            elseif ($out) $action = "out";
-            elseif ($lost) $action = "lost";
-            if (isset($ky) && $ky)
-            {
-    //            $ky["bem"] = str_replace($umls,$umlr,str_replace("'","\"",substr($ky["bem"],0,100)));
-                $ky["bem"] = str_replace("'","\"",substr($ky["bem"],0,100));
-                $sql = "SELECT CONCAT(nachname,', ',IFNULL(vorname,'')) AS nvname FROM Mitarbeiter WHERE persknr=".$ky["ma"];
-                $nvname = $dbc->querySingleItem($sql);
-                if (is_numeric($ky["anz"]) && $ky["anz"] != 0)
-                {
-                    $sql = "CALL keytyp_tract_ma('".$ky["dep"]."','".$ky["ma"]."','".$ky["kt"]."',".$ky["anz"].",'$action','" .$ky["bem"]."',@suc)";
-                    $result = $dbc ->queryObjectArray($sql);
-//                    $suc = 1;
-//                    if ($suc)
-                    if ($dbc -> querySingleItem("SELECT @suc"))
-                            echo "<p class='green'><b>" . $aaction["$action"].": ".$ky["anz"]. " Schlüssel '". $ky['kt'] . 
-                            "' wurde(n) erfolgreich zwischen Depot '".$ky["dep"]. "' und '$nvname' transferiert.</b></p>\n";
-                    else
-                            echo "<p class='red'><b>" . $aaction["$action"].": ".$ky["anz"]. " Schlüssel '". $ky['kt'] . 
-                            "' konnte(n) nicht zwischen Depot '".$ky["dep"]. "' und '$nvname' transferiert werden.</b></p>\n";
-                } 
-                else
-                    echo "<p class='red'><b>" . $aaction["$action"].": '".$ky["anz"]. "' Schlüssel '". $ky['kt'] . 
-                    "' konnte(n) nicht zwischen Depot '".$ky["dep"]. "' und '$nvname' transferiert werden.</b></p>\n";
-                        
-                $sql = "SELECT SUM(CASE WHEN depot_action='get' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='out' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='lost' THEN IFNULL(depot_anz,0) ELSE 0 END) AS bestand
-                        FROM fhiiqm.Keytyp_Depot WHERE depot_ID='".$ky["dep"]."' AND keytyp_ID = '". $ky["kt"] ."'";
-                $anzdep = $dbc->querySingleItem($sql);
-                
-                echo "<p>Aktueller Bestand Schlüsseltyp '". $ky["kt"] ."' im Depot ". $ky["dep"] . ": $anzdep</p><br /><br />\n";
-            }
-            echo "</div>\n";
-            echo "<p class='sc'>&nbsp;&nbsp;&nbsp;<a href=\"".$_SERVER["PHP_SELF"]."\" target=\"_self\" title=\"Transfer Depot-MA\">Weiterer Transfer Depot-MA</a></p>\n";    
-      }
-  }
-?>
-
-</body>
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 06/2013
+ * 
+ * Keytyp Transaktion Depot - MA
+ */
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    session_start();
+    if (! isset($_SESSION["userid"]))
+    { 
+        include_once ("inc/func_lib.inc.php");	
+        login($_SERVER["PHP_SELF"]);
+        exit;
+    }
+    
+    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("kr",$_SESSION["recht"]) && !in_array("ke",$_SESSION["recht"])))
+    {
+        header("Location: start.php");
+        exit;
+    }    
+
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+    
+    // zulaessige Depots
+    $uid = $_SESSION["userid"];
+    $sql = "SELECT depot_ID FROM KeyDepot_userweb WHERE userid = '$uid'";
+    $res = $dbc -> queryObjectArray($sql);
+    foreach ($res as $row)
+        $adep[] = $row->depot_ID;
+//    print_r($adep); echo "<br />";
+    $aaction = array("get" => "R&uuml;cknahme", "out" => "Ausgabe", "lost" => "Verlust"); //Bezeichnung Transfer
+
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/> 
+   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/> 
+	<title>Keytyp MA transferieren</title>
+</head>
+
+<body>
+
+<?php
+    echo "&nbsp;";  
+    echo "<div class=\"float-br smaller\" valign='top'>";
+    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+    echo "<div class=\"float-r\"><img src=\"img/key.png\" border=\"0\" alt=\"Keytyp transferieren\" title=\"Depotverwaltung Schl&uuml;sseltyp\"/></div>\n";
+
+    echo "<div align=\"center\">";
+    echo "<h3>Schl&uuml;ssel-Transfer Depot <-> Mitarbeiter</h3>";
+    echo "</div>\n";
+    if (!isset($adep))
+        echo "<p class='red'>&nbsp;&nbsp;&nbsp;Sie haben nicht das Recht, Transfers von Schl&uuml;sseln zu Mitarbeitern vorzunehmen. Bitte wenden Sie sich an Frau Kohl.</p>";
+    else
+    {
+
+        $out = $_POST["out"];
+        $get = $_POST["get"];
+        $lost = $_POST["lost"];
+        $ky  = $_POST["ky"];
+        if (!isset($ky["anz"])) $ky["anz"]=1;
+        
+//print_r($ky); echo "<br />";
+        if (isset($ky) && $get)
+        {
+            $sql = "SELECT IFNULL(SUM(CASE WHEN pers_action='get' THEN IFNULL(pers_anz,0) ELSE 0 END),0) - IFNULL(SUM(CASE WHEN pers_action='out' THEN IFNULL(pers_anz,0) ELSE 0 END),0) - IFNULL(SUM(CASE WHEN pers_action='lost' THEN IFNULL(pers_anz,0) ELSE 0 END),0) AS bestand
+                                FROM fhiiqm.Keytyp_MA WHERE persknr='".$ky["ma"]."' AND keytyp_ID = '". $ky["kt"] ."'";
+            $anzma = $dbc->querySingleItem($sql);
+            if (is_numeric($ky["anz"]) && $anzma < $ky["anz"]) $err = "Rücknahme: Bestand '". $ky["kt"] ."' Mitarbeiter '". $ky["ma"] . "':  <b>$anzma < ".$ky["anz"]."</b> (Transfer-Anzahl)!";
+        }
+        if (isset($ky) && $lost)
+        {
+            $sql = "SELECT IFNULL(SUM(CASE WHEN pers_action='get' THEN IFNULL(pers_anz,0) ELSE 0 END),0) - IFNULL(SUM(CASE WHEN pers_action='out' THEN IFNULL(pers_anz,0) ELSE 0 END),0) - IFNULL(SUM(CASE WHEN pers_action='lost' THEN IFNULL(pers_anz,0) ELSE 0 END),0) AS bestand
+                                FROM fhiiqm.Keytyp_MA WHERE persknr='".$ky["ma"]."' AND keytyp_ID = '". $ky["kt"] ."'";
+            $anzma = $dbc->querySingleItem($sql);
+            if (is_numeric($ky["anz"]) && $anzma < $ky["anz"]) $err = "Verlust: Bestand '". $ky["kt"] ."' Mitarbeiter '". $ky["ma"] . "':  <b>$anzma < ".$ky["anz"]."</b> (Transfer-Anzahl)!";
+        }
+        if (isset($ky) && $out)
+        {
+            $sql = "SELECT IFNULL(SUM(CASE WHEN depot_action='get' THEN IFNULL(depot_anz,0) ELSE 0 END),0) - IFNULL(SUM(CASE WHEN depot_action='out' THEN IFNULL(depot_anz,0) ELSE 0 END),0) - IFNULL(SUM(CASE WHEN depot_action='lost' THEN IFNULL(depot_anz,0) ELSE 0 END),0) AS bestand
+                                FROM fhiiqm.Keytyp_Depot WHERE depot_ID='".$ky["dep"]."' AND keytyp_ID = '". $ky["kt"] ."'";
+            $anzdep = $dbc->querySingleItem($sql);
+            if (is_numeric($ky["anz"]) && $anzdep < $ky["anz"]) $err = "Ausgabe: Bestand '". $ky["kt"] ."' Depot '".$ky["dep"]."':  <b>$anzdep < ".$ky["anz"]."</b> (Transfer-Anzahl)!";
+        }
+        if (isset($ky["anz"]) && !is_numeric($ky["anz"]) && ($out || $get || $lost)) $err = "Anzahl ist ncht numerisch!";
+
+        if (!isset($ky) || (!$out && !$get && !$lost) || $err)
+        {
+            /* form: 'accept-charset="utf-8"' wegen Umlauten in Formfeldern und Nichtnutzen mysqli, sondern sp für INSERTS */
+?>
+            <div align="center">
+            <h5>* - Felder sind erforderlich!</h5>
+            </div>
+            <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_key" accept-charset="utf-8">
+            <div align="center">
+            <?php
+                if ($err) echo "<p class='red'>$err</p>\n";
+            ?>
+            <table width="55%" border="0" cellspacing="3" cellpadding="3">
+
+                <tr>
+                    <td>Depot *</td><td>Schl&uuml;sseltyp *</td><td>Anzahl *</td><td>Mitarbeiter *</td>
+                </tr>
+                <tr>
+                    <td><select name="ky[dep]" onchange="this.form.submit();">
+                        <?php
+                            $strdep = "'". implode("','",$adep) ."'";
+                            $sql = "SELECT * FROM fhiiqm.KeyDepot WHERE depot_ID IN ($strdep)";
+                            if ($res = $dbc -> queryObjectArray($sql))
+                                foreach ($res as $row)
+                                {
+                                   if (!$ky['dep'] && !$beg)  $ky['dep'] = $row->depot_ID;
+                                   if ($row->depot_ID == $ky['dep']) $select = "selected='selected'"; else $select = "";
+        					       echo "<option $select value=\"$row->depot_ID\">$row->depot_ID: $row->depot_bez</option>\n";
+                                   $beg=1;
+                                }
+                            $beg=0;
+                        ?>
+                    </select>
+                    </td>
+                    <td><select name="ky[kt]" onchange="this.form.submit();">
+                        <?php
+                            $sql = "SELECT key_level,d.keytyp_ID,keytyp_bez,
+                                        SUM(CASE WHEN depot_action='get' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='out' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='lost' THEN IFNULL(depot_anz,0) ELSE 0 END) AS bestand
+                                        FROM fhiiqm.Keytyp_Depot d INNER JOIN Keytyp k ON d.keytyp_ID=k.keytyp_ID 
+                                        WHERE depot_ID = '" . $ky['dep'] . "'
+                                    GROUP BY key_level,d.keytyp_ID,keytyp_bez";
+                            if ($res = $dbc -> queryObjectArray($sql))
+                                foreach ($res as $row)
+                                {
+                                   if (!$ky['kt'] && !$beg)
+                                        $ky['kt'] = $row->keytyp_ID;
+                                   if ($row->keytyp_ID == $ky['kt']) $select = "selected='selected'"; else $select = "";
+        					       echo "<option $select value=\"$row->keytyp_ID\">$row->key_level - $row->keytyp_ID [$row->keytyp_bez] ($row->bestand)</option>\n";
+                                   $beg=1;
+                                }
+                            $beg=0;
+                        ?>
+                    </select>
+                    </td>
+                    <td><input class="right" name="ky[anz]" type="text" size="5" maxlength="3" value="<?php echo $ky['anz']; ?>" /></td>
+                    <td><select name="ky[ma]" onchange="this.form.submit();">
+                        <?php
+                            if ($ky['dep'] == 'FHI') $wher = " WHERE 1=1"; 
+                            else $wher = "INNER JOIN KeyDepot_Abteilung k ON a.abt_ID=k.abt_ID WHERE depot_ID = '" . $ky['dep'] . "'"; 
+                            $sql = "SELECT persknr,CONCAT(TRIM(nachname), ', ',IFNULL(vorname,''),' (',
+                                        CASE aktiv WHEN 1 THEN 'aktiv' ELSE (CASE aktiv WHEN -1 THEN 'Gast' ELSE 'inaktiv' END) END, ')') AS nvname
+                                    FROM fhiiqm.Mitarbeiter m INNER JOIN Abteilung a ON m.abt_tel=a.abt_ID 
+                                    $wher AND ABS(m.aktiv)<2
+                                    ORDER BY nvname";
+//                            echo "$sql<br />";
+                            if ($res = $dbc -> queryObjectArray($sql))
+                            {
+                                foreach ($res as $row)
+                                    $apers[] = $row->persknr;
+                                if (!in_array($ky['ma'],$apers)) $ky['ma'] = null;
+                                foreach ($res as $row)
+                                {
+                                   if (!$ky['ma'] && !$beg)  $ky['ma'] = $row->persknr;
+                                   if ($row->persknr == $ky['ma']) $select = "selected='selected'"; else $select = "";
+        					       echo "<option $select value=\"$row->persknr\">$row->nvname</option>\n";
+                                   $beg=1;
+                                }
+                                $beg=0;
+                            }
+                        ?>
+                    </select>
+                        <?php
+                            $sql = "SELECT IFNULL(IFNULL(SUM(CASE WHEN pers_action='get' THEN IFNULL(pers_anz,0) ELSE 0 END),0) 
+                                    - IFNULL(SUM(CASE WHEN pers_action='out' THEN IFNULL(pers_anz,0) ELSE 0 END),0) 
+                                    - IFNULL(SUM(CASE WHEN pers_action='lost' THEN IFNULL(pers_anz,0) ELSE 0 END),0),0) AS bestand 
+                                    FROM Keytyp_MA WHERE persknr=".$ky['ma']." AND keytyp_ID='".$ky['kt']."'";
+//                            echo "sql anzahl keytyp_ID = $sql<br />";
+                            $anzkey = $dbc -> querySingleItem($sql);
+                            echo "&nbsp;&nbsp;&nbsp;($anzkey)";
+                        ?>
+                    </td>
+                </tr>
+                <tr><td>Bemerkung</td><td colspan="2"><textarea name="ky[bem]" cols="50" rows="2"><?php echo $ky['bem']; ?></textarea></td>
+                <?php
+                    // Schluessel / MA anzeigen
+                    $sql = "SELECT key_level,m.keytyp_ID,
+                            SUM(CASE WHEN pers_action='get' THEN IFNULL(pers_anz,0) ELSE 0 END) - 
+                            SUM(CASE WHEN pers_action='out' THEN IFNULL(pers_anz,0) ELSE 0 END) - 
+                            SUM(CASE WHEN pers_action='lost' THEN IFNULL(pers_anz,0) ELSE 0 END) AS bestand
+                            FROM fhiiqm.Keytyp_MA m INNER JOIN Keytyp k ON m.keytyp_ID=k.keytyp_ID
+                            WHERE persknr=".$ky['ma']." 
+                            GROUP BY key_level,m.keytyp_ID
+                            ORDER BY key_level,m.keytyp_ID";
+                    if ($res = $dbc -> queryObjectArray($sql))
+                    {
+                        echo "<td>";
+//                            echo "sql alle keytyp_ma = $sql<br />";
+                        foreach ($res as $row)
+                        {
+                            if (!$beg) $br = ""; else $br = "<br />";
+                            echo "$br$row->key_level - $row->keytyp_ID: $row->bestand";
+                            $beg=1;
+                        }
+                        echo "</td>";
+                    }
+                    echo "</tr>";
+                    if (in_array("ke",$_SESSION["recht"]))
+                    {
+                ?>
+                <tr><td></td><td><input class="button" type="submit" name="out" value="-> Ausgabe&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" title="Ausgabe"/></td></tr>
+                <tr><td></td><td><input class="button" type="submit" name="get" value="<- R&uuml;cknahme" title="Rueckgabe"/></td></tr>
+                <tr><td></td><td><input class="button" type="submit" name="lost" value="<- Verlust&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" title="Verlust"/></td></tr> 
+                <?php
+                    }
+                ?>
+            </table>
+<?php
+        }
+        else
+        {
+            echo "<div align=\"center\">";
+//            print_r($ky); echo "$get,$out,$lost<br />";
+            $umls = array("Ä","Ö","Ü","ä","ö","ü","ß");
+            $umlr = array("Ae","Oe","Ue","ae","oe","ue","ss");
+            if ($get) $action = "get";
+            elseif ($out) $action = "out";
+            elseif ($lost) $action = "lost";
+            if (isset($ky) && $ky)
+            {
+    //            $ky["bem"] = str_replace($umls,$umlr,str_replace("'","\"",substr($ky["bem"],0,100)));
+                $ky["bem"] = str_replace("'","\"",substr($ky["bem"],0,100));
+                $sql = "SELECT CONCAT(nachname,', ',IFNULL(vorname,'')) AS nvname FROM Mitarbeiter WHERE persknr=".$ky["ma"];
+                $nvname = $dbc->querySingleItem($sql);
+                if (is_numeric($ky["anz"]) && $ky["anz"] != 0)
+                {
+                    $sql = "CALL keytyp_tract_ma('".$ky["dep"]."','".$ky["ma"]."','".$ky["kt"]."',".$ky["anz"].",'$action','" .$ky["bem"]."',@suc)";
+                    $result = $dbc ->queryObjectArray($sql);
+//                    $suc = 1;
+//                    if ($suc)
+                    if ($dbc -> querySingleItem("SELECT @suc"))
+                            echo "<p class='green'><b>" . $aaction["$action"].": ".$ky["anz"]. " Schlüssel '". $ky['kt'] . 
+                            "' wurde(n) erfolgreich zwischen Depot '".$ky["dep"]. "' und '$nvname' transferiert.</b></p>\n";
+                    else
+                            echo "<p class='red'><b>" . $aaction["$action"].": ".$ky["anz"]. " Schlüssel '". $ky['kt'] . 
+                            "' konnte(n) nicht zwischen Depot '".$ky["dep"]. "' und '$nvname' transferiert werden.</b></p>\n";
+                } 
+                else
+                    echo "<p class='red'><b>" . $aaction["$action"].": '".$ky["anz"]. "' Schlüssel '". $ky['kt'] . 
+                    "' konnte(n) nicht zwischen Depot '".$ky["dep"]. "' und '$nvname' transferiert werden.</b></p>\n";
+                        
+                $sql = "SELECT SUM(CASE WHEN depot_action='get' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='out' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='lost' THEN IFNULL(depot_anz,0) ELSE 0 END) AS bestand
+                        FROM fhiiqm.Keytyp_Depot WHERE depot_ID='".$ky["dep"]."' AND keytyp_ID = '". $ky["kt"] ."'";
+                $anzdep = $dbc->querySingleItem($sql);
+                
+                echo "<p>Aktueller Bestand Schlüsseltyp '". $ky["kt"] ."' im Depot ". $ky["dep"] . ": $anzdep</p><br /><br />\n";
+            }
+            echo "</div>\n";
+            echo "<p class='sc'>&nbsp;&nbsp;&nbsp;<a href=\"".$_SERVER["PHP_SELF"]."\" target=\"_self\" title=\"Transfer Depot-MA\">Weiterer Transfer Depot-MA</a></p>\n";    
+      }
+  }
+?>
+
+</body>
 </html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/laser_report.php	Fri Dec 20 15:19:32 2013 +0100
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 10/2013
+ * 
+ * Reportauswahl Laser
+ * 
+ */
+
+
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    session_start();
+    if (! isset($_SESSION["userid"]))
+    { 
+        include_once ("inc/func_lib.inc.php");	
+        login($_SERVER["PHP_SELF"]);
+        exit;
+    }
+    
+    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("lr",$_SESSION["recht"]) && !in_array("le",$_SESSION["recht"])))
+    {
+        header("Location: start.php");
+        exit;
+    }    
+    
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="css/db.css" rel="STYLESHEET" type="TEXT/CSS" /> 
+   	<link href="css/navio.css" rel="STYLESHEET" type="TEXT/CSS" /> 
+	<meta name="author" content="Bettina Schwarzer,FHI" />
+
+	<title>Reports Laser</title>
+</head>
+
+<body>
+<?php
+    echo "&nbsp;";  
+    echo "<div class=\"float-br smaller\" valign='top'>";
+    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+    echo "<div class=\"float-r sc\"><img src=\"/fhiiqm/img/laser.png\" border=\"0\" alt=\"Berichte Laser\" title=\"Berichte Laser\"/></div>\n";
+?>
+    <h3>&nbsp;&nbsp;&nbsp;Berichte Laser</h3>
+    <div align="center">
+    <table width="94%" cellspacing="4" cellpadding="4">
+        <tr>
+            <td class="bigger">
+                <a href="/fhiiqm/report/laser_report.php" title="Laser">Laser</a>
+                <br />&nbsp;&nbsp;&nbsp;Auswahl: Abteilung, Haus, Raum-Nr. Laserklasse
+                <br />&nbsp;&nbsp;&nbsp;Ansicht: Laser-Bezeichnung, Art, KLasse, Standort, Abteilung, Verantwortlicher
+            </td>
+        </tr>
+   </table>
+    </div>    
+
+</body>
+</html>
\ No newline at end of file
--- a/fhiiqm/ldap_search_uid.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/ldap_search_uid.php	Fri Dec 20 15:19:32 2013 +0100
@@ -30,7 +30,7 @@
     {
 ?>
     <div align="center">
-    <p>Bitte geben Sie Nachname und Vorname des gesuchten Mitarbeiters ein.</p>
+    <p>Bitte geben Sie Nachname und/oder Vorname des gesuchten Mitarbeiters ein.</p>
     <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="flogin"> 
         <table border="0" cellspacing="1" cellpadding="0" bgcolor="#000066"><tr><td bgcolor="#e0e0e0">
         <table border="0" cellspacing="2" cellpadding="4">
@@ -58,13 +58,21 @@
         include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
         $sn = $user["sn"];
         $gn = $user["gn"];
-        $uid = ldap_search_uid($sn,$gn);
-        if (isset($uid) && $uid)
-            echo "<p class='green'>&nbsp;&nbsp;&nbsp;'$gn $sn' hat die userid <b>$uid</b></p>";
+        $info = ldap_search_uid($sn,$gn);
+        if (isset($info) && count($info))
+        {
+            for ($i=0; $i<count($info); $i++)
+            { 
+                $uid[$i] = $info[$i][0];
+                $cn[$i] = $info[$i][1];
+                $mail[$i] = $info[$i][2];
+                echo "<p class='green'>&nbsp;&nbsp;&nbsp;'$gn $sn': $cn[$i] hat die userid <b>$uid[$i]</b> -> mail: <a href='mailto:$mail[$i]'>$mail[$i]</a></p>";
+            }    
+        }    
         else
             echo "<p class='red'>&nbsp;&nbsp;&nbsp;'$gn $sn' hat keine userid im FHI.</p>";
             
-        echo "<p>&nbsp;&nbsp;&nbsp;<a href='".$_SERVER['PHP_SELF']."'>weitere userid ermitteln</a></p>";
+        echo "<p><br />&nbsp;&nbsp;&nbsp;<a href='".$_SERVER['PHP_SELF']."'>weitere userid ermitteln</a></p>";
     }
 
 ?>    
--- a/fhiiqm/logout.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/logout.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,22 +1,31 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 09/2011
- * 
- * Loeschen der Session
- */
-
-    session_start();
-    $_SESSION = array();
-/*    // session cookie loeschen, neuer leerer wird auf Server erstellt
-    if (ini_get("session.use_cookies")) {
-    $params = session_get_cookie_params();
-    setcookie(session_name(), '', time() - 42000, $params["path"],
-        $params["domain"], $params["secure"], $params["httponly"]
-    );
-    } */
-    session_destroy();
-    header("location: /fhiiqm/start.php");
-
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 09/2011
+ * 
+ * Loeschen der Session
+ */
+
+    session_start();
+/*    // session cookie loeschen, neuer leerer wird auf Server erstellt
+    if (ini_get("session.use_cookies")) {
+    $params = session_get_cookie_params();
+    setcookie(session_name(), '', time() - 42000, $params["path"],
+        $params["domain"], $params["secure"], $params["httponly"]
+    );
+    } */
+    if (isset($_SESSION['user']) && $_SESSION['user'])
+    {
+        unset($_SESSION['userid']);
+        unset($_SESSION['recht']);
+        unset($_SESSION["prodg"]);
+    }
+    else 
+    { 
+        $_SESSION = array();
+        session_destroy();
+    }
+    header("location: /fhiiqm/start.php");
+
 ?>
\ No newline at end of file
--- a/fhiiqm/ma_tel_ed.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/ma_tel_ed.php	Fri Dec 20 15:19:32 2013 +0100
@@ -106,10 +106,12 @@
               newdiv.innerHTML = "<span></span><select name='ma[abt][]'>"+opt;
               for (var key in arrg)  
               {
-                optg = optg.concat("<option value='",key,"'>",arrg[key],"</option>\n" );
+                var keym = parseInt(key.substr(1)); //key = abt_ID*1000+rag_ID wegen sort nach Abteilung
+                optg = optg.concat("<option value='",keym,"'>",arrg[key],"</option>\n" );
               }
               optg += "</select>\n";
               newdiv.innerHTML += "&nbsp;&nbsp;&nbsp;&nbsp;Arbeitsgruppe&nbsp;&nbsp;&nbsp;&nbsp;<select name='ma[rag][]'>"+optg;                
+              newdiv.innerHTML += "<img src='/fhiiqm/img/nixt.gif' border='0' height='100%' />";
               document.getElementById(divName).appendChild(newdiv);
               counter++;
             }  
@@ -173,7 +175,7 @@
                     $ma['titel']    = $row->titel;
                     $ma['abtm']     = $row->abt_tel;
                     $ma['email']    = $row->email;
-                    $ma['fhi']      = ($row->aktiv == 1)? 1 : 0;
+                    $ma['fhi']      = $row->aktiv;
                     $ma["tstmp"]    = $row->timestamp;
                     $ma["uid"]      = $row->userid;
                 }    
@@ -215,7 +217,7 @@
                 }
             }
         }
-        include ($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/form/ma_ed_form.inc.php");
+        include ($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/form/ma_tel_ed_form.inc.php");
         
 	  	if ($sub || $del)
         {
@@ -252,10 +254,10 @@
         $userid = $_SESSION["userid"];
         if ($del)
         {   
-            if ($ma["fhi"])
+            if ($ma["fhi"] == 1)
             {
                 // nur aktiv auf 0 setzen
-                $sql = "UPDATE Mitarbeiter SET aktiv=0, userid=$userid WHERE persknr = $pid";
+                $sql = "UPDATE Mitarbeiter SET aktiv=0, userid='$userid' WHERE persknr = $pid";
                 $retdi = $dbc -> execute($sql);
                 $sql = "DELETE FROM Mitarbeiter_Raum WHERE persknr = $pid";
                 $retdi = $dbc -> execute($sql);
@@ -286,7 +288,7 @@
             $stmt = $dbc -> stmtinit();
             if (is_object($stmt))
             {
-                if ($ma['fhi']) $aktiv = 1; else $aktiv = 2;
+//                if ($ma['fhi']) $aktiv = 1; else $aktiv = 2;
                 if ($ma['email'])
                 {
                     if (strpos($ma['email'],"@") > 0) $ma['email'] = $ma['email']; else $ma['email'] = $ma['email'] . "@fhi-berlin.mpg.de";
@@ -305,7 +307,7 @@
                                         aktiv = ?,
                                         userid = ?
                                         WHERE persknr = $pid");
-                    $stmt -> bind_param('ssssiis',$ma['name'],$ma['vname'],$ma['titel'],$ma['email'],$ma['abtm'], $aktiv, $userid);
+                    $stmt -> bind_param('ssssiis',$ma['name'],$ma['vname'],$ma['titel'],$ma['email'],$ma['abtm'], $ma['fhi'], $userid);
 //                    echo "UPDATE: ". var_dump($stmt);
                     $result = $stmt -> execute();
                     if ($stmt->error) echo "error UPDATE Mitarbeiter: " . $stmt->error . "<br><br>\n";
@@ -315,7 +317,7 @@
                     $sql = "SELECT MAX(persknr) FROM Mitarbeiter WHERE persknr < 9500";
                     $pid = $dbc -> querySingleItem($sql) + 1;
                     $stmt -> prepare ("INSERT INTO Mitarbeiter (persknr, nachname, vorname, titel,email,abt_tel,aktiv,userid) VALUES (?,?,?,?,?,?,?,?)"); 
-                    $stmt -> bind_param('issssiis',$pid,$ma['name'],$ma['vname'],$ma['titel'],$ma['email'],$ma['abt'][0], $aktiv, $userid);
+                    $stmt -> bind_param('issssiis',$pid,$ma['name'],$ma['vname'],$ma['titel'],$ma['email'],$ma['abt'][0], $ma['fhi'], $userid);
                     $result = $stmt -> execute();
                     if ($stmt->error) echo "error INSERT Mitarbeiter: " . $stmt->error . "<br><br>\n";
                     $ma['abtm'] = $ma['abt'][0];
--- a/fhiiqm/ma_tel_flist.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/ma_tel_flist.php	Fri Dec 20 15:19:32 2013 +0100
@@ -38,8 +38,8 @@
 
 <head>
 	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-   	<link href="http://achilleus.rz-berlin.mpg.de/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/> 
-   	<link href="http://achilleus.rz-berlin.mpg.de/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/> 
+   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/> 
+   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/> 
 
 	<title>MA/O-Telefonliste</title>
 </head>
@@ -111,7 +111,7 @@
     else
 //        $sql = "SELECT persknr, name, vorname, titel, abt_name, telefon_nr, telefon_typ, public, sort, geb_ID, raum_nr, email, aktiv FROM v_tel_list_ma_raum";
         $sql = "SELECT persknr, name, vorname, titel, abt_name, ag, telefon_nr, telefon_typ, public, sort, geb_ID, raum_nr, email, aktiv 
-                FROM v_tel_list_ag WHERE aktiv > 0";
+                FROM v_tel_list_ag WHERE ABS(aktiv) > 0";
     if ($filter)
     {
         if ($fnum > 3)
@@ -123,7 +123,7 @@
     // intern/extern
 	$ip=getenv("REMOTE_ADDR");
 	$ippart=explode(".",$ip);
-    if (($ippart[0] == 141 && $ippart[1] == 14) || ($ippart[0] == 172 && $ippart[1] == 16))
+    if (($ippart[0] == 141 && $ippart[1] == 14) || ($ippart[0] == 172 && $ippart[1] >= 16 && $ippart[1] <= 31) || ($ippart[0] == 10 && $ippart[1] == 0))
         $wip = "";
     else
         $wip = " AND public=1 "; 
--- a/fhiiqm/prozess_ed.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/prozess_ed.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,443 +1,515 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 03/2012
- * 
- * Prozess INSERT/UPDATE/DELETE/DUPLICATE
- */
-
-
-    error_reporting(E_ALL ^ E_NOTICE);
-    
-    session_start();
-    if (! isset($_SESSION["userid"]))
-    { 
-        include_once ("inc/func_lib.inc.php");	
-        login($_SERVER["PHP_SELF"]);
-        exit;
-    }
-    
-    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("pzr",$_SESSION["recht"]) && !in_array("pze",$_SESSION["recht"])))
-    {
-        header("Location: start.php");
-        exit;
-    }    
-
-    $zeil = $_GET["z"];
-    if (!$zeil) $zeil = 25; // Anzahl der gezeigten Zeilen
-    $start = $_GET["st"];   // Start bei DS $start+1
-    if (!$start) $start=0;
-	$sort   = $_GET["s"];   // Sortierung nach Spalte
-    $dir    = $_GET["d"];   // Sortierrichtung
-    $fnum   = $_GET["f"];   // Spaltennummer, nach der aktuell gefiltert wird
-    $filter = $_GET["b"];   // Filterbegriff
-    $getp = "?s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil";
-
-    $pzid  = $_GET["i"];
-    $del    = $_POST["del"];
-    $sub    = $_POST["eintragen"];
-    $dup    = $_POST["dup"];
-    if (!$dup) $dup = $_GET["dp"];
-    $copy   = $_GET["c"];
-	$pz    = $_POST["pz"];
-    $ok		= $_POST["ok"];
-    if (!$pz["okn"]) $ok = false;
-    $duptext="";
-
-	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
-    include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
-	$dbc = new dbconnection();
-    
-    $sql = "SELECT persknr FROM userweb WHERE userid ='" . $_SESSION["userid"] ."'";
-    $persknr = $dbc -> querySingleItem($sql);
-    
-    if ($dup)
-    {   // Prozess duplizieren
-        $tab = "Prozess";
-        $key = "proz_ID";
-        $val =  $pzid;
-//        $ret=1;
-        $ret = duplicate_record ($tab, $key, $val);
-        if ($ret)
-        { 
-            $pzid_new=$ret;
-            // duplizieren Schritte
-            $sql = "INSERT INTO Proz_Step SELECT NULL, $pzid_new, proz_step,step_stat_ID,step_bem FROM Proz_Step WHERE proz_ID=$pzid ORDER BY proz_step_ID";
-            $rets = $dbc -> execute($sql);
-            if ($ret && $rets)
-            {
-                $addr = $_SERVER["PHP_SELF"] . "?i=$pzid_new&c=1";
-                header("Location: $addr");
-                exit;
-            }
-            else $duptext = " - Fehler beim Duplizieren von '". $pz["bez"] ."'";    
-        }
-        else $duptext = " - Fehler beim Duplizieren von '". $pz["bez"] ."'";    
-    }
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-   	<link href="css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/> 
-   	<link href="css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/> 
-<!--
-    <link type="text/css" href="/fhiiqm/css/jquery/ui-lightness/jquery-ui-1.8.16.custom.css" rel="Stylesheet" />	
-    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-1.6.2.min.js"></script>
-    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
--->
-    <link type="text/css" href="/fhiiqm/css/jquery/ui-lightness-1.8.21/jquery-ui-1.8.21.custom.css" rel="Stylesheet" />	
-    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-1.7.2.min.js"></script>
-    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-ui-1.8.21.custom.min.js"></script>
-    
-    <script type="text/javascript">
-    //<!--
-        var counter = 0;
-        var limit = 99;
-        var arr = new Array();
-        function addInput(divId,anz){
-            if (counter == limit)  {
-              alert("Das Limit von " + counter + " zusätzlichen inputs ist erreicht");
-            }
-            else 
-            {
-            var newdiv = document.createElement('div');
-            var opt="<option value='-1'></option>";
-            var i;
-            for (var key in arr)  
-            {
-            opt = opt.concat("<option value='",key,"'>",arr[key],"</option>\n" );
-            }
-            opt += "</select>\n";
-            newdiv.innerHTML = "<span></span><input type='text' name='pz[step][]' size='50' maxlength='50' />";
-            newdiv.innerHTML += "&nbsp;&nbsp;&nbsp;&nbsp;Status&nbsp;&nbsp;&nbsp;<select name='pz[ststat][]'>"+opt;
-            newdiv.innerHTML += "&nbsp;&nbsp;Sort&nbsp;&nbsp;&nbsp;<input type='text' name='pz[sort][]' class='right' size='2' maxlength='2' value='' />";
-            newdiv.innerHTML += "<img src='/fhiiqm/img/nixt.gif' border='0' height='100%' />";
-            newdiv.innerHTML += "<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Bemerkung zu Schritt&nbsp;&nbsp;&nbsp;";
-            newdiv.innerHTML += "<input type='text' name='pz[stbem][]' size='50' maxlength='50' />";
-            newdiv.innerHTML += "<span id='cbl'>&nbsp;&nbsp;&nbsp;<input type='checkbox' id='del' name='pz[del][]' value='1'/>";
-            newdiv.innerHTML += "<label id='lb' for='del'>&nbsp;l&ouml;schen</label></span>";
-            document.getElementById(divId).appendChild(newdiv);
-            var delcb = document.getElementById('del');
-            delcb.id = "del_" + anz;
-            delcb.style.display = 'none';
-            var lcb = document.getElementById('lb');
-            lcb.id = "lb_" + anz;
-            lcb.setAttribute("for", delcb.id);
-            lcb.style.display = 'none';
-            counter++;
-            }
-        }
-        function markdelInput(divId,anz){
-            for (i=1; i<anz; i++)
-            {
-                var id = "del_" + i;
-                var delcb = document.getElementById(id);
-                delcb.style.display = 'inline';
-                var idl = "lb_" + i;
-                var lcb = document.getElementById(idl);
-                lcb.style.display = 'inline';
-            }
-        }
-        function delInput(divId){
-            var kn = document.getElementById(divId); 
-            while (kn.childNodes.length>0 && kn.lastChild.nodeName != "SPAN" && kn.lastChild.nodeName != "A")
-            {
-                //alert ("vor "+kn.lastChild.nodeName+", nodetyp = "+ kn.lastChild.nodeType);
-                var knc = kn.lastChild;
-                    document.getElementById(divId).removeChild(knc);
-            }
-            if (kn.lastChild.nodeName == "SPAN") document.getElementById(divId).removeChild(kn.lastChild);
-        }
-    //-->
-    </script>
-
-	<title>Edit Projekt</title>
-</head>
-
-<body>
-
-    <script>
-      $(document).ready(function() {
-        $("#bez").focus();
-        $("#pers").autocomplete({
-                source: "/fhiiqm/inc/ma_list_ac.inc.php",
-    			minLength: 2,
-                select: function(event,ui){$("#pid").val(ui.item.id);}
-    		});
-        $("#persa").autocomplete({
-                source: "/fhiiqm/inc/ma_list_ac.inc.php",
-    			minLength: 2,
-                select: function(event,ui){$("#paid").val(ui.item.id);}
-    		});
-        $("#sdat").datepicker({
-            dateFormat: 'yy-mm-dd', //nur Datum
-            yearRange: '2000:2025',
-            changeMonth: true,
-			changeYear: true,
-            firstDay: 1,
-            dayNamesMin: ['So','Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa' ],
-            monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez'] 
-        });
-        $("#edat").datepicker({
-            dateFormat: 'yy-mm-dd', //nur Datum
-            yearRange: '2000:2025',
-            changeMonth: true,
-			changeYear: true,
-            firstDay: 1,
-            dayNamesMin: ['So','Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa' ],
-            monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez'] 
-        });
-        $("#psdat").datepicker({
-            dateFormat: 'yy-mm-dd', //nur Datum
-            yearRange: '2000:2025',
-            changeMonth: true,
-			changeYear: true,
-            firstDay: 1,
-            dayNamesMin: ['So','Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa' ],
-            monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez'] 
-        });
-        $("#pedat").datepicker({
-            dateFormat: 'yy-mm-dd', //nur Datum
-            yearRange: '2000:2025',
-            changeMonth: true,
-			changeYear: true,
-            firstDay: 1,
-            dayNamesMin: ['So','Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa' ],
-            monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez'] 
-        });
-        $("input[id='pers']").addClass("long20");
-        $("input[id='persa']").addClass("long20");
-        });
-    </script>
-
-<?php
-    echo "&nbsp;";  
-    echo "<div class=\"float-br smaller\" valign='top'>";
-    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
-    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
-    echo "<div class=\"float-r\"><img src=\"img/sheduled_task.png\" border=\"0\" alt=\"Projekt &auml;ndern\" title=\"Projekt &auml;ndern\"/></div>\n";
-
-
-    echo "<div align='center'>";
-    if ($pzid) $text = "editieren"; else $text = "erfassen";
-    if ($copy) $duptext = " (Kopie)";
-    echo "<h3>Projekt $text$duptext<h3>";
-    
-    echo "</div>\n";
-    
-    if (!$ok || (!$sub && !$del && !$dup))
-    {
-        if ($pzid && (!$sub || !$del) && !isset($pz))
-        { // update
-            $sql = "SELECT proz_ID,produkt_ID,proz_bez,proz_bez_l,proz_start,proz_end,proz_kosten,
-                        proz_start_pl,proz_end_pl,proz_kost_pl,
-                        proz_urg_ID,proz_stat_ID,p.persknr,proz_ref_ID,proz_bem,persknr_a,
-                        CONCAT (m.nachname, ', ',m.vorname) AS vma,
-                        CONCAT (a.nachname, ', ',a.vorname) AS ama
-                    FROM Prozess p LEFT OUTER JOIN Mitarbeiter m
-                    ON p.persknr=m.persknr LEFT OUTER JOIN Mitarbeiter a
-                    ON p.persknr_a=a.persknr
-                    WHERE proz_ID = $pzid";
-            if ($res = $dbc -> queryObjectArray($sql))
-            {
-                foreach ($res as $row)
-                {
-                    $pz["pzid"] = $pzid;
-                    $pz["bez"] = $row->proz_bez;
-                    $pz["bezl"] = $row->proz_bez_l;
-                    $pz["prid"] = $row->produkt_ID;
-                    $pz["psdat"] = $row->proz_start_pl;
-                    $pz["pedat"] = $row->proz_end_pl;
-                    $pz["pkost"] = str_replace('.',',',$row->proz_kost_pl);
-                    $pz["sdat"] = $row->proz_start;
-                    $pz["edat"] = $row->proz_end;
-                    $pz["kost"] = str_replace('.',',',$row->proz_kosten);
-                    $pz["urg"] = $row->proz_urg_ID;
-                    $pz["stat"] = $row->proz_stat_ID;
-                    $pz["persknr"] = $row->persknr;
-                    $pz["pzref"] = $row->proz_ref_ID;
-                    $pz["bem"] = $row->proz_bem;
-                    $pz["persknra"] = $row->persknr_a;
-                    $pz["persa"] = $row->ama;
-                    $pz["pers"] = $row->vma;
-                }
-            }
-            // Daten aus Proz_Step
-            $sql = "SELECT proz_step,step_sort,step_stat_ID,step_bem FROM Proz_Step WHERE proz_ID = $pzid ORDER BY step_sort";
-            if ($ress = $dbc -> queryObjectArray($sql))
-            {
-                foreach ($ress as $row)
-                {
-                    $pz["step"][] = $row->proz_step;
-                    $pz["sort"][] = $row->step_sort;
-                    $pz["ststat"][] = $row->step_stat_ID;
-                    $pz["stbem"][] = $row->step_bem;
-                }
-            }
-
-        }
-        include($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/form/prozess_form.inc.php");
-        if ($sub || $del)
-		{
-		  	if ($sub)
-                $frage = "Alle Angaben ok?";
-            elseif ($del)
-                $frage = "Projekt wirklich l&ouml;schen?";
-			echo "<tr>
-			  <td class=\"red\" valign=\"top\" align=\"left\">$frage</td>
-			        <td><input type=\"checkbox\" name=\"ok\" value=\"1\"";
-			        if ($ok)  echo "checked=\"checked\""; 
-			echo " /></td>\n</tr>\n"; 
-		}
-        if (!is_null($_SESSION["recht"]) && in_array("pze",$_SESSION["recht"]))
-        {
-            echo "
-           	<tr><td>&nbsp;</td>\n
-            	<td><input  class=\"button\" type=\"submit\" name=\"eintragen\" value=\"  eintragen  \" />";
-            if ($pzid)
-            {
-                echo "&nbsp;&nbsp;&nbsp;<input class=\"buttonr\" type=\"submit\" value=\"l&ouml;schen\" name=\"del\" title=\"delete\" />";
-                echo "&nbsp;&nbsp;&nbsp;<input class=\"button\" type=\"submit\" value=\"duplizieren\" name=\"dup\" title=\"delete\" />";
-            }    
-           	echo "</td></tr>\n";
-        }
-        echo "</table>\n";
-        echo "</div>\n";
-//            if (!is_null($_SESSION["recht"]) && !in_array("le", $_SESSION["recht"]))
-            echo "<p class='sc'>&nbsp;&nbsp;&nbsp;<a href=\"prozess_flist.php$getp\" target=\"_self\" title=\"Projektliste\">&laquo; zur Projektliste</a></p>\n"; 
-        echo "</form>\n";   
-    }     
-    else
-    {
-        echo "<div align='center'>\n";
-        
-        if ($del)
-        {   // Loeschen, Proz_Step wird wegen DELETE CASCADE ebenfalls geloescht
-            $sql = "DELETE FROM Prozess WHERE proz_ID = '$pzid'";
-            $retdi = $dbc -> execute($sql);
-            if ($retdi)
-            {
-                echo "<p class='green'><b>DELETE: Daten  zu '".$pz["bez"]."' wurden erfolgreich gel&ouml;scht.</b></p>\n";
-                include ("inc/prozess_dat_show.inc.php");
-            }                
-            else
-            {
-                echo "<p class='red'><b>DELETE: Daten  zu '".$pz["bez"]."', ID = '$pzid'  konnten nicht gel&ouml;scht werden!</b></p>\n";
-                if (strpos($dbc->error,'1451') !== false)
-                    echo "error DELETE: Es gibt mindestens einen abhängiges Projekt zu Projekt-ID '$pzid'<br />";
-                else
-                {
-                    echo "sql = $sql<br />";
-                    echo "error DELETE: " . $dbc->error . "<br />";
-                }    
-            }
-        }
-        else //INSERT oder UPDATE
-        {
-            //daten speichern
-//            echo "INSERT/UPDATE: Daten speichern<br /><br />\n";
-//            print_r($pz); echo "<br />\n";
-            
-            $pz["bezl"] = substr($pz["bezl"],0,200);
-            $pz["bem"]  = substr($pz["bem"],0,500);
-            if ($pz["sdat"] == "") $pz["sdat"] = null; 
-            if ($pz["edat"] == "") $pz["edat"] = null; 
-            if ($pz["psdat"] == "") $pz["psdat"] = null; 
-            if ($pz["pedat"] == "") $pz["pedat"] = null;
-            if ($pz["kost"]) $pz["kost"] = dbformat_wert($pz["kost"]); else $pz["kost"] = null; 
-            if ($pz["pkost"]) $pz["pkost"] = dbformat_wert($pz["pkost"]); else $pz["pkost"] = null;
-            if ($pz["urg"] == -1) $pz["urg"] = null;
-            if ($pz["stat"] == -1) $pz["stat"] = null; 
-            if ($pz["pzref"] == -1) $pz["pzref"] = null;
-            if ($pz["prid"] < 1) $pz["prid"] = null;
-
-            if ($pz["pers"] < "!") $pz["persknr"] = null;
-            if ($pz["persa"] < "!") $pz["persknra"] = null;
-            
-            if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
-            
-            $stmt = $dbc -> stmtinit();
-            if (is_object($stmt))
-            {
-                if ($pzid)
-                {   //UPDATE
-                    $stmt -> prepare("UPDATE Prozess SET
-                                produkt_ID = ?,
-                                proz_bez = ?,
-                                proz_bez_l = ?,
-                                proz_start = ?, 
-                                proz_end = ?, 
-                                proz_kosten = ?,
-                                proz_start_pl = ?,
-                                proz_end_pl = ?,
-                                proz_kost_pl = ?,
-                                proz_urg_ID = ?, 
-                                proz_stat_ID = ?, 
-                                persknr = ?, 
-                                proz_ref_ID = ?, 
-                                proz_bem = ?, 
-                                persknr_a = ?  WHERE proz_ID = $pzid"); 
-                    $stmt -> bind_param('issssdssdiiiisi',$pz["prid"],$pz["bez"],$pz["bezl"],$pz["sdat"],$pz["edat"],$pz["kost"],$pz["psdat"],$pz["pedat"],$pz["pkost"],
-                        $pz["urg"],$pz["stat"],$pz["persknr"],$pz["pzref"],$pz["bem"],$pz["persknra"]);
-                    $result = $stmt -> execute();                    
-                    if ($stmt->error) echo "error UPDATE Projekt: " . $stmt->error . "<br><br>\n";
-                
-                }
-                else
-                {   //INSERT
-                    $stmt -> prepare ("INSERT INTO Prozess (produkt_ID, proz_bez, proz_bez_l, proz_start, proz_end, proz_kosten, proz_start_pl, proz_end_pl, proz_kost_pl, 
-                        proz_urg_ID, proz_stat_ID, persknr, proz_ref_ID, proz_bem, persknr_a) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
-                    $stmt -> bind_param('issssdssdiiiisi',$pz["prid"],$pz["bez"],$pz["bezl"],$pz["sdat"],$pz["edat"],$pz["kost"],$pz["psdat"],$pz["pedat"],$pz["pkost"],
-                        $pz["urg"],$pz["stat"],$pz["persknr"],$pz["pzref"],$pz["bem"],$pz["persknra"]);
-                    $result = $stmt -> execute();                    
-                    if ($stmt->error) echo "error INSERT Projekt: " . $stmt->error . "<br><br>\n";
-                    if ($result)
-                    { // INSERT o.k.
-                      // info_ID ermitteln
-                        $pzid = $dbc -> insertId();
-                    }    
-                }
-                if ($result && is_array($pz["step"]) && count($pz["step"])>0)
-                {   // INSERT Prozessschritte
-                    $sql = "DELETE FROM Proz_Step WHERE proz_ID = $pzid";
-                    $retd = $dbc -> execute($sql);
-                    if ($retd)
-                    {
-                        $rets = 1;
-                        $stmt -> prepare("INSERT INTO Proz_Step (proz_ID,proz_step,step_sort,step_stat_ID,step_bem) VALUES(?,?,?,?,?)");
-                        for ($k=0; $k<count($pz["step"]); $k++)
-                        {
-                            if ($pz["step"][$k] && !$pz["del"][$k]) 
-                            {
-                                if (!is_numeric($pz["sort"][$k]) || (is_numeric($pz["sort"][$k]) && $pz["sort"]< 1)) $pz["sort"][$k] = null;
-                                if ($pz["ststat"][$k] == -1) $pz["ststat"][$k] = null; 
-                                if ($pz["stbem"][$k] < "!") $pz["stbem"][$k] = null; 
-                                $stmt -> bind_param('isiis',$pzid, $pz["step"][$k], $pz["sort"][$k],$pz["ststat"][$k], $pz["stbem"][$k]);
-                                $rets = $rets && $stmt -> execute();
-                            }
-                        }
-                        if (!$rets) echo "error INSERT Projekt-Schritt: $stmt->error<br />\n";
-                    }
-                    else echo "error INSERT Projekt-Schritt: $dbc->error<br />\n";                   
-                }
-                else $rets = 1;   
-            }
-
-            if ($result && $rets)
-            {
-                echo "<p class='green'><b>Projekt '".$pz["bez"]."' mit ID '$pzid' wurden erfolgreich gespeichert.</b></p>\n";
-                include ("inc/prozess_dat_show.inc.php");
-            }   
-            else
-                echo "<p class='red'><b>Daten zu '".$pz["bez"]."' wurden nicht oder nur teilweise gespeichert</b></p>\n";
-
-        }
-        echo "</div>";
-        echo "<p class='sc'>&nbsp;&nbsp;&nbsp;<a href=\"prozess_flist.php$getp\" target=\"_self\" title=\"Projektliste\">&laquo; zur Projektliste</a></p>\n"; 
-    }
-    echo "</body>\n</html>\n";
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 03/2012
+ * 
+ * Prozess INSERT/UPDATE/DELETE/DUPLICATE
+ */
+
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    session_start();
+    if (! isset($_SESSION["userid"]))
+    { 
+        include_once ("inc/func_lib.inc.php");	
+        login($_SERVER["PHP_SELF"]);
+        exit;
+    }
+    
+    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("pzr",$_SESSION["recht"]) && !in_array("pze",$_SESSION["recht"])))
+    {
+        header("Location: start.php");
+        exit;
+    }    
+
+    $zeil = $_GET["z"];
+    if (!$zeil) $zeil = 25; // Anzahl der gezeigten Zeilen
+    $start = $_GET["st"];   // Start bei DS $start+1
+    if (!$start) $start=0;
+	$sort   = $_GET["s"];   // Sortierung nach Spalte
+    $dir    = $_GET["d"];   // Sortierrichtung
+    $fnum   = $_GET["f"];   // Spaltennummer, nach der aktuell gefiltert wird
+    $filter = $_GET["b"];   // Filterbegriff
+    $getp = "?s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil";
+
+    $pzid  = $_GET["i"];
+    $del    = $_POST["del"];
+    $sub    = $_POST["eintragen"];
+    $dup    = $_POST["dup"];
+    if (!$dup) $dup = $_GET["dp"];
+    $copy   = $_GET["c"];
+	$pz    = $_POST["pz"];
+    $ok		= $_POST["ok"];
+    if (!$pz["okn"]) $ok = false;
+    $duptext="";
+
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+    include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+	$dbc = new dbconnection();
+    
+    $sql = "SELECT persknr FROM userweb WHERE userid ='" . $_SESSION["userid"] ."'";
+    $persknr = $dbc -> querySingleItem($sql);
+    
+    if ($dup)
+    {   // Prozess duplizieren
+        $tab = "Prozess";
+        $key = "proz_ID";
+        $val =  $pzid;
+//        $ret=1;
+        $ret = duplicate_record ($tab, $key, $val);
+        if ($ret)
+        { 
+            $pzid_new=$ret;
+            // duplizieren Schritte
+            $sql = "INSERT INTO Proz_Step SELECT NULL, $pzid_new, proz_step,step_sort,step_stat_ID,step_bem FROM Proz_Step WHERE proz_ID=$pzid ORDER BY proz_step_ID";
+            $rets = $dbc -> execute($sql);
+            $sql = "INSERT INTO Proz_RaumArbGruppe SELECT $pzid_new,rag_ID FROM Proz_RaumArbGruppe WHERE proz_ID=$pzid ORDER BY rag_ID";
+            $retr = $dbc -> execute($sql);
+            if ($ret && $rets && $retr)
+            {
+                $addr = $_SERVER["PHP_SELF"] . "?i=$pzid_new&c=1";
+                header("Location: $addr");
+                exit;
+            }
+            else $duptext = " - Fehler beim Duplizieren von Step oder AG, idold=$pzid, idnew=$pzid_new, ret=$ret, rets=$rets, retr=$retr";    
+        }
+        else $duptext = " - Fehler beim Duplizieren von Projekt-ID=$pzid";    
+    }
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/> 
+   	<link href="css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/> 
+<!--
+    <link type="text/css" href="/fhiiqm/css/jquery/ui-lightness/jquery-ui-1.8.16.custom.css" rel="Stylesheet" />	
+    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-1.6.2.min.js"></script>
+    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
+-->
+    <link type="text/css" href="/fhiiqm/css/jquery/ui-lightness-1.8.21/jquery-ui-1.8.21.custom.css" rel="Stylesheet" />	
+    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-1.7.2.min.js"></script>
+    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-ui-1.8.21.custom.min.js"></script>
+    
+    <script type="text/javascript">
+    //<!--
+        var counter = 0;
+        var limit = 99;
+        var arr = new Array();
+        var arrag = new Array();
+        function addInput(divId,anz){
+            if (counter == limit)  {
+              alert("Das Limit von " + counter + " zusätzlichen inputs ist erreicht");
+            }
+            else 
+            {
+                if (divId == 'add')
+                {
+                    var newdiv = document.createElement('div');
+                    var opt="<option value='-1'></option>";
+                    var i;
+                    for (var key in arr)  
+                    {
+                    opt = opt.concat("<option value='",key,"'>",arr[key],"</option>\n" );
+                    }
+                    opt += "</select>\n";
+                    newdiv.innerHTML = "<span></span><input type='text' name='pz[step][]' size='50' maxlength='50' />";
+                    newdiv.innerHTML += "&nbsp;&nbsp;&nbsp;&nbsp;Status&nbsp;&nbsp;&nbsp;<select name='pz[ststat][]'>"+opt;
+                    newdiv.innerHTML += "&nbsp;&nbsp;Sort&nbsp;&nbsp;&nbsp;<input type='text' name='pz[sort][]' class='right' size='2' maxlength='2' value='' />";
+                    newdiv.innerHTML += "<img src='/fhiiqm/img/nixt.gif' border='0' height='100%' />";
+                    newdiv.innerHTML += "<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Bemerkung zu Schritt&nbsp;&nbsp;&nbsp;";
+                    newdiv.innerHTML += "<input type='text' name='pz[stbem][]' size='50' maxlength='50' />";
+                    newdiv.innerHTML += "<span id='cbl'>&nbsp;&nbsp;&nbsp;<input type='checkbox' id='del' name='pz[del][]' value='1'/>";
+                    newdiv.innerHTML += "<label id='lb' for='del'>&nbsp;l&ouml;schen</label></span>";
+                    document.getElementById(divId).appendChild(newdiv);
+                    var delcb = document.getElementById('del');
+                    delcb.id = "del_" + anz;
+                    delcb.style.display = 'none';
+                    var lcb = document.getElementById('lb');
+                    lcb.id = "lb_" + anz;
+                    lcb.setAttribute("for", delcb.id);
+                    lcb.style.display = 'none';
+                    counter++;
+                }
+                else
+                {
+                    var newdiv = document.createElement('div');
+                    var opt="";
+                    var opt="<option value='-1'></option>";
+                    for (var key in arrag)  
+                    {
+                        var keym = parseInt(key.substr(1)); //key = abt_ID*1000+rag_ID wegen sort nach Abteilung
+                        opt = opt.concat("<option value='",keym,"'>",arrag[key],"</option>\n" );
+                    }
+                    opt += "</select>\n";
+//                    alert (opt+"\n");
+                    newdiv.innerHTML = "<span></span><select name='pz[rag][]'>"+opt;
+                    newdiv.innerHTML += "<span id='cblag'>&nbsp;&nbsp;&nbsp;<input type='checkbox' id='delag' name='pz[delag][]' value='1'/>";
+                    newdiv.innerHTML += "<label id='lbag' for='delag'>&nbsp;l&ouml;schen</label></span>";
+                    newdiv.innerHTML += "<img src='/fhiiqm/img/nixt.gif' border='0' height='100%' />";
+                    document.getElementById(divId).appendChild(newdiv);
+                    var delcb = document.getElementById('delag');
+                    delcb.id = "delag_" + anz;
+                    delcb.style.display = 'none';
+                    var lcb = document.getElementById('lbag');
+                    lcb.id = "lbag_" + anz;
+                    lcb.setAttribute("for", delcb.id);
+                    lcb.style.display = 'none';
+                    counter++;
+                }
+            }
+        }
+        function markdelInput(divId,anz){
+            for (i=1; i<anz; i++)
+            {
+                if (divId == 'add')
+                {
+                    var id = "del_" + i;
+                    var delcb = document.getElementById(id);
+                    delcb.style.display = 'inline';
+                    var idl = "lb_" + i;
+                    var lcb = document.getElementById(idl);
+                    lcb.style.display = 'inline';
+                }
+                else
+                {
+                    var id = "delag_" + i;
+                    var delcb = document.getElementById(id);
+                    delcb.style.display = 'inline';
+                    var idl = "lbag_" + i;
+                    var lcb = document.getElementById(idl);
+                    lcb.style.display = 'inline';
+                }                                                    
+            }
+        }
+        function delInput(divId){
+            var kn = document.getElementById(divId); 
+            while (kn.childNodes.length>0 && kn.lastChild.nodeName != "SPAN" && kn.lastChild.nodeName != "A")
+            {
+                //alert ("vor "+kn.lastChild.nodeName+", nodetyp = "+ kn.lastChild.nodeType);
+                var knc = kn.lastChild;
+                    document.getElementById(divId).removeChild(knc);
+            }
+            if (kn.lastChild.nodeName == "SPAN") document.getElementById(divId).removeChild(kn.lastChild);
+        }
+    //-->
+    </script>
+
+	<title>Edit Projekt</title>
+</head>
+
+<body>
+
+    <script>
+      $(document).ready(function() {
+        $("#bez").focus();
+        $("#pers").autocomplete({
+                source: "/fhiiqm/inc/ma_list_ac.inc.php",
+    			minLength: 2,
+                select: function(event,ui){$("#pid").val(ui.item.id);}
+    		});
+        $("#persa").autocomplete({
+                source: "/fhiiqm/inc/ma_list_ac.inc.php",
+    			minLength: 2,
+                select: function(event,ui){$("#paid").val(ui.item.id);}
+    		});
+        $("#sdat").datepicker({
+            dateFormat: 'yy-mm-dd', //nur Datum
+            yearRange: '2000:2025',
+            changeMonth: true,
+			changeYear: true,
+            firstDay: 1,
+            dayNamesMin: ['So','Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa' ],
+            monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez'] 
+        });
+        $("#edat").datepicker({
+            dateFormat: 'yy-mm-dd', //nur Datum
+            yearRange: '2000:2025',
+            changeMonth: true,
+			changeYear: true,
+            firstDay: 1,
+            dayNamesMin: ['So','Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa' ],
+            monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez'] 
+        });
+        $("#psdat").datepicker({
+            dateFormat: 'yy-mm-dd', //nur Datum
+            yearRange: '2000:2025',
+            changeMonth: true,
+			changeYear: true,
+            firstDay: 1,
+            dayNamesMin: ['So','Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa' ],
+            monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez'] 
+        });
+        $("#pedat").datepicker({
+            dateFormat: 'yy-mm-dd', //nur Datum
+            yearRange: '2000:2025',
+            changeMonth: true,
+			changeYear: true,
+            firstDay: 1,
+            dayNamesMin: ['So','Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa' ],
+            monthNamesShort: ['Jan','Feb','Mar','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez'] 
+        });
+        $("input[id='pers']").addClass("long20");
+        $("input[id='persa']").addClass("long20");
+        });
+    </script>
+
+<?php
+    echo "&nbsp;";  
+    echo "<div class=\"float-br smaller\" valign='top'>";
+    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+    echo "<div class=\"float-r\"><img src=\"img/sheduled_task.png\" border=\"0\" alt=\"Projekt &auml;ndern\" title=\"Projekt &auml;ndern\"/></div>\n";
+
+
+    echo "<div align='center'>";
+    if ($pzid) $text = "editieren"; else $text = "erfassen";
+    if ($copy) $duptext = " (Kopie)";
+    echo "<h3>Projekt $text$duptext<h3>";
+    
+    echo "</div>\n";
+    
+    if (!$ok || (!$sub && !$del && !$dup))
+    {
+        if ($pzid && (!$sub || !$del) && !isset($pz))
+        { // update
+            $sql = "SELECT proz_ID,produkt_ID,proz_bez,proz_bez_l,proz_start,proz_end,proz_kosten,
+                        proz_start_pl,proz_end_pl,proz_kost_pl,
+                        proz_urg_ID,proz_stat_ID,p.persknr,proz_ref_ID,proz_bem,persknr_a,
+                        CONCAT (m.nachname, ', ',m.vorname) AS vma,
+                        CONCAT (a.nachname, ', ',a.vorname) AS ama
+                    FROM Prozess p LEFT OUTER JOIN Mitarbeiter m
+                    ON p.persknr=m.persknr LEFT OUTER JOIN Mitarbeiter a
+                    ON p.persknr_a=a.persknr
+                    WHERE proz_ID = $pzid";
+            if ($res = $dbc -> queryObjectArray($sql))
+            {
+                foreach ($res as $row)
+                {
+                    $pz["pzid"] = $pzid;
+                    $pz["bez"] = $row->proz_bez;
+                    $pz["bezl"] = $row->proz_bez_l;
+                    $pz["prid"] = $row->produkt_ID;
+                    $pz["psdat"] = $row->proz_start_pl;
+                    $pz["pedat"] = $row->proz_end_pl;
+                    $pz["pkost"] = str_replace('.',',',$row->proz_kost_pl);
+                    $pz["sdat"] = $row->proz_start;
+                    $pz["edat"] = $row->proz_end;
+                    $pz["kost"] = str_replace('.',',',$row->proz_kosten);
+                    $pz["urg"] = $row->proz_urg_ID;
+                    $pz["stat"] = $row->proz_stat_ID;
+                    $pz["persknr"] = $row->persknr;
+                    $pz["pzref"] = $row->proz_ref_ID;
+                    $pz["bem"] = $row->proz_bem;
+                    $pz["persknra"] = $row->persknr_a;
+                    $pz["persa"] = $row->ama;
+                    $pz["pers"] = $row->vma;
+                }
+            }
+            // Daten aus Proz_Step
+            $sql = "SELECT proz_step,step_sort,step_stat_ID,step_bem FROM Proz_Step WHERE proz_ID = $pzid ORDER BY step_sort";
+            if ($ress = $dbc -> queryObjectArray($sql))
+            {
+                foreach ($ress as $row)
+                {
+                    $pz["step"][] = $row->proz_step;
+                    $pz["sort"][] = $row->step_sort;
+                    $pz["ststat"][] = $row->step_stat_ID;
+                    $pz["stbem"][] = $row->step_bem;
+                }
+            }
+            // Daten aus Proz_RaumArbGruppe
+            $sql = "SELECT rag_ID FROM Proz_RaumArbGruppe WHERE proz_ID=$pzid ORDER BY rag_ID";
+            if ($resr = $dbc -> queryObjectArray($sql))
+            {
+                foreach ($resr as $row)
+                    $pz["rag"][] = $row->rag_ID;
+            }
+        }
+        include($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/form/prozess_rag_form.inc.php");
+        if ($sub || $del)
+		{
+		  	if ($sub)
+                $frage = "Alle Angaben ok?";
+            elseif ($del)
+                $frage = "Projekt wirklich l&ouml;schen?";
+			echo "<tr>
+			  <td class=\"red\" valign=\"top\" align=\"left\">$frage</td>
+			        <td><input type=\"checkbox\" name=\"ok\" value=\"1\"";
+			        if ($ok)  echo "checked=\"checked\""; 
+			echo " /></td>\n</tr>\n"; 
+		}
+        if (!is_null($_SESSION["recht"]) && in_array("pze",$_SESSION["recht"]))
+        {
+            echo "
+           	<tr><td>&nbsp;</td>\n
+            	<td><input  class=\"button\" type=\"submit\" name=\"eintragen\" value=\"  eintragen  \" />";
+            if ($pzid)
+            {
+                echo "&nbsp;&nbsp;&nbsp;<input class=\"buttonr\" type=\"submit\" value=\"l&ouml;schen\" name=\"del\" title=\"delete\" />";
+                echo "&nbsp;&nbsp;&nbsp;<input class=\"button\" type=\"submit\" value=\"duplizieren\" name=\"dup\" title=\"delete\" />";
+            }    
+           	echo "</td></tr>\n";
+        }
+        echo "</table>\n";
+        echo "</div>\n";
+//            if (!is_null($_SESSION["recht"]) && !in_array("le", $_SESSION["recht"]))
+            echo "<p class='sc'>&nbsp;&nbsp;&nbsp;<a href=\"prozess_flist.php$getp\" target=\"_self\" title=\"Projektliste\">&laquo; zur Projektliste</a></p>\n"; 
+        echo "</form>\n";   
+    }     
+    else
+    {
+        echo "<div align='center'>\n";
+        
+        if ($del)
+        {   // Loeschen, Proz_Step,Proz_RaumArbGruppe werden wegen DELETE CASCADE ebenfalls geloescht
+            $sql = "DELETE FROM Prozess WHERE proz_ID = '$pzid'";
+            $retdi = $dbc -> execute($sql);
+            if ($retdi)
+            {
+                echo "<p class='green'><b>DELETE: Daten  zu '".$pz["bez"]."' wurden erfolgreich gel&ouml;scht.</b></p>\n";
+                include ("inc/prozess_dat_show.inc.php");
+            }                
+            else
+            {
+                echo "<p class='red'><b>DELETE: Daten  zu '".$pz["bez"]."', ID = '$pzid'  konnten nicht gel&ouml;scht werden!</b></p>\n";
+                if (strpos($dbc->error,'1451') !== false)
+                    echo "error DELETE: Es gibt mindestens einen abhängiges Projekt zu Projekt-ID '$pzid'<br />";
+                else
+                {
+                    echo "sql = $sql<br />";
+                    echo "error DELETE: " . $dbc->error . "<br />";
+                }    
+            }
+        }
+        else //INSERT oder UPDATE
+        {
+            //daten speichern
+//            echo "INSERT/UPDATE: Daten speichern<br /><br />\n";
+//            print_r($pz); echo "<br />\n";
+            
+            $pz["bezl"] = substr($pz["bezl"],0,200);
+            $pz["bem"]  = substr($pz["bem"],0,500);
+            if ($pz["sdat"] == "") $pz["sdat"] = null; 
+            if ($pz["edat"] == "") $pz["edat"] = null; 
+            if ($pz["psdat"] == "") $pz["psdat"] = null; 
+            if ($pz["pedat"] == "") $pz["pedat"] = null;
+            if ($pz["kost"]) $pz["kost"] = dbformat_wert($pz["kost"]); else $pz["kost"] = null; 
+            if ($pz["pkost"]) $pz["pkost"] = dbformat_wert($pz["pkost"]); else $pz["pkost"] = null;
+            if ($pz["urg"] == -1) $pz["urg"] = null;
+            if ($pz["stat"] == -1) $pz["stat"] = null; 
+            if ($pz["pzref"] == -1) $pz["pzref"] = null;
+            if ($pz["prid"] < 1) $pz["prid"] = null;
+
+            if ($pz["pers"] < "!") $pz["persknr"] = null;
+            if ($pz["persa"] < "!") $pz["persknra"] = null;
+            
+            if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+            
+            $stmt = $dbc -> stmtinit();
+            if (is_object($stmt))
+            {
+                if ($pzid)
+                {   //UPDATE
+                    $stmt -> prepare("UPDATE Prozess SET
+                                produkt_ID = ?,
+                                proz_bez = ?,
+                                proz_bez_l = ?,
+                                proz_start = ?, 
+                                proz_end = ?, 
+                                proz_kosten = ?,
+                                proz_start_pl = ?,
+                                proz_end_pl = ?,
+                                proz_kost_pl = ?,
+                                proz_urg_ID = ?, 
+                                proz_stat_ID = ?, 
+                                persknr = ?, 
+                                proz_ref_ID = ?, 
+                                proz_bem = ?, 
+                                persknr_a = ?  WHERE proz_ID = $pzid"); 
+                    $stmt -> bind_param('issssdssdiiiisi',$pz["prid"],$pz["bez"],$pz["bezl"],$pz["sdat"],$pz["edat"],$pz["kost"],$pz["psdat"],$pz["pedat"],$pz["pkost"],
+                        $pz["urg"],$pz["stat"],$pz["persknr"],$pz["pzref"],$pz["bem"],$pz["persknra"]);
+                    $result = $stmt -> execute();                    
+                    if ($stmt->error) echo "error UPDATE Projekt: " . $stmt->error . "<br><br>\n";
+                
+                }
+                else
+                {   //INSERT
+                    $stmt -> prepare ("INSERT INTO Prozess (produkt_ID, proz_bez, proz_bez_l, proz_start, proz_end, proz_kosten, proz_start_pl, proz_end_pl, proz_kost_pl, 
+                        proz_urg_ID, proz_stat_ID, persknr, proz_ref_ID, proz_bem, persknr_a) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+                    $stmt -> bind_param('issssdssdiiiisi',$pz["prid"],$pz["bez"],$pz["bezl"],$pz["sdat"],$pz["edat"],$pz["kost"],$pz["psdat"],$pz["pedat"],$pz["pkost"],
+                        $pz["urg"],$pz["stat"],$pz["persknr"],$pz["pzref"],$pz["bem"],$pz["persknra"]);
+                    $result = $stmt -> execute();                    
+                    if ($stmt->error) echo "error INSERT Projekt: " . $stmt->error . "<br><br>\n";
+                    if ($result)
+                    { // INSERT o.k.
+                      // info_ID ermitteln
+                        $pzid = $dbc -> insertId();
+                    }    
+                }
+                if ($result && is_array($pz["step"]) && count($pz["step"])>0)
+                {   // INSERT Prozessschritte
+                    $sql = "DELETE FROM Proz_Step WHERE proz_ID = $pzid";
+                    $retd = $dbc -> execute($sql);
+                    if ($retd)
+                    {
+                        $rets = 1;
+                        $stmt -> prepare("INSERT INTO Proz_Step (proz_ID,proz_step,step_sort,step_stat_ID,step_bem) VALUES(?,?,?,?,?)");
+                        for ($k=0; $k<count($pz["step"]); $k++)
+                        {
+                            if ($pz["step"][$k] && !$pz["del"][$k]) 
+                            {
+                                if (!is_numeric($pz["sort"][$k]) || (is_numeric($pz["sort"][$k]) && $pz["sort"]< 1)) $pz["sort"][$k] = null;
+                                if ($pz["ststat"][$k] == -1) $pz["ststat"][$k] = null; 
+                                if ($pz["stbem"][$k] < "!") $pz["stbem"][$k] = null; 
+                                $stmt -> bind_param('isiis',$pzid, $pz["step"][$k], $pz["sort"][$k],$pz["ststat"][$k], $pz["stbem"][$k]);
+                                $rets = $rets && $stmt -> execute();
+                            }
+                        }
+                        if (!$rets) echo "error INSERT Projekt-Schritt: $stmt->error<br />\n";
+                    }
+                    else echo "error INSERT Projekt-Schritt: $dbc->error<br />\n";                   
+                }
+                else $rets = 1;   
+
+                if ($result && is_array($pz["rag"]) && count($pz["rag"])>0)
+                {   // INSERT betroffene Arbeitsgruppen
+                    $sql = "DELETE FROM Proz_RaumArbGruppe WHERE proz_ID = $pzid";
+                    $retd = $dbc -> execute($sql);
+                    if ($retd)
+                    {
+                        $retr = 1;
+                        $stmt -> prepare("INSERT INTO Proz_RaumArbGruppe (proz_ID,rag_ID) VALUES(?,?)");
+                        for ($k=0; $k<count($pz["rag"]); $k++)
+                        {
+                            if ($pz["rag"][$k]>0 && !$pz["delag"][$k]) 
+                            {
+                                $stmt -> bind_param('ii',$pzid,$pz["rag"][$k]);
+                                $retr = $retr && $stmt -> execute();
+                            }
+                        }
+                        if (!$retr) echo "error INSERT Projekt-Arbeitsgruppe: $stmt->error<br />\n";
+                    }
+                    else echo "error INSERT Projekt-Arbeitsgruppe: $dbc->error<br />\n";                   
+                }
+                else $retr = 1;   
+            }
+
+            if ($result && $rets && $retr)
+            {
+                echo "<p class='green'><b>Projekt '".$pz["bez"]."' mit ID '$pzid' wurden erfolgreich gespeichert.</b></p>\n";
+                include ("inc/prozess_dat_show.inc.php");
+            }   
+            else
+                echo "<p class='red'><b>Daten zu '".$pz["bez"]."' wurden nicht oder nur teilweise gespeichert</b></p>\n";
+
+        }
+        echo "</div>";
+        echo "<p class='sc'>&nbsp;&nbsp;&nbsp;<a href=\"prozess_flist.php$getp\" target=\"_self\" title=\"Projektliste\">&laquo; zur Projektliste</a></p>\n"; 
+    }
+    echo "</body>\n</html>\n";
 ?>    
\ No newline at end of file
--- a/fhiiqm/prozess_flist.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/prozess_flist.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,266 +1,266 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 04/2012
- * 
- * Liste der Projekte
- * 
- */
-
-
-    error_reporting(E_ALL ^ E_NOTICE);
-    
-    session_start();
-    if (! isset($_SESSION["userid"]))
-    { 
-        include_once ("inc/func_lib.inc.php");	
-        login($_SERVER["PHP_SELF"]);
-        exit;
-    }
-    
-    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("pzr",$_SESSION["recht"]) && !in_array("pze",$_SESSION["recht"])))
-    {
-        header("Location: start.php");
-        exit;
-    }    
-    include_once($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/inc/dbconnect.inc.php");
-    if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
-
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-    <link type="text/css" href="/fhiiqm/css/db.css" rel="Stylesheet" media="screen"/>	
-    <link type="text/css" href="/fhiiqm/css/db_print.css" rel="Stylesheet" media="print"/>	
-    <title>Liste Projekte</title>
- </head>
- 
- <body onload="document.ffilter.filter.focus();">
-
-<?php
-    echo "&nbsp;";  
-    echo "<div class=\"float-br smaller\" valign='top'>";
-    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
-    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
-    echo "<div class=\"float-r\"><img src=\"img/sheduled_task.png\" border=\"0\" alt=\"Projektliste\" title=\"Projektliste\"/></div>\n";
-
-    // Felder, nach denen gefiltert werden kann
-    $fields = array(1=>"ID",2=>"Bezeichnung",4=>"Produkt",5=>"'bezieht sich auf ID'",6=>"Anforderer",7=>"Verantwortlicher",8=>"'Plan Start'",9=>"'Plan Ende'",
-                    11=>"Start",12=>"Ende",14=>"Wichtigkeit",15=>"Status");
-
-    $zeil = $_GET["z"];
-    if (!$zeil) $zeil = $_POST["z"];
-    if (!$zeil) $zeil = 25; // Anzahl der gezeigten Zeilen
-    $start = $_GET["st"];
-    if (!$start) $start=0;
-    
-	$sort   = $_GET["s"];   // Sortierung nach Spalte
-    if (!isset($sort) && !$sort) $sort = $_POST["s"];      
-
-    $dir    = $_GET["d"];   // Sortierrichtung
-    if (!isset($dir) && !$dir) $dir = $_POST["d"];
-
-    $fnum   = $_GET["f"];   // Spaltennummer, nach der aktuell gefiltert wird
-    if (!isset($fnum) && !$fnum) $fnum = $_POST["f"];
-
-    $filter = $_POST["filter"];
-    if (!isset($filter) && !$filter) $filter = $_GET["b"];   
-
-    $subf   = $_POST["subf"]; // submit
-    
-    if (!isset($fnum) || !$fnum) $fnum = 1;
-    if (!isset($filter) || !$filter) $filter = "";
-    if (!isset($sort) || !$sort) $sort = 2;
-    if (!isset($dir) || !$dir)  $dir = "";
-    $getp = "s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil";
-    
-    include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
-    
-    $sql = "CALL prozess_flist($sort,'" . $dir . "',$fnum, '" . $filter . "',$start,$zeil,@anz);"; 
-    // Parameter: Nr. Sortfeld, Sortierrichtung, Nr. Filterfeld, Filterbegriff, Startsatz(0), Anzahl zu liefernde DS, Anzahl gefundener Laser
-    $result = $dbc ->queryObjectArray($sql);
-
-    if ($result)
-    {
-		$bg1 = "#F8F8F8";
-		$bg2 = "#DEDFE1";
-		$bg = "#FFFFFF";
-     
-        echo "<div align='center'>\n";
-        echo "<p><b>Projekte</b></p>\n";
-        
-        echo "<table border='0' cellspacing='0'>\n";
-        echo "<tr><td class='bigger'>Mittels '<img src='/fhiiqm/img/auf.gif' border='0' width='11' hight='11' />' / '<img src='/fhiiqm/img/ab.gif' border='0' width='11' hight='11' />' 
-            können Sie nach relevanten Spalten auf- bzw. absteigend sortieren</td></tr>
-            <tr><td class='bigger'>'<img src='/fhiiqm/img/filter.gif' border='0' width='14' hight='11' />' erm&ouml;glicht das Filtern nach ausgew&auml;hlten Spalten der Liste</td></tr>
-            <tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten "; 
-        if (!is_null($_SESSION["recht"]) && in_array("le",$_SESSION["recht"]))
-            echo ", '<img src='/fhiiqm/img/duplicate.gif' border='0' hight='11'>' - Duplizieren";
-        echo "    des Projektes</td></tr>\n";
-        echo "</table>\n";
-
-        $anz = $dbc -> querySingleItem("SELECT @anz");
-        
-        printf ("<p>Anzahl Projekte: %s</p>", $anz);
-        
-        if (isset($fnum) && $fnum>1 && !$filter && !$subf)
-        {
-            // Formular anzeigen fuer Filterbegriff
-            $text = $fields[$fnum];
-            if ($fnum > 7 && $fnum < 13) $textd = "<br />Format 'jjjj-mm-tt' oder Teil davon"; else $textd = "";
-            $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
-            echo "<form action=" . $_SERVER['PHP_SELF'] . " method='post' enctype='application/x-www-form-urlencoded' id='ffilter' name='ffilter' target='_self'>\n";
-            echo "<input type='hidden' name='s' value='$sort'>";
-            echo "<input type='hidden' name='d' value='$dir'>";
-            echo "<input type='hidden' name='f' value='$fnum'>";
-            echo "<table width=\"40%\" border=\"0\">\n";
-            echo "<tr><td>filtern nach $text:$textd </td>";
-            echo "<td><input id='filter' name='filter' type=\"text\" size=\"10\" maxlength=\"30\" value=\"$filter\"/></td>";
-            echo "<td>Projekte/Seite?   <select name='z'>\n";
-            foreach ($azeil as $key=>$val)
-            {
-                if ($key == $zeil) $select = "selected"; else $select = "";
-                echo "<option $select value='$key'>$val</option>\n";
-            }
-            echo "</select></td>\n";
-            
-            echo "<td><input class=\"button\" type=\"submit\" value=\"finden\" name=\"subf\" title=\"subf\" /></td></tr></table>\n";
-            echo "</form>\n";
-            echo "<p>&nbsp;&nbsp;&nbsp;</p>\n";
-        }
-        echo "<table width='99%'>\n";
-        
-        if ($filter>'!') echo "<tr><td class='bigger' colspan=6>Filter: ". $fields["$fnum"] . " wie '$filter'</td><tr>\n";
-
-        // Listenkopf generieren
-        echo "<tr bgcolor='#68ACBF'>";
-        tab_column(1,"ID",$sort,$dir,0,$fnum,$filter,$start,$zeil);
-        tab_column(5,"zu ID",$sort,$dir,5,$fnum,$filter,$start,$zeil);
-        tab_column(2,"Bezeichnung",$sort,$dir,2,$fnum,$filter,$start,$zeil);
-        tab_column(3,"Beschreibung",$sort,$dir,0,$fnum,$filter,$start,$zeil); 
-        tab_column(4,"Produkt",$sort,$dir,4,$fnum,$filter,$start,$zeil);
-        tab_column(6,"Auftragg.",$sort,$dir,6,$fnum,$filter,$start,$zeil);
-        tab_column(7,"Verantw.",$sort,$dir,7,$fnum,$filter,$start,$zeil);
-        echo "<th>Schritte</th>";
-        tab_column(8,"Start Plan",$sort,$dir,8,$fnum,$filter,$start,$zeil);
-        tab_column(9,"Ende Plan",$sort,$dir,9,$fnum,$filter,$start,$zeil);
-        tab_column(10,"Kosten Plan",$sort,$dir,0,$fnum,$filter,$start,$zeil);    
-        tab_column(11,"Start",$sort,$dir,11,$fnum,$filter,$start,$zeil);
-        tab_column(12,"Ende",$sort,$dir,12,$fnum,$filter,$start,$zeil);
-        tab_column(13,"Kosten",$sort,$dir,0,$fnum,$filter,$start,$zeil);
-        tab_column(14,"Wichtigk.",$sort,$dir,14,$fnum,$filter,$start,$zeil);
-        tab_column(15,"Status",$sort,$dir,15,$fnum,$filter,$start,$zeil);
-        echo "<th>Bemerkung</th>";
-
-        echo "<th>&nbsp;</th>";
-        if (!is_null($_SESSION["recht"]) && in_array("pe",$_SESSION["recht"]))
-            echo "<th>&nbsp;</th>";
-        echo "</tr>\n";
-       
-        foreach ($result as $row)
-        {
-			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-            echo "<tr bgcolor='" . $bg . "'><td>$row->proz_ID</td>";
-            if ($row->proz_ref_ID) echo "<td>$row->proz_ref_ID</td>"; else echo "<td>&nbsp;</td>";
-            echo "<td>$row->bez</td>";
-            echo "<td>" .nl2br($row->bez_l)."</td>"; 
-            echo "<td>$row->prod_name</td>";
-            echo "<td>$row->ama</td>";
-            echo "<td>$row->vma</td>";
-            $steps = explode(";",$row->steps);
-            if (is_array($steps))
-            {
-                echo "<td>";
-                foreach ($steps as $step)
-                {
-                    list($id,$ste) = explode("|",$step);
-                    echo "- $ste<br />";
-                }    
-                echo "</td>";
-            }    
-/*            if ($row->start_pl)
-            {
-                $dat = new DateTime($row->start_pl);    
-                echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
-            }
-            else  echo "<td>&nbsp;</td>";       
-            if ($row->end_pl)
-            {
-                $dat = new DateTime($row->end_pl);    
-                echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
-            }
-            else  echo "<td>&nbsp;</td>";
-            echo "<td>".number_format($row->kost_pl,2,",","."); */       
-            if ($row->start_pl)
-            {
-                $dat = new DateTime($row->start_pl);    
-                echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
-            }
-            else  echo "<td>&nbsp;</td>";       
-            if ($row->end_pl)
-            {
-                $dat = new DateTime($row->end_pl);    
-                echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
-            }
-            else  echo "<td>&nbsp;</td>";
-            if ($row->kost_pl) echo "<td>".number_format($row->kost_pl,2,",","."); else echo "<td>&nbsp;</td>";        
-            if ($row->start)
-            {
-                $dat = new DateTime($row->start);    
-                echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
-            }
-            else  echo "<td>&nbsp;</td>";       
-            if ($row->end)
-            {
-                $dat = new DateTime($row->end);    
-                echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
-            }
-            else  echo "<td>&nbsp;</td>";
-            if ($row->kost) echo "<td>".number_format($row->kost,2,",","."); else echo "<td>&nbsp;</td>";       
-            echo "<td>$row->urg_bez</td>";
-            echo "<td>$row->stat_bez</td>";
-            echo "<td>".nl2br($row->bem)."</td>";
-            echo "<td><a href='/fhiiqm/prozess_ed.php?i=$row->proz_ID&$getp'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
-            if (!is_null($_SESSION["recht"]) && in_array("pze",$_SESSION["recht"]))
-                echo "<td><a href='/fhiiqm/prozess_ed.php?i=$row->proz_ID&dp=1'><img src=\"/fhiiqm/img/duplicate.gif\" alt='duplizieren' title='duplizieren' border='0'/></a></td>";
-        }
-        echo "</table></div>\n";
-
-        echo "<br />&nbsp;&nbsp;&nbsp;";
-        
-        // Sortierung und Filter aus $_GET fuer weitere Seiten
-        foreach ($_GET as $key=>$val)
-        {
-            if ($key != "st") $liste .= "&" . $key ."=".$val;
-        }    
-        // Sortierung und Filter aus $_POST fuer weitere Seiten
-        if ($subf)
-        foreach ($_POST as $key=>$val)
-        {
-            if ($key != "st" && $key != "subf" && $key != "filter") $liste .= "&" . $key ."=".$val;
-            if ($key == "filter") $liste .= "&b=" . $val;
-        }    
-        
-        // Links auf andere Seiten generieren
-        liste_links($start,$zeil,$anz,$liste);
-
-    }
-    else
-    {
-        if ($dbc -> error)  
-            echo "error: " . $dbc -> error . "<br />\n";
-        echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider nichts gefunden f&uuml;r ". $fields["$fnum"] . " wie '$filter'!</p><br />";
-        echo "&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Projektliste\" class=\"sc\">Projektliste</a></p>\n";
-        
-    }
-    $dbc -> close();
-    if (!is_null($_SESSION["recht"]) && in_array("pze",$_SESSION["recht"]))
-        echo "<p>&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/prozess_ed.php\" target=\"_self\" title=\"Projekt erfassen\" class=\"sc\">Weiteres Projekt erfassen</a></p>\n";    
-
-?>
-</body>
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 04/2012
+ * 
+ * Liste der Projekte
+ * 
+ */
+
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    session_start();
+    if (! isset($_SESSION["userid"]))
+    { 
+        include_once ("inc/func_lib.inc.php");	
+        login($_SERVER["PHP_SELF"]);
+        exit;
+    }
+    
+    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("pzr",$_SESSION["recht"]) && !in_array("pze",$_SESSION["recht"])))
+    {
+        header("Location: start.php");
+        exit;
+    }    
+    include_once($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/inc/dbconnect.inc.php");
+    if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+    <link type="text/css" href="/fhiiqm/css/db.css" rel="Stylesheet" media="screen"/>	
+    <link type="text/css" href="/fhiiqm/css/db_print.css" rel="Stylesheet" media="print"/>	
+    <title>Liste Projekte</title>
+ </head>
+ 
+ <body onload="document.ffilter.filter.focus();">
+
+<?php
+    echo "&nbsp;";  
+    echo "<div class=\"float-br smaller\" valign='top'>";
+    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+    echo "<div class=\"float-r\"><img src=\"img/sheduled_task.png\" border=\"0\" alt=\"Projektliste\" title=\"Projektliste\"/></div>\n";
+
+    // Felder, nach denen gefiltert werden kann
+    $fields = array(1=>"ID",2=>"Bezeichnung",4=>"Produkt",5=>"'bezieht sich auf ID'",6=>"Anforderer",7=>"Verantwortlicher",8=>"'Plan Start'",9=>"'Plan Ende'",
+                    11=>"Start",12=>"Ende",14=>"Wichtigkeit",15=>"Status");
+
+    $zeil = $_GET["z"];
+    if (!$zeil) $zeil = $_POST["z"];
+    if (!$zeil) $zeil = 25; // Anzahl der gezeigten Zeilen
+    $start = $_GET["st"];
+    if (!$start) $start=0;
+    
+	$sort   = $_GET["s"];   // Sortierung nach Spalte
+    if (!isset($sort) && !$sort) $sort = $_POST["s"];      
+
+    $dir    = $_GET["d"];   // Sortierrichtung
+    if (!isset($dir) && !$dir) $dir = $_POST["d"];
+
+    $fnum   = $_GET["f"];   // Spaltennummer, nach der aktuell gefiltert wird
+    if (!isset($fnum) && !$fnum) $fnum = $_POST["f"];
+
+    $filter = $_POST["filter"];
+    if (!isset($filter) && !$filter) $filter = $_GET["b"];   
+
+    $subf   = $_POST["subf"]; // submit
+    
+    if (!isset($fnum) || !$fnum) $fnum = 1;
+    if (!isset($filter) || !$filter) $filter = "";
+    if (!isset($sort) || !$sort) $sort = 2;
+    if (!isset($dir) || !$dir)  $dir = "";
+    $getp = "s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil";
+    
+    include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+    
+    $sql = "CALL prozess_flist($sort,'" . $dir . "',$fnum, '" . $filter . "',$start,$zeil,@anz);"; 
+    // Parameter: Nr. Sortfeld, Sortierrichtung, Nr. Filterfeld, Filterbegriff, Startsatz(0), Anzahl zu liefernde DS, Anzahl gefundener Laser
+    $result = $dbc ->queryObjectArray($sql);
+
+    if ($result)
+    {
+		$bg1 = "#F8F8F8";
+		$bg2 = "#DEDFE1";
+		$bg = "#FFFFFF";
+     
+        echo "<div align='center'>\n";
+        echo "<p><b>Projekte</b></p>\n";
+        
+        echo "<table border='0' cellspacing='0'>\n";
+        echo "<tr><td class='bigger'>Mittels '<img src='/fhiiqm/img/auf.gif' border='0' width='11' hight='11' />' / '<img src='/fhiiqm/img/ab.gif' border='0' width='11' hight='11' />' 
+            können Sie nach relevanten Spalten auf- bzw. absteigend sortieren</td></tr>
+            <tr><td class='bigger'>'<img src='/fhiiqm/img/filter.gif' border='0' width='14' hight='11' />' erm&ouml;glicht das Filtern nach ausgew&auml;hlten Spalten der Liste</td></tr>
+            <tr><td class='bigger'>Klick auf '<img src='/fhiiqm/img/edit.gif' border='0' width='11' hight='11'>' - Bearbeiten "; 
+        if (!is_null($_SESSION["recht"]) && in_array("le",$_SESSION["recht"]))
+            echo ", '<img src='/fhiiqm/img/duplicate.gif' border='0' hight='11'>' - Duplizieren";
+        echo "    des Projektes</td></tr>\n";
+        echo "</table>\n";
+
+        $anz = $dbc -> querySingleItem("SELECT @anz");
+        
+        printf ("<p>Anzahl Projekte: %s</p>", $anz);
+        
+        if (isset($fnum) && $fnum>1 && !$filter && !$subf)
+        {
+            // Formular anzeigen fuer Filterbegriff
+            $text = $fields[$fnum];
+            if ($fnum > 7 && $fnum < 13) $textd = "<br />Format 'jjjj-mm-tt' oder Teil davon"; else $textd = "";
+            $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
+            echo "<form action=" . $_SERVER['PHP_SELF'] . " method='post' enctype='application/x-www-form-urlencoded' id='ffilter' name='ffilter' target='_self'>\n";
+            echo "<input type='hidden' name='s' value='$sort'>";
+            echo "<input type='hidden' name='d' value='$dir'>";
+            echo "<input type='hidden' name='f' value='$fnum'>";
+            echo "<table width=\"40%\" border=\"0\">\n";
+            echo "<tr><td>filtern nach $text:$textd </td>";
+            echo "<td><input id='filter' name='filter' type=\"text\" size=\"10\" maxlength=\"30\" value=\"$filter\"/></td>";
+            echo "<td>Projekte/Seite?   <select name='z'>\n";
+            foreach ($azeil as $key=>$val)
+            {
+                if ($key == $zeil) $select = "selected"; else $select = "";
+                echo "<option $select value='$key'>$val</option>\n";
+            }
+            echo "</select></td>\n";
+            
+            echo "<td><input class=\"button\" type=\"submit\" value=\"finden\" name=\"subf\" title=\"subf\" /></td></tr></table>\n";
+            echo "</form>\n";
+            echo "<p>&nbsp;&nbsp;&nbsp;</p>\n";
+        }
+        echo "<table width='99%'>\n";
+        
+        if ($filter>'!') echo "<tr><td class='bigger' colspan=6>Filter: ". $fields["$fnum"] . " wie '$filter'</td><tr>\n";
+
+        // Listenkopf generieren
+        echo "<tr bgcolor='#68ACBF'>";
+        tab_column(1,"ID",$sort,$dir,0,$fnum,$filter,$start,$zeil);
+        tab_column(5,"zu ID",$sort,$dir,5,$fnum,$filter,$start,$zeil);
+        tab_column(2,"Bezeichnung",$sort,$dir,2,$fnum,$filter,$start,$zeil);
+        tab_column(3,"Beschreibung",$sort,$dir,0,$fnum,$filter,$start,$zeil); 
+        tab_column(4,"Produkt",$sort,$dir,4,$fnum,$filter,$start,$zeil);
+        tab_column(6,"Auftragg.",$sort,$dir,6,$fnum,$filter,$start,$zeil);
+        tab_column(7,"Verantw.",$sort,$dir,7,$fnum,$filter,$start,$zeil);
+        echo "<th>Schritte</th>";
+        tab_column(8,"Start Plan",$sort,$dir,8,$fnum,$filter,$start,$zeil);
+        tab_column(9,"Ende Plan",$sort,$dir,9,$fnum,$filter,$start,$zeil);
+        tab_column(10,"Kosten Plan",$sort,$dir,0,$fnum,$filter,$start,$zeil);    
+        tab_column(11,"Start",$sort,$dir,11,$fnum,$filter,$start,$zeil);
+        tab_column(12,"Ende",$sort,$dir,12,$fnum,$filter,$start,$zeil);
+        tab_column(13,"Kosten",$sort,$dir,0,$fnum,$filter,$start,$zeil);
+        tab_column(14,"Wichtigk.",$sort,$dir,14,$fnum,$filter,$start,$zeil);
+        tab_column(15,"Status",$sort,$dir,15,$fnum,$filter,$start,$zeil);
+        echo "<th>Bemerkung</th>";
+
+        echo "<th>&nbsp;</th>";
+        if (!is_null($_SESSION["recht"]) && in_array("pze",$_SESSION["recht"]))
+            echo "<th>&nbsp;</th>";
+        echo "</tr>\n";
+       
+        foreach ($result as $row)
+        {
+			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+            echo "<tr bgcolor='" . $bg . "'><td>$row->proz_ID</td>";
+            if ($row->proz_ref_ID) echo "<td>$row->proz_ref_ID</td>"; else echo "<td>&nbsp;</td>";
+            echo "<td>$row->bez</td>";
+            echo "<td>" .nl2br($row->bez_l)."</td>"; 
+            echo "<td>$row->prod_name</td>";
+            echo "<td>$row->ama</td>";
+            echo "<td>$row->vma</td>";
+            $steps = explode(";",$row->steps);
+            if (is_array($steps))
+            {
+                echo "<td>";
+                foreach ($steps as $step)
+                {
+                    list($id,$ste) = explode("|",$step);
+                    echo "- $ste<br />";
+                }    
+                echo "</td>";
+            }    
+/*            if ($row->start_pl)
+            {
+                $dat = new DateTime($row->start_pl);    
+                echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
+            }
+            else  echo "<td>&nbsp;</td>";       
+            if ($row->end_pl)
+            {
+                $dat = new DateTime($row->end_pl);    
+                echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
+            }
+            else  echo "<td>&nbsp;</td>";
+            echo "<td>".number_format($row->kost_pl,2,",","."); */       
+            if ($row->start_pl)
+            {
+                $dat = new DateTime($row->start_pl);    
+                echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
+            }
+            else  echo "<td>&nbsp;</td>";       
+            if ($row->end_pl)
+            {
+                $dat = new DateTime($row->end_pl);    
+                echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
+            }
+            else  echo "<td>&nbsp;</td>";
+            if ($row->kost_pl) echo "<td>".number_format($row->kost_pl,2,",","."); else echo "<td>&nbsp;</td>";        
+            if ($row->start)
+            {
+                $dat = new DateTime($row->start);    
+                echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
+            }
+            else  echo "<td>&nbsp;</td>";       
+            if ($row->end)
+            {
+                $dat = new DateTime($row->end);    
+                echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
+            }
+            else  echo "<td>&nbsp;</td>";
+            if ($row->kost) echo "<td>".number_format($row->kost,2,",","."); else echo "<td>&nbsp;</td>";       
+            echo "<td>$row->urg_bez</td>";
+            echo "<td>$row->stat_bez</td>";
+            echo "<td>".nl2br($row->bem)."</td>";
+            echo "<td><a href='/fhiiqm/prozess_ed.php?i=$row->proz_ID&$getp'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
+            if (!is_null($_SESSION["recht"]) && in_array("pze",$_SESSION["recht"]))
+                echo "<td><a href='/fhiiqm/prozess_ed.php?i=$row->proz_ID&dp=1'><img src=\"/fhiiqm/img/duplicate.gif\" alt='duplizieren' title='duplizieren' border='0'/></a></td>";
+        }
+        echo "</table></div>\n";
+
+        echo "<br />&nbsp;&nbsp;&nbsp;";
+        
+        // Sortierung und Filter aus $_GET fuer weitere Seiten
+        foreach ($_GET as $key=>$val)
+        {
+            if ($key != "st") $liste .= "&" . $key ."=".$val;
+        }    
+        // Sortierung und Filter aus $_POST fuer weitere Seiten
+        if ($subf)
+        foreach ($_POST as $key=>$val)
+        {
+            if ($key != "st" && $key != "subf" && $key != "filter") $liste .= "&" . $key ."=".$val;
+            if ($key == "filter") $liste .= "&b=" . $val;
+        }    
+        
+        // Links auf andere Seiten generieren
+        liste_links($start,$zeil,$anz,$liste);
+
+    }
+    else
+    {
+        if ($dbc -> error)  
+            echo "error: " . $dbc -> error . "<br />\n";
+        echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider nichts gefunden f&uuml;r ". $fields["$fnum"] . " wie '$filter'!</p><br />";
+        echo "&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Projektliste\" class=\"sc\">Projektliste</a></p>\n";
+        
+    }
+    $dbc -> close();
+    if (!is_null($_SESSION["recht"]) && in_array("pze",$_SESSION["recht"]))
+        echo "<p>&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/prozess_ed.php\" target=\"_self\" title=\"Projekt erfassen\" class=\"sc\">Weiteres Projekt erfassen</a></p>\n";    
+
+?>
+</body>
 </html>
\ No newline at end of file
--- a/fhiiqm/pz_report.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/pz_report.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,72 +1,72 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 02/2013
- * 
- * Reportauswahl Projekte
- * 
- */
-
-
-
-    error_reporting(E_ALL ^ E_NOTICE);
-    
-    session_start();
-    if (! isset($_SESSION["userid"]))
-    { 
-        include_once ("inc/func_lib.inc.php");	
-        login($_SERVER["PHP_SELF"]);
-        exit;
-    }
-    
-    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("pzr",$_SESSION["recht"]) && !in_array("pze",$_SESSION["recht"]) && 
-            !in_array("ddr",$_SESSION["recht"]) && !in_array("dde",$_SESSION["recht"])))
-    {
-        header("Location: start.php");
-        exit;
-    }    
-    
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-   	<link href="css/db.css" rel="STYLESHEET" type="TEXT/CSS" /> 
-   	<link href="css/navio.css" rel="STYLESHEET" type="TEXT/CSS" /> 
-	<meta name="author" content="Bettina Schwarzer,FHI" />
-
-	<title>Reports Projekte</title>
-</head>
-
-<body>
-<?php
-    echo "&nbsp;";  
-    echo "<div class=\"float-br smaller\" valign='top'>";
-    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
-    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
-    echo "<div class=\"float-r sc\"><img src=\"/fhiiqm/img/sheduled_task.png\" border=\"0\" alt=\"Berichte Projekte\" title=\"Berichte Projekte\"/></div>\n";
-?>
-    <h3>&nbsp;&nbsp;&nbsp;Berichte Projekte</h3>
-    <div align="center">
-    <table width="94%" cellspacing="4" cellpadding="4">
-        <tr>
-            <td class="bigger">
-                <a href="/fhiiqm/report/proz_short_report.php" title="Projekte">Projekte - &Uuml;bersicht</a>
-                <br />&nbsp;&nbsp;&nbsp;Auswahl: Status, Produktgruppe
-                <br />&nbsp;&nbsp;&nbsp;Ansicht: Projekt, Beschreibung, Produkt, Verantwortlicher, Status
-            </td>
-        </tr>
-        <tr>
-            <td class="bigger">
-                <a href="/fhiiqm/report/prozess_report.php" title="Projekte">Projekte - Details</a>
-                <br />&nbsp;&nbsp;&nbsp;Auswahl: Status, Produktgruppe
-                <br />&nbsp;&nbsp;&nbsp;Ansicht: Projekt, Verantwortlicher, Auftraggeber, Plan-Datum, -Kosten, Ist-Datum, -Kosten, Status, Schritte
-            </td>
-        </tr>
-    </table>
-    </div>    
-
-</body>
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 02/2013
+ * 
+ * Reportauswahl Projekte
+ * 
+ */
+
+
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    session_start();
+    if (! isset($_SESSION["userid"]))
+    { 
+        include_once ("inc/func_lib.inc.php");	
+        login($_SERVER["PHP_SELF"]);
+        exit;
+    }
+    
+    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("pzr",$_SESSION["recht"]) && !in_array("pze",$_SESSION["recht"]) && 
+            !in_array("ddr",$_SESSION["recht"]) && !in_array("dde",$_SESSION["recht"])))
+    {
+        header("Location: start.php");
+        exit;
+    }    
+    
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="css/db.css" rel="STYLESHEET" type="TEXT/CSS" /> 
+   	<link href="css/navio.css" rel="STYLESHEET" type="TEXT/CSS" /> 
+	<meta name="author" content="Bettina Schwarzer,FHI" />
+
+	<title>Reports Projekte</title>
+</head>
+
+<body>
+<?php
+    echo "&nbsp;";  
+    echo "<div class=\"float-br smaller\" valign='top'>";
+    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+    echo "<div class=\"float-r sc\"><img src=\"/fhiiqm/img/sheduled_task.png\" border=\"0\" alt=\"Berichte Projekte\" title=\"Berichte Projekte\"/></div>\n";
+?>
+    <h3>&nbsp;&nbsp;&nbsp;Berichte Projekte</h3>
+    <div align="center">
+    <table width="94%" cellspacing="4" cellpadding="4">
+        <tr>
+            <td class="bigger">
+                <a href="/fhiiqm/report/proz_short_report.php" title="Projekte">Projekte - &Uuml;bersicht</a>
+                <br />&nbsp;&nbsp;&nbsp;Auswahl: Status, Produktgruppe, Abteilung Auftraggeber
+                <br />&nbsp;&nbsp;&nbsp;Ansicht: Projekt, Beschreibung, Produkt, Verantwortlicher, Status
+            </td>
+        </tr>
+        <tr>
+            <td class="bigger">
+                <a href="/fhiiqm/report/prozess_report.php" title="Projekte">Projekte - Details</a>
+                <br />&nbsp;&nbsp;&nbsp;Auswahl: Status, Produktgruppe
+                <br />&nbsp;&nbsp;&nbsp;Ansicht: Projekt, Verantwortlicher, Auftraggeber, Plan-Datum, -Kosten, Ist-Datum, -Kosten, Status, betroffene Arbeitsgruppen, Schritte
+            </td>
+        </tr>
+    </table>
+    </div>    
+
+</body>
 </html>
\ No newline at end of file
--- a/fhiiqm/raum_report.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/raum_report.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,86 +1,93 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 05/2012
- * 
- * Reportauswahl Raeume
- * 
- */
-
-
-
-    error_reporting(E_ALL ^ E_NOTICE);
-    
-    session_start();
-    if (! isset($_SESSION["userid"]))
-    { 
-        include_once ("inc/func_lib.inc.php");	
-        login($_SERVER["PHP_SELF"]);
-        exit;
-    }
-    
-    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("rr",$_SESSION["recht"]) && !in_array("re",$_SESSION["recht"]) && 
-            !in_array("ddr",$_SESSION["recht"]) && !in_array("dde",$_SESSION["recht"])))
-    {
-        header("Location: start.php");
-        exit;
-    }    
-    
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-   	<link href="css/db.css" rel="STYLESHEET" type="TEXT/CSS" /> 
-   	<link href="css/navio.css" rel="STYLESHEET" type="TEXT/CSS" /> 
-	<meta name="author" content="Bettina Schwarzer,FHI" />
-
-	<title>Reports R&auml;ume</title>
-</head>
-
-<body>
-<?php
-    echo "&nbsp;";  
-    echo "<div class=\"float-br smaller\" valign='top'>";
-    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
-    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
-    echo "<div class=\"float-r sc\"><img src=\"/fhiiqm/img/house.png\" border=\"0\" alt=\"Berichte Raeume\" title=\"Berichte Raeume\"/></div>\n";
-?>
-    <h3>&nbsp;&nbsp;&nbsp;Berichte R&auml;ume</h3>
-    <div align="center">
-    <table width="94%" cellspacing="4" cellpadding="4">
-        <tr>
-            <td class="bigger">
-                <a href="/fhiiqm/report/raum_vma_report.php" title="Raumverantwortliche">Raum - Raumverantwortliche</a>
-                <br />&nbsp;&nbsp;&nbsp;Auswahl: Haus, Raum-Typ
-                <br />&nbsp;&nbsp;&nbsp;Ansicht: Haus, Raum-Nr., Raum-Bezeichnung, Raum-Typ, Fl&auml;che, Verantwortliche
-            </td>
-        </tr>
-        <tr>
-            <td class="bigger">
-                <a href="/fhiiqm/report/raum_info_as_report.php" title="Raum Info">Raum Informationen Arbeitssicherheit</a>
-                <br />&nbsp;&nbsp;&nbsp;Auswahl: Haus, Raum, Raum-Typ
-                <br />&nbsp;&nbsp;&nbsp;Ansicht: Datenblatt 'Dauerbetrieb' (Haus, Raum-Nr., Raum-Bezeichnung, Raum-Typ, Geräte-Anzahl, Gefährdungen, Verantwortliche, Raum-Nutzer)
-            </td>
-        </tr>
-        <tr>
-            <td class="bigger">
-                <a href="/fhiiqm/report/raum_dez_anl_report.php" title="Dauerversuch">Labor Dauerversuch</a>
-                <br />&nbsp;&nbsp;&nbsp;Auswahl: Haus, Raum, Raum-Typ
-                <br />&nbsp;&nbsp;&nbsp;Ansicht: Datenblatt 'Dauerbetrieb' (Haus, Raum-Nr., Raum-Bezeichnung, Raum-Typ, Geräte, Verantwortliche)
-            </td>
-        </tr>
-        <tr>
-            <td class="bigger">
-                <a href="/fhiiqm/report/raum_dversuch_report.php" title="Dauerversuch 2">Labor Dauerversuch Aushang</a>
-                <br />&nbsp;&nbsp;&nbsp;Auswahl: Haus, Raum, Raum-Typ
-                <br />&nbsp;&nbsp;&nbsp;Ansicht: Datenblatt 'Dauerbetrieb' (Haus, Raum-Nr., Raum-Bezeichnung, Raum-Typ, Geräte-Anzahl, Gefährdungen, Verantwortliche, Raum-Nutzer)
-            </td>
-        </tr>
-    </table>
-    </div>    
-
-</body>
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 05/2012
+ * 
+ * Reportauswahl Raeume
+ * 
+ */
+
+
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    session_start();
+    if (! isset($_SESSION["userid"]))
+    { 
+        include_once ("inc/func_lib.inc.php");	
+        login($_SERVER["PHP_SELF"]);
+        exit;
+    }
+    
+    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("rr",$_SESSION["recht"]) && !in_array("re",$_SESSION["recht"]) && 
+            !in_array("ddr",$_SESSION["recht"]) && !in_array("dde",$_SESSION["recht"])))
+    {
+        header("Location: start.php");
+        exit;
+    }    
+    
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="css/db.css" rel="STYLESHEET" type="TEXT/CSS" /> 
+   	<link href="css/navio.css" rel="STYLESHEET" type="TEXT/CSS" /> 
+	<meta name="author" content="Bettina Schwarzer,FHI" />
+
+	<title>Reports R&auml;ume</title>
+</head>
+
+<body>
+<?php
+    echo "&nbsp;";  
+    echo "<div class=\"float-br smaller\" valign='top'>";
+    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+    echo "<div class=\"float-r sc\"><img src=\"/fhiiqm/img/house.png\" border=\"0\" alt=\"Berichte Raeume\" title=\"Berichte Raeume\"/></div>\n";
+?>
+    <h3>&nbsp;&nbsp;&nbsp;Berichte R&auml;ume</h3>
+    <div align="center">
+    <table width="94%" cellspacing="4" cellpadding="4">
+        <tr>
+            <td class="bigger">
+                <a href="/fhiiqm/report/raum_vma_report.php" title="Raumverantwortliche">Raum - Raumverantwortliche</a>
+                <br />&nbsp;&nbsp;&nbsp;Auswahl: Haus, Raum-Typ
+                <br />&nbsp;&nbsp;&nbsp;Ansicht: Haus, Raum-Nr., Raum-Bezeichnung, Raum-Typ, Fl&auml;che, Verantwortliche
+            </td>
+        </tr>
+        <tr>
+            <td class="bigger">
+                <a href="/fhiiqm/report/raum_info_as1_report.php" title="Raum Info">Raum Informationen Arbeitssicherheit (aktuell)</a>
+                <br />&nbsp;&nbsp;&nbsp;Auswahl: Haus, Raum, Raum-Typ
+                <br />&nbsp;&nbsp;&nbsp;Ansicht: Datenblatt 'Dauerbetrieb' (Haus, Raum-Nr., Raum-Bezeichnung, Raum-Typ, Geräte-Anzahl, Gefährdungen, Verantwortliche, Raum-Nutzer)
+            </td>
+        </tr>
+        <tr>
+            <td class="bigger">
+                <a href="/fhiiqm/report/raum_info_as_report.php" title="Raum Info">Raum Informationen Arbeitssicherheit (3. Variante)</a>
+                <br />&nbsp;&nbsp;&nbsp;Auswahl: Haus, Raum, Raum-Typ
+                <br />&nbsp;&nbsp;&nbsp;Ansicht: Datenblatt 'Dauerbetrieb' (Haus, Raum-Nr., Raum-Bezeichnung, Raum-Typ, Geräte-Anzahl, Gefährdungen, Verantwortliche, Raum-Nutzer)
+            </td>
+        </tr>
+        <tr>
+            <td class="bigger">
+                <a href="/fhiiqm/report/raum_dez_anl_report.php" title="Dauerversuch">Labor Dauerversuch (2. Variante)</a>
+                <br />&nbsp;&nbsp;&nbsp;Auswahl: Haus, Raum, Raum-Typ
+                <br />&nbsp;&nbsp;&nbsp;Ansicht: Datenblatt 'Dauerbetrieb' (Haus, Raum-Nr., Raum-Bezeichnung, Raum-Typ, Geräte, Verantwortliche)
+            </td>
+        </tr>
+        <tr>
+            <td class="bigger">
+                <a href="/fhiiqm/report/raum_dversuch_report.php" title="Dauerversuch 2">Labor Dauerversuch Aushang (1. Variante)</a>
+                <br />&nbsp;&nbsp;&nbsp;Auswahl: Haus, Raum, Raum-Typ
+                <br />&nbsp;&nbsp;&nbsp;Ansicht: Datenblatt 'Dauerbetrieb' (Haus, Raum-Nr., Raum-Bezeichnung, Raum-Typ, Geräte-Anzahl, Gefährdungen, Verantwortliche, Raum-Nutzer)
+            </td>
+        </tr>
+    </table>
+    </div>    
+
+</body>
 </html>
\ No newline at end of file
--- a/fhiiqm/report/abt_ag_aptyp_report.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/report/abt_ag_aptyp_report.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,262 +1,262 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 06/2012
- * 
- * Report Abteilung - AG - Arbplatztypen (Raum-Arb.-Gruppen)
- * $_GET['s']=2 - Aufruf aus adm-fhi-Seite ohne Anmeldung
- * 
- */
-
-    error_reporting(E_ALL ^ E_NOTICE);
-    
-    if (!isset($_GET['s']) || $_GET['s'] != 2 )
-    {
-        session_start();
-        if (! isset($_SESSION["userid"]))
-        { 
-            include_once ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");	
-            login($_SERVER["PHP_SELF"]);
-            exit;
-        }
-        
-        if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("asr",$_SESSION["recht"]) && !in_array("ase",$_SESSION["recht"])))
-        {
-            header("Location: start.php");
-            exit;
-        }    
-    }   
-	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
-	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
-   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
-	<title>Report Abteilung-AG-Arb.platztypen</title>
-</head>
-
-<body>
-
-<?php    
-    echo "&nbsp;";  
-    if (!isset($_GET['s']) || $_GET['s'] != 2 )
-    {
-        echo "<div class=\"float-br smaller\" valign='top'>";
-        echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
-        echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
-    }
-    echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/role.png\" border=\"0\" alt=\"RaumArbGruppe\" title=\"Raum-Arbeitsgruppe\"/></div>\n";
-
-    $rag    = $_POST["rag"];    // Parameter aus Form
-    $search = $_POST["search"];
-    if (!$search) $search =  $_GET["s"];
-
-    $zeil = $rag["z"];
-    if (!$zeil) $zeil = $_GET["z"];
-    if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
-    $start = $_GET["st"];   // Start bei DS $start+1
-    if (!$start) $start=0;
-    
-    if (!is_array($rag))
-    {
-        $rag["abt"]   = $_GET["a"];
-        $rag["sort1"]   = $_GET["s1"];
-        $rag["sort2"]   = $_GET["s2"];
-        $rag["sort3"]   = $_GET["s3"];
-    }
-    $_GET["a"] = $rag["abt"];
-    $_GET["s1"] = $rag["sort1"];
-    $_GET["s2"] = $rag["sort2"];
-    $_GET["s3"] = $rag["sort3"];
-    $_GET["z"]  = $zeil;
-   
-    if ($search && $_GET['s'] != 2)
-    {    
-        echo "<span class='sc'>";
-        echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/as_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
-        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Abt-AG-Arbpltyp\" class=\"sc\">neuer Bericht Abteilung-AG-Arbeitsplatztypen</a>\n";    
-        echo "</span>";
-    }
-    echo "<div align='center'>\n";
-    echo "<p><b>(3) Bericht Abteilung - AG - Arbeitsplatztypen</b></p>\n";
-    echo "</div>\n";
-    if (!$search)
-    {
-?>
-        <div align="center">
-        <p>Bitte Kriterien f&uuml;r die Suche w&auml;hlen</p>
-        <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_raum" target="_self">	
-        <table width="50%" border="0" cellspacing="3" cellpadding="3">
-            <tr>
-                <td>Abteilung</td>
-                <td>
-                    <select name="rag[abt]" size="1">
-                    <?php 
-                        if ($rag["abt"] == -1) $select = " selected "; else $select = "";
-                        echo "<option $select value=\"-1\"></option>\n";
-                        $sql = "SELECT abt_ID, abt_name, abt_long FROM Abteilung WHERE abt_ID < 8 ORDER BY 1";
-                        if ($result = $dbc->queryObjectArray($sql))
-                        {
-                            foreach ($result as $row)
-                            {
-                                if ($row->abt_ID == $rag['abt'])
-            					   echo "<option selected value=\"$row->abt_ID\">$row->abt_name - $row->abt_long</option>\n";
-            				    else
-            					   echo "<option value=\"$row->abt_ID\">$row->abt_name - $row->abt_long</option>\n";
-                            }
-                        }
-                    ?>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
-            <?php
-                $sort = array("-1"=>"","1"=>"Abteilung","3"=>"Arbeitsgruppe","4"=>"Arbeitsplatz-Typ");
-                for ($i=1; $i<4; $i++)
-                { 
-                  echo "$i.&nbsp;&nbsp;<select name='rag[sort$i]'>\n";
-                  foreach ($sort as $key=>$val)
-                  {
-                    $rsort = "sort" . $i;
-                    if ($rag[$rsort] == $val) $select= " selected"; else $select = "";
-                    echo "<option$select value='$key'>$val</option>\n";
-                  }
-                  echo "</select>&nbsp;&nbsp;&nbsp;&nbsp;\n";
-                } 
-                echo "</td></tr>\n";
-        
-                $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
-                echo "<tr><td>Zeilen/Seite?</td><td><select name='rag[z]'>\n";
-                if (!$rag['z']) $rag['z'] = 9999;
-                foreach ($azeil as $key=>$val)
-                {
-                    if ($key == $rag['z']) $select = "selected"; else $select = "";
-                    echo "<option $select value='$key'>$val</option>\n";
-                }
-                echo "</select></td></tr>\n";
-        
-            ?>
-            <tr> 
-                <td>&nbsp;</td>
-                <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
-            </tr> 
-        </table>
-        </div>
-        </form>
-<?php
-    }
-    else
-    {
-        echo "<div align='center'>\n";
-        
-        $sql = "SELECT DISTINCT rg.abt_ID,abt_name,rag_bez, ra.arbplatz_typ, arbplatz_typ_bez, rg.rag_ID  
-                FROM fhiiqm.RaumArb_Gruppe rg LEFT OUTER JOIN Abteilung a ON rg.abt_ID=a.abt_ID
-                LEFT OUTER JOIN Raum_RaumArbGruppe rr ON rg.rag_ID=rr.rag_ID
-                LEFT OUTER JOIN Raum r ON rr.raum_ID=r.raum_ID
-                LEFT OUTER JOIN Raum_Arbplatz_Typ ra ON r.raum_ID=ra.raum_ID
-                LEFT OUTER JOIN Arbplatz_Typ t ON ra.arbplatz_typ=t.arbplatz_typ";        
-
-        $lim = " LIMIT $start,$zeil";
-        
-        if ($rag["abt"]> -1) 
-            $where = " rg.abt_ID = '$rag[abt]' ";
-        if ($where) $where = " WHERE $where";
-        
-        if ($rag["sort1"]>0 || $rag["sort2"]>0 || $rag["sort3"]>0)
-        {
-            if ($rag["sort1"]>0) $ord  = $rag["sort1"];
-            if ($rag["sort2"]>0) $ord .= ",".$rag["sort2"];
-            if ($rag["sort3"]>0) $ord .= ",".$rag["sort3"];
-        }
-        
-        $sql .= $where;
-        $ianz = $dbc -> numrows($sql); 
-        if ($ord) $ord = " ORDER BY  ".$ord; else $ord = "";
-        $sql .= $ord . $lim;
-//        echo "sql = $sql<br />\n";
-        $result = $dbc ->queryObjectArray($sql);
-        
-        if ($rag["abt"] > -1)
-        { 
-            $abtn = $dbc -> querySingleItem("SELECT abt_name FROM Abteilung WHERE abt_ID=".$rag["abt"]);
-            $krit = " [Abteilung = '$abtn']";
-        }
-        if ($krit )echo "Suchergebnis f&uuml;r $krit<p></p>\n"; else echo "Suchergebnis<p></p>\n";
-        
-        if ($result)
-        {
-            include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
-            
-    		$bg1 = "#F8F8F8";
-    		$bg2 = "#DEDFE1";
-    		$bg = "#FFFFFF";
-            echo "<table border='1' cellspacing='0' cellpadding='2'>\n";
-            // Listenkopf
-            echo "<tr bgcolor='#68ACBF'>";
-            if (!$rag['abt'] || $rag['abt'] == -1) echo "<th>Abteilung</th>";
-            echo "<th>Arbeitsgruppe</th>";
-            echo "<th>Arbeitsplatz-Typ</th>";
-            echo "</tr>\n";
-
-            foreach ($result as $row)
-            {
-                if ($row->rag_ID != $rid)
-                {
-                    if ($rid) echo "</td></tr>\n"; 
-        			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-                    echo "<tr bgcolor='" . $bg . "'>"; 
-                    if (!$rag['abt'] || $rag['abt'] == -1) echo "<td>$row->abt_name";
-                    if (strpos($row->rag_bez,"DynamiX")) $row->rag_bez = str_replace("X","&chi;",$row->rag_bez);
-                    echo "<td>$row->rag_bez";
-                    echo "<td>$row->arbplatz_typ - $row->arbplatz_typ_bez";
-                }
-                else
-                    echo "<br />$row->arbplatz_typ - $row->arbplatz_typ_bez";
-               $rid = $row->rag_ID;          
-            }
-            echo "</table>\n";
-            echo "<p></p><table width=40%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
-                <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
-            echo "</div>\n";
-        
-            echo "<br />&nbsp;&nbsp;&nbsp;";
-            if ($search != 2) // Aufruf aus fhiiqm
-            {    
-                // Parameter aus $_GET fuer weitere Seiten
-                $_GET["s"] = 1; // bewirkt weitere Suche
-                foreach ($_GET as $key=>$val)
-                {
-                    if ($key != "st") $liste .= "&" . $key ."=".$val;
-                }    
-                // Links auf andere Seiten generieren
-                liste_links($start,$zeil,$ianz,$liste);
-            }
-        }
-        else
-        {
-            echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
-            echo "</div>\n";
-            echo "<br />&nbsp;&nbsp;&nbsp;";
-        }
-        if ($search != 2)
-        {    
-            echo "<span class='sc'>";
-            echo "<br /><br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/as_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
-            echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Raum-Typ\" class=\"sc\">neuer Bericht Abteilung-AG-Arbeitsplatztypen</a>\n";    
-            echo "</span>";
-        }
-        else
-            echo "<a href='javascript:history.back();' onMouseOver=\"{window.status='Zur&uuml;ck'; return true;}\">&laquo; Zur&uuml;ck</a>";
-    }
-
-?>
-
-</body>
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 06/2012
+ * 
+ * Report Abteilung - AG - Arbplatztypen (Raum-Arb.-Gruppen)
+ * $_GET['s']=2 - Aufruf aus adm-fhi-Seite ohne Anmeldung
+ * 
+ */
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    if (!isset($_GET['s']) || $_GET['s'] != 2 )
+    {
+        session_start();
+        if (! isset($_SESSION["userid"]))
+        { 
+            include_once ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");	
+            login($_SERVER["PHP_SELF"]);
+            exit;
+        }
+        
+        if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("asr",$_SESSION["recht"]) && !in_array("ase",$_SESSION["recht"])))
+        {
+            header("Location: start.php");
+            exit;
+        }    
+    }   
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
+   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
+	<title>Report Abteilung-AG-Arb.platztypen</title>
+</head>
+
+<body>
+
+<?php    
+    echo "&nbsp;";  
+    if (!isset($_GET['s']) || $_GET['s'] != 2 )
+    {
+        echo "<div class=\"float-br smaller\" valign='top'>";
+        echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+        echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+    }
+    echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/role.png\" border=\"0\" alt=\"RaumArbGruppe\" title=\"Raum-Arbeitsgruppe\"/></div>\n";
+
+    $rag    = $_POST["rag"];    // Parameter aus Form
+    $search = $_POST["search"];
+    if (!$search) $search =  $_GET["s"];
+
+    $zeil = $rag["z"];
+    if (!$zeil) $zeil = $_GET["z"];
+    if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
+    $start = $_GET["st"];   // Start bei DS $start+1
+    if (!$start) $start=0;
+    
+    if (!is_array($rag))
+    {
+        $rag["abt"]   = $_GET["a"];
+        $rag["sort1"]   = $_GET["s1"];
+        $rag["sort2"]   = $_GET["s2"];
+        $rag["sort3"]   = $_GET["s3"];
+    }
+    $_GET["a"] = $rag["abt"];
+    $_GET["s1"] = $rag["sort1"];
+    $_GET["s2"] = $rag["sort2"];
+    $_GET["s3"] = $rag["sort3"];
+    $_GET["z"]  = $zeil;
+   
+    if ($search && $_GET['s'] != 2)
+    {    
+        echo "<span class='sc'>";
+        echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/as_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
+        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Abt-AG-Arbpltyp\" class=\"sc\">neuer Bericht Abteilung-AG-Arbeitsplatztypen</a>\n";    
+        echo "</span>";
+    }
+    echo "<div align='center'>\n";
+    echo "<p><b>(3) Bericht Abteilung - AG - Arbeitsplatztypen</b></p>\n";
+    echo "</div>\n";
+    if (!$search)
+    {
+?>
+        <div align="center">
+        <p>Bitte Kriterien f&uuml;r die Suche w&auml;hlen</p>
+        <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_raum" target="_self">	
+        <table width="50%" border="0" cellspacing="3" cellpadding="3">
+            <tr>
+                <td>Abteilung</td>
+                <td>
+                    <select name="rag[abt]" size="1">
+                    <?php 
+                        if ($rag["abt"] == -1) $select = " selected "; else $select = "";
+                        echo "<option $select value=\"-1\"></option>\n";
+                        $sql = "SELECT abt_ID, abt_name, abt_long FROM Abteilung WHERE abt_ID < 8 ORDER BY 1";
+                        if ($result = $dbc->queryObjectArray($sql))
+                        {
+                            foreach ($result as $row)
+                            {
+                                if ($row->abt_ID == $rag['abt'])
+            					   echo "<option selected value=\"$row->abt_ID\">$row->abt_name - $row->abt_long</option>\n";
+            				    else
+            					   echo "<option value=\"$row->abt_ID\">$row->abt_name - $row->abt_long</option>\n";
+                            }
+                        }
+                    ?>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
+            <?php
+                $sort = array("-1"=>"","1"=>"Abteilung","3"=>"Arbeitsgruppe","4"=>"Arbeitsplatz-Typ");
+                for ($i=1; $i<4; $i++)
+                { 
+                  echo "$i.&nbsp;&nbsp;<select name='rag[sort$i]'>\n";
+                  foreach ($sort as $key=>$val)
+                  {
+                    $rsort = "sort" . $i;
+                    if ($rag[$rsort] == $val) $select= " selected"; else $select = "";
+                    echo "<option$select value='$key'>$val</option>\n";
+                  }
+                  echo "</select>&nbsp;&nbsp;&nbsp;&nbsp;\n";
+                } 
+                echo "</td></tr>\n";
+        
+                $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
+                echo "<tr><td>Zeilen/Seite?</td><td><select name='rag[z]'>\n";
+                if (!$rag['z']) $rag['z'] = 9999;
+                foreach ($azeil as $key=>$val)
+                {
+                    if ($key == $rag['z']) $select = "selected"; else $select = "";
+                    echo "<option $select value='$key'>$val</option>\n";
+                }
+                echo "</select></td></tr>\n";
+        
+            ?>
+            <tr> 
+                <td>&nbsp;</td>
+                <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
+            </tr> 
+        </table>
+        </div>
+        </form>
+<?php
+    }
+    else
+    {
+        echo "<div align='center'>\n";
+        
+        $sql = "SELECT DISTINCT rg.abt_ID,abt_name,rag_bez, ra.arbplatz_typ, arbplatz_typ_bez, rg.rag_ID  
+                FROM fhiiqm.RaumArb_Gruppe rg LEFT OUTER JOIN Abteilung a ON rg.abt_ID=a.abt_ID
+                LEFT OUTER JOIN Raum_RaumArbGruppe rr ON rg.rag_ID=rr.rag_ID
+                LEFT OUTER JOIN Raum r ON rr.raum_ID=r.raum_ID
+                LEFT OUTER JOIN Raum_Arbplatz_Typ ra ON r.raum_ID=ra.raum_ID
+                LEFT OUTER JOIN Arbplatz_Typ t ON ra.arbplatz_typ=t.arbplatz_typ";        
+
+        $lim = " LIMIT $start,$zeil";
+        
+        if ($rag["abt"]> -1) 
+            $where = " rg.abt_ID = '$rag[abt]' ";
+        if ($where) $where = " WHERE $where";
+        
+        if ($rag["sort1"]>0 || $rag["sort2"]>0 || $rag["sort3"]>0)
+        {
+            if ($rag["sort1"]>0) $ord  = $rag["sort1"];
+            if ($rag["sort2"]>0) $ord .= ",".$rag["sort2"];
+            if ($rag["sort3"]>0) $ord .= ",".$rag["sort3"];
+        }
+        
+        $sql .= $where;
+        $ianz = $dbc -> numrows($sql); 
+        if ($ord) $ord = " ORDER BY  ".$ord; else $ord = "";
+        $sql .= $ord . $lim;
+//        echo "sql = $sql<br />\n";
+        $result = $dbc ->queryObjectArray($sql);
+        
+        if ($rag["abt"] > -1)
+        { 
+            $abtn = $dbc -> querySingleItem("SELECT abt_name FROM Abteilung WHERE abt_ID=".$rag["abt"]);
+            $krit = " [Abteilung = '$abtn']";
+        }
+        if ($krit )echo "Suchergebnis f&uuml;r $krit<p></p>\n"; else echo "Suchergebnis<p></p>\n";
+        
+        if ($result)
+        {
+            include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+            
+    		$bg1 = "#F8F8F8";
+    		$bg2 = "#DEDFE1";
+    		$bg = "#FFFFFF";
+            echo "<table border='1' cellspacing='0' cellpadding='2'>\n";
+            // Listenkopf
+            echo "<tr bgcolor='#68ACBF'>";
+            if (!$rag['abt'] || $rag['abt'] == -1) echo "<th>Abteilung</th>";
+            echo "<th>Arbeitsgruppe</th>";
+            echo "<th>Arbeitsplatz-Typ</th>";
+            echo "</tr>\n";
+
+            foreach ($result as $row)
+            {
+                if ($row->rag_ID != $rid)
+                {
+                    if ($rid) echo "</td></tr>\n"; 
+        			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                    echo "<tr bgcolor='" . $bg . "'>"; 
+                    if (!$rag['abt'] || $rag['abt'] == -1) echo "<td>$row->abt_name";
+                    if (strpos($row->rag_bez,"DynamiX")) $row->rag_bez = str_replace("X","&chi;",$row->rag_bez);
+                    echo "<td>$row->rag_bez";
+                    echo "<td>$row->arbplatz_typ - $row->arbplatz_typ_bez";
+                }
+                else
+                    echo "<br />$row->arbplatz_typ - $row->arbplatz_typ_bez";
+               $rid = $row->rag_ID;          
+            }
+            echo "</table>\n";
+            echo "<p></p><table width=40%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
+                <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
+            echo "</div>\n";
+        
+            echo "<br />&nbsp;&nbsp;&nbsp;";
+            if ($search != 2) // Aufruf aus fhiiqm
+            {    
+                // Parameter aus $_GET fuer weitere Seiten
+                $_GET["s"] = 1; // bewirkt weitere Suche
+                foreach ($_GET as $key=>$val)
+                {
+                    if ($key != "st") $liste .= "&" . $key ."=".$val;
+                }    
+                // Links auf andere Seiten generieren
+                liste_links($start,$zeil,$ianz,$liste);
+            }
+        }
+        else
+        {
+            echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
+            echo "</div>\n";
+            echo "<br />&nbsp;&nbsp;&nbsp;";
+        }
+        if ($search != 2)
+        {    
+            echo "<span class='sc'>";
+            echo "<br /><br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/as_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
+            echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Raum-Typ\" class=\"sc\">neuer Bericht Abteilung-AG-Arbeitsplatztypen</a>\n";    
+            echo "</span>";
+        }
+        else
+            echo "<a href='javascript:history.back();' onMouseOver=\"{window.status='Zur&uuml;ck'; return true;}\">&laquo; Zur&uuml;ck</a>";
+    }
+
+?>
+
+</body>
 </html>
\ No newline at end of file
--- a/fhiiqm/report/fkt_ma_report.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/report/fkt_ma_report.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,312 +1,323 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 05/2012
- * 
- * Liste Funktionen ohne Berechtigung fuer Aufruf aus Intranet:
- * 
- * $_GET["s"] = 1, ='suchen', muss gesetzt sein
- * $_GET["l"] = b, (fkt_listb in tab 'Funktion') zusätzlich liefert die Liste der Beauftragten FHI
- *  
- */
-
-    error_reporting(E_ALL ^ E_NOTICE);
-    
-    if (!isset($_GET["s"]))
-    {
-        session_start();
-        if (! isset($_SESSION["userid"]))
-        { 
-            include_once ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");	
-            login($_SERVER["PHP_SELF"]);
-            exit;
-        }
-        
-        if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("fmr",$_SESSION["recht"]) && !in_array("fme",$_SESSION["recht"])))
-        {
-            header("Location: start.php");
-            exit;
-        }
-    }    
-
-	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
-
-	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
-    
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
-   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
-	<title>Beauftragte</title>
-</head>
-
-<body>
-<?php
-    if (!isset($_GET["s"]))
-    {
-        echo "&nbsp;";  
-        echo "<div class=\"float-br smaller\" valign='top'>";
-        echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
-        echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
-        echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/reseller_account_template.png\" border=\"0\" alt=\"Mitarbeiter-Funktion\" title=\"Mitarbeiter-Funktion\"/></div>\n";
-    }
-    $rag    = $_POST["rag"];    // Parameter aus Form
-    $search = $_POST["search"];
-    if (!$search) $search =  $_GET["s"];
-
-    if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
-    $start = $_GET["st"];   // Start bei DS $start+1
-    if (!$start) $start=0;
-    
-    if (!is_array($rag))
-    {
-        $rag["fktg"]     = $_GET["g"];  // Funktionsgruppe
-        $rag["fkt"]     = $_GET["f"];   // Funktion
-        $rag["nfkt"]     = $_GET["n"];  // nicht ausgewaehlte Funktion
-        $rag["fktb"]    = $_GET["b"];   // Geltungsbereich
-        $rag["bind"]    = $_GET["j"];   // Verknuepfung
-        if ($_GET['s']) $bl = $_GET['l'];   // Beauftragte Institut (Tabelle 'Funktion': fkt_listb ='b')
-    }
-/*
-    $_GET["f"] = $rag["fkt"];
-    $_GET["b"] = $rag["fktb"];
-    $_GET["j"] = $rag["bind"];
-*/   
-    if ($search && !isset($_GET["s"]))
-        echo "<br /><br />&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Gefahren\" class=\"sc\">neuer Bericht Beauftragte</a></p>\n";
-    if ($bl) $text = " am Fritz-Haber-Institut"; else $text="";
-    echo "<div align='center'>\n";
-    echo "<p><b>Bericht Beauftragte$text</b></p>\n";
-    echo "</div>\n";
-    if (!$search)
-    {
-?>
-        <div align="center">
-        <h3><font face="Verdana, Arial, Helvetica, sans-serif"></font></h3>
-        <p>Bitte Kriterien f&uuml;r die Suche w&auml;hlen</p>
-        </div>
-        <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_rag" target="_self">	
-        <div align="center">
-        <table width="50%" border="0" cellspacing="3" cellpadding="3">
-            <tr>
-                <td>Funktionsgruppe</td>
-                <td>
-                    <select name="rag[fktg]" size="1" onchange="this.form.submit();">
-                    <?php 
-                        if ($rag["fktg"] == -1) $select = " selected "; else $select = "";
-                        echo "<option $select value=\"-1\"></option>\n";
-                        $sql = "SELECT fktgr_ID,fktgr_bez 
-                                    FROM Funktion_Gruppe ORDER BY 1";
-                        if ($result = $dbc->queryObjectArray($sql))
-                        {
-                            foreach ($result as $row)
-                            {
-                                if ($row->fktgr_ID == $rag['fktg'])
-            					   echo "<option selected value=\"$row->fktgr_ID\">$row->fktgr_bez</option>\n";
-            				    else
-            					   echo "<option value=\"$row->fktgr_ID\">$row->fktgr_bez</option>\n";
-                            }
-                        }
-                    ?>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>Funktion</td>
-                <td>
-                    <select name="rag[fkt]" size="1">
-                    <?php 
-                        if ($rag["fkt"] == -1) $select = " selected "; else $select = "";
-                        echo "<option $select value=\"-1\"></option>\n";
-                        if (isset($rag["fktg"]) && $rag["fktg"]) $where = " WHERE fktgr_ID = '".$rag["fktg"] ."'"; else $where ="";
-                        $sql = "SELECT DISTINCT mf.fkt_ID,fkt_bez 
-                                    FROM fhiiqm.MA_Funktion mf INNER JOIN Funktion f ON mf.fkt_ID=f.fkt_ID $where ORDER BY 2";
-                        if ($result = $dbc->queryObjectArray($sql))
-                        {
-                            foreach ($result as $row)
-                            {
-                                if ($row->fkt_ID == $rag['fkt'])
-            					   echo "<option selected value=\"$row->fkt_ID\">$row->fkt_bez</option>\n";
-            				    else
-            					   echo "<option value=\"$row->fkt_ID\">$row->fkt_bez</option>\n";
-                            }
-                        }
-                    ?>
-                    </select>
-                    &nbsp;&nbsp;&nbsp; diese nicht&nbsp;&nbsp;&nbsp;<input type="checkbox" name="rag[nfkt]" value="1"/> 
-                </td>
-            </tr>
-            <tr>
-                <td>Geltungsbereich</td>
-                <td>
-                    <select name="rag[fktb]" size="1">
-                    <?php 
-                        if ($rag["fktb"] == -1) $select = " selected "; else $select = "";
-                        echo "<option $select value=\"-1\"></option>\n";
-                        $sql = "SELECT DISTINCT fkt_bereich FROM fhiiqm.MA_Funktion ORDER BY 1";
-                        if ($result = $dbc->queryObjectArray($sql))
-                        {
-                            foreach ($result as $row)
-                            {
-                                if ($row->fkt_bereich == $rag['fktb'])
-            					   echo "<option selected value=\"$row->fkt_bereich\">$row->fkt_bereich</option>\n";
-            				    else
-            					   echo "<option value=\"$row->fkt_bereich\">$row->fkt_bereich</option>\n";
-                            }
-                        }
-                    ?>
-                    </select>
-                </td>
-            </tr>
-            <tr> 
-                  <td>Verkn&uuml;pfung</td>
-                  <td>UND&nbsp;&nbsp;&nbsp;
-                    <input type="radio" name="rag[bind]" value="AND" <?php if (isset($rag["bind"]) && $rag["bind"]=="AND") echo "checked"; else  echo "checked";?>>
-                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ODER&nbsp;&nbsp;&nbsp;
-                    <input type="radio" name="rag[bind]" value="OR" <?php if (isset($rag["bind"]) && $rag["bind"]=="OR") echo "checked"; ?>></td>
-            </tr>
-            <tr> 
-                <td>&nbsp;</td>
-                <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
-            </tr> 
-        </table>
-        </div>
-        </form>
-<?php
-    }
-    else
-    {
-        echo "<div align='center'>\n";
-//print_r($rag); echo "<br />";
-        $sql = "SELECT nachname,vorname,titel,abt_name,mf.fkt_ID,fkt_bez,fkt_bereich,fkt_bem,telefon_nr AS tel,email,geb_ID,raum_nr 
-                    FROM fhiiqm.MA_Funktion mf INNER JOIN Mitarbeiter m ON mf.persknr=m.Persknr
-                    INNER JOIN Funktion f ON mf.fkt_ID=f.fkt_ID
-                    LEFT OUTER JOIN Abteilung a ON m.abt_tel=a.abt_ID
-                    LEFT OUTER JOIN Mitarbeiter_Raum mr ON m.persknr=mr.persknr
-                    LEFT OUTER JOIN Raum r ON mr.raum_ID=r.raum_ID 
-                    LEFT OUTER JOIN MA_Telefon t ON (mf.persknr=t.persknr AND t.sort=1) 
-                    WHERE (fkt_bis IS NULL OR fkt_bis>=DATE(NOW())) AND (fkt_von IS NULL OR fkt_von<=DATE(NOW())) ";
-        $lim = " LIMIT $start,$zeil";
-        
-        if (!$rag["bind"]) $bind = " AND "; else $bind = $rag["bind"];
-        
-        if ($rag["fkt"]> -1)
-        { 
-            if ($rag['nfkt'])
-                $where = " mf.fkt_ID <> '$rag[fkt]' ";
-            else
-                $where = " mf.fkt_ID = '$rag[fkt]' ";
-        }
-        if ($rag["fktg"]> -1) 
-            if ($where) $where .= "$bind fktgr_ID = '$rag[fktg]' "; else $where = " fktgr_ID = '$rag[fktg]' ";
-        if ($rag["fktb"]> -1) 
-            if ($where) $where .= "$bind fkt_bereich = '$rag[fktb]' "; else $where = " fkt_bereich = '$rag[fktb]' ";
-        
-        if ($bl == 'b') 
-        {
-            $where = " fkt_listb ='b'";
-            $rag["fkt"] = -1;
-        }
-        if ($where) $where = " AND ($where)";
-        
-        
-        $sql .= $where . ' ORDER BY 6,7,1,2' . $lim;
-
-        $result = $dbc ->queryObjectArray($sql);
-        
-        if ($rag["fktg"] > -1)
-        {
-            $sql = "SELECT fktgr_bez FROM Funktion_Gruppe WHERE fktgr_ID = '" . $rag["fktg"] ."'";
-            $fktgbez = $dbc -> querySingleItem($sql);
-            $krit = " [Gruppierung = '$fktgbez']";
-        } 
-        if ($rag["fkt"] > -1)
-        {
-            $sql = "SELECT fkt_bez FROM Funktion WHERE fkt_ID = '" . $rag["fkt"] ."'";
-            $fktbez = $dbc -> querySingleItem($sql);
-            if ($krit) $bd = " ".$bind; else $bd = "";
-            if ($rag["nfkt"]) $vgl = "<>"; else $vgl = "=";
-            $krit .=  $bd." [Funktion $vgl '$fktbez']";
-        } 
-        if ($rag["fktb"] > -1)
-        { 
-            if ($krit) $bd = " ".$bind; else $bd = "";
-            $krit .= $bd." [Geltungsbereich = '" . $rag["fktb"] ."']";
-        }   
-        if ($krit )echo "$krit"; else echo "";
-
-        if ($result)
-        {
-    		$bg1 = "#F8F8F8";
-    		$bg2 = "#DEDFE1";
-    		$bg = "#FFFFFF";
-
-            $sqlc = "SELECT COUNT(*)
-                        FROM fhiiqm.MA_Funktion mf INNER JOIN Mitarbeiter m ON mf.persknr=m.Persknr
-                        INNER JOIN Funktion f ON mf.fkt_ID=f.fkt_ID
-                        LEFT OUTER JOIN Abteilung a ON m.abt_tel=a.abt_ID
-                        LEFT OUTER JOIN Mitarbeiter_Raum mr ON m.persknr=mr.persknr
-                        LEFT OUTER JOIN Raum r ON mr.raum_ID=r.raum_ID 
-                        WHERE (fkt_bis IS NULL OR fkt_bis>=DATE(NOW())) AND (fkt_von IS NULL OR fkt_von<=DATE(NOW()))                     
-                        $where";
-            $ianz = $dbc -> querySingleItem($sqlc);
-
-            //$ianz = $dbc -> numrows($sql); //liefert nur $zeil!
-            printf ("<p>Anzahl: %s</p>", $ianz);
-//            if ($bl) $class = " class='bigger'"; else $class="";    // nur fuer Beauftragte Institut
-            
-            echo "<table border='0' cellspacing='0' cellpadding='2'>\n";
-            // Listenkopf
-            echo "<tr bgcolor='#68ACBF'>";
-            if ($rag["fkt"] == -1 || $rag["nfkt"]) echo "<th$class>Funktion</th>";
-            echo "<th$class>Geltungsbereich</th>";
-            echo "<th$class>Name</th>";
-            echo "<th$class>Abteilung</th>";
-            echo "<th$class>Geb&auml;ude</th>";
-            echo "<th$class>Raum-Nr.</th>";
-            echo "<th$class>Tel.</th>";
-            echo "<th$class>E-Mail</th></tr>\n";
-
-            
-            foreach ($result as $row)
-            {
-    			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-                echo "<tr bgcolor='" . $bg . "'>";
-                if ($rag["fkt"] == -1 || $rag["nfkt"]) echo "<td$class>$row->fkt_bez $row->fkt_bem</td>";
-                echo "<td$class>$row->fkt_bereich</td>";
-                echo "<td$class>$row->titel $row->nachname, $row->vorname</td>";
-                echo "<td$class>$row->abt_name</td>";
-                echo "<td$class>$row->geb_ID</td>";
-                echo "<td$class>$row->raum_nr</td>";
-                echo "<td$class>$row->tel</td>";
-                echo "<td$class><a href='mailto:$row->email'>$row->email</a></td></tr>\n";
-            }   
-            echo "</table>\n";
-
-            echo "<p></p><table width=60%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
-                <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
-
-            echo "</div>\n";
-            
-            echo "<br />&nbsp;&nbsp;&nbsp;";
-        }
-        else
-        {
-            echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
-            echo "</div>\n";
-        }
-
-        if (!isset($_GET["s"]))
-            echo "<br /><br />&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Gefahren\" class=\"sc\">neuer Bericht Beauftragte</a></p>\n";
-    }
-
-?>
-
-</body>
-</html>
-
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 05/2012
+ * 
+ * Liste Funktionen ohne Berechtigung fuer Aufruf aus Intranet:
+ * 
+ * $_GET["s"] = 1, ='suchen', muss gesetzt sein
+ * $_GET["l"] = b, (fkt_listb in tab 'Funktion') zusätzlich liefert die Liste der Beauftragten FHI
+ *  
+ */
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    if (!isset($_GET["s"]))
+    {
+        session_start();
+        if (! isset($_SESSION["userid"]))
+        { 
+            include_once ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");	
+            login($_SERVER["PHP_SELF"]);
+            exit;
+        }
+        
+        if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("fmr",$_SESSION["recht"]) && !in_array("fme",$_SESSION["recht"])))
+        {
+            header("Location: start.php");
+            exit;
+        }
+    }    
+
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+
+	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+    
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
+   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
+	<title>Beauftragte</title>
+</head>
+
+<body>
+<?php
+    if (!isset($_GET["s"]))
+    {
+        echo "&nbsp;";  
+        echo "<div class=\"float-br smaller\" valign='top'>";
+        echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+        echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+        echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/reseller_account_template.png\" border=\"0\" alt=\"Mitarbeiter-Funktion\" title=\"Mitarbeiter-Funktion\"/></div>\n";
+    }
+    $rag    = $_POST["rag"];    // Parameter aus Form
+    $search = $_POST["search"];
+    if (!$search) $search =  $_GET["s"];
+
+    if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
+    $start = $_GET["st"];   // Start bei DS $start+1
+    if (!$start) $start=0;
+    
+    if (!is_array($rag))
+    {
+        $rag["fktg"]     = $_GET["g"];  // Funktionsgruppe
+        $rag["fkt"]     = $_GET["f"];   // Funktion
+        $rag["nfkt"]     = $_GET["n"];  // nicht ausgewaehlte Funktion
+        $rag["fktb"]    = $_GET["b"];   // Geltungsbereich
+        $rag["bind"]    = $_GET["j"];   // Verknuepfung
+        if ($_GET['s']) $bl = $_GET['l'];   // Beauftragte Institut (Tabelle 'Funktion': fkt_listb ='b')
+    }
+/*
+    $_GET["f"] = $rag["fkt"];
+    $_GET["b"] = $rag["fktb"];
+    $_GET["j"] = $rag["bind"];
+*/   
+    if ($search && !isset($_GET["s"]))
+        echo "<br /><br />&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Gefahren\" class=\"sc\">neuer Bericht Beauftragte</a></p>\n";
+    if ($bl) $text = " am Fritz-Haber-Institut"; else $text="";
+    echo "<div align='center'>\n";
+    echo "<p><b>Bericht Beauftragte$text</b></p>\n";
+    echo "</div>\n";
+    if (!$search)
+    {
+?>
+        <div align="center">
+        <h3><font face="Verdana, Arial, Helvetica, sans-serif"></font></h3>
+        <p>Bitte Kriterien f&uuml;r die Suche w&auml;hlen</p>
+        </div>
+        <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_rag" target="_self">	
+        <div align="center">
+        <table width="50%" border="0" cellspacing="3" cellpadding="3">
+            <tr>
+                <td>Funktionsgruppe</td>
+                <td>
+                    <select name="rag[fktg]" size="1" onchange="this.form.submit();">
+                    <?php 
+                        if ($rag["fktg"] == -1) $select = " selected "; else $select = "";
+                        echo "<option $select value=\"-1\"></option>\n";
+                        $sql = "SELECT fktgr_ID,fktgr_bez 
+                                    FROM Funktion_Gruppe ORDER BY 1";
+                        if ($result = $dbc->queryObjectArray($sql))
+                        {
+                            foreach ($result as $row)
+                            {
+                                if ($row->fktgr_ID == $rag['fktg'])
+            					   echo "<option selected value=\"$row->fktgr_ID\">$row->fktgr_bez</option>\n";
+            				    else
+            					   echo "<option value=\"$row->fktgr_ID\">$row->fktgr_bez</option>\n";
+                            }
+                        }
+                    ?>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>Funktion</td>
+                <td>
+                    <select name="rag[fkt]" size="1">
+                    <?php 
+                        if ($rag["fkt"] == -1) $select = " selected "; else $select = "";
+                        echo "<option $select value=\"-1\"></option>\n";
+                        if (isset($rag["fktg"]) && $rag["fktg"]) $where = " WHERE fktgr_ID = '".$rag["fktg"] ."'"; else $where ="";
+                        $sql = "SELECT DISTINCT mf.fkt_ID,fkt_bez 
+                                    FROM fhiiqm.MA_Funktion mf INNER JOIN Funktion f ON mf.fkt_ID=f.fkt_ID $where ORDER BY 2";
+                        if ($result = $dbc->queryObjectArray($sql))
+                        {
+                            foreach ($result as $row)
+                            {
+                                if ($row->fkt_ID == $rag['fkt'])
+            					   echo "<option selected value=\"$row->fkt_ID\">$row->fkt_bez</option>\n";
+            				    else
+            					   echo "<option value=\"$row->fkt_ID\">$row->fkt_bez</option>\n";
+                            }
+                        }
+                    ?>
+                    </select>
+                    &nbsp;&nbsp;&nbsp; diese nicht&nbsp;&nbsp;&nbsp;<input type="checkbox" name="rag[nfkt]" value="1"/> 
+                </td>
+            </tr>
+            <tr>
+                <td>Geltungsbereich</td>
+                <td>
+                    <select name="rag[fktb]" size="1">
+                    <?php 
+                        if ($rag["fktb"] == -1) $select = " selected "; else $select = "";
+                        echo "<option $select value=\"-1\"></option>\n";
+                        $sql = "SELECT DISTINCT fkt_bereich FROM fhiiqm.MA_Funktion ORDER BY 1";
+                        if ($result = $dbc->queryObjectArray($sql))
+                        {
+                            foreach ($result as $row)
+                            {
+                                if ($row->fkt_bereich == $rag['fktb'])
+            					   echo "<option selected value=\"$row->fkt_bereich\">$row->fkt_bereich</option>\n";
+            				    else
+            					   echo "<option value=\"$row->fkt_bereich\">$row->fkt_bereich</option>\n";
+                            }
+                        }
+                    ?>
+                    </select>
+                </td>
+            </tr>
+            <tr> 
+                  <td>Verkn&uuml;pfung</td>
+                  <td>UND&nbsp;&nbsp;&nbsp;
+                    <input type="radio" name="rag[bind]" value="AND" <?php if (isset($rag["bind"]) && $rag["bind"]=="AND") echo "checked"; else  echo "checked";?>>
+                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ODER&nbsp;&nbsp;&nbsp;
+                    <input type="radio" name="rag[bind]" value="OR" <?php if (isset($rag["bind"]) && $rag["bind"]=="OR") echo "checked"; ?>></td>
+            </tr>
+            <tr> 
+                <td>&nbsp;</td>
+                <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
+            </tr> 
+        </table>
+        </div>
+        </form>
+<?php
+    }
+    else
+    {
+        echo "<div align='center'>\n";
+//print_r($rag); echo "<br />";
+        $sql = "SELECT nachname,vorname,titel,abt_name,mf.fkt_ID,fkt_bez,fkt_bereich,fkt_bem,telefon_nr AS tel,email,geb_ID,raum_nr,mf_ID 
+                    FROM fhiiqm.MA_Funktion mf INNER JOIN Mitarbeiter m ON mf.persknr=m.Persknr
+                    INNER JOIN Funktion f ON mf.fkt_ID=f.fkt_ID
+                    LEFT OUTER JOIN Abteilung a ON m.abt_tel=a.abt_ID
+                    LEFT OUTER JOIN Mitarbeiter_Raum mr ON m.persknr=mr.persknr
+                    LEFT OUTER JOIN Raum r ON mr.raum_ID=r.raum_ID 
+                    LEFT OUTER JOIN MA_Telefon t ON (mf.persknr=t.persknr AND t.sort=1) 
+                    WHERE (fkt_bis IS NULL OR fkt_bis>=DATE(NOW())) AND (fkt_von IS NULL OR fkt_von<=DATE(NOW())) ";
+        $lim = " LIMIT $start,$zeil";
+        
+        if (!$rag["bind"]) $bind = " AND "; else $bind = $rag["bind"];
+        
+        if ($rag["fkt"]> -1)
+        { 
+            if ($rag['nfkt'])
+                $where = " mf.fkt_ID <> '$rag[fkt]' ";
+            else
+                $where = " mf.fkt_ID = '$rag[fkt]' ";
+        }
+        if ($rag["fktg"]> -1) 
+            if ($where) $where .= "$bind fktgr_ID = '$rag[fktg]' "; else $where = " fktgr_ID = '$rag[fktg]' ";
+        if ($rag["fktb"]> -1) 
+            if ($where) $where .= "$bind fkt_bereich = '$rag[fktb]' "; else $where = " fkt_bereich = '$rag[fktb]' ";
+        
+        if ($bl == 'b') 
+        {
+            $where = " fkt_listb ='b'";
+            $rag["fkt"] = -1;
+        }
+        if ($where) $where = " AND ($where)";
+        
+        
+        $sql .= $where . ' ORDER BY 6,7,1,2' . $lim;
+
+        $result = $dbc ->queryObjectArray($sql);
+        
+        if ($rag["fktg"] > -1)
+        {
+            $sql = "SELECT fktgr_bez FROM Funktion_Gruppe WHERE fktgr_ID = '" . $rag["fktg"] ."'";
+            $fktgbez = $dbc -> querySingleItem($sql);
+            $krit = " [Gruppierung = '$fktgbez']";
+        } 
+        if ($rag["fkt"] > -1)
+        {
+            $sql = "SELECT fkt_bez FROM Funktion WHERE fkt_ID = '" . $rag["fkt"] ."'";
+            $fktbez = $dbc -> querySingleItem($sql);
+            if ($krit) $bd = " ".$bind; else $bd = "";
+            if ($rag["nfkt"]) $vgl = "<>"; else $vgl = "=";
+            $krit .=  $bd." [Funktion $vgl '$fktbez']";
+        } 
+        if ($rag["fktb"] > -1)
+        { 
+            if ($krit) $bd = " ".$bind; else $bd = "";
+            $krit .= $bd." [Geltungsbereich = '" . $rag["fktb"] ."']";
+        }   
+        if ($krit )echo "$krit"; else echo "";
+
+        if ($result)
+        {
+    		$bg1 = "#F8F8F8";
+    		$bg2 = "#DEDFE1";
+    		$bg = "#FFFFFF";
+
+            $sqlc = "SELECT COUNT(*)
+                        FROM fhiiqm.MA_Funktion mf INNER JOIN Mitarbeiter m ON mf.persknr=m.Persknr
+                        INNER JOIN Funktion f ON mf.fkt_ID=f.fkt_ID
+                        LEFT OUTER JOIN Abteilung a ON m.abt_tel=a.abt_ID
+                        LEFT OUTER JOIN Mitarbeiter_Raum mr ON m.persknr=mr.persknr
+                        LEFT OUTER JOIN Raum r ON mr.raum_ID=r.raum_ID 
+                        WHERE (fkt_bis IS NULL OR fkt_bis>=DATE(NOW())) AND (fkt_von IS NULL OR fkt_von<=DATE(NOW()))                     
+                        $where";
+            $ianz = $dbc -> querySingleItem($sqlc);
+
+            //$ianz = $dbc -> numrows($sql); //liefert nur $zeil!
+            printf ("<p>Anzahl: %s</p>", $ianz);
+//            if ($bl) $class = " class='bigger'"; else $class="";    // nur fuer Beauftragte Institut
+            
+            echo "<table border='0' cellspacing='0' cellpadding='2'>\n";
+            // Listenkopf
+            echo "<tr bgcolor='#68ACBF'>";
+            if ($rag["fkt"] == -1 || $rag["nfkt"]) echo "<th$class>Funktion</th>";
+            echo "<th$class>Geltungsbereich</th>";
+            echo "<th$class>Name</th>";
+            echo "<th$class>Abteilung</th>";
+            echo "<th$class>Geb&auml;ude</th>";
+            echo "<th$class>Raum-Nr.</th>";
+            echo "<th$class>Tel.</th>";
+            echo "<th$class>E-Mail</th></tr>\n";
+
+            
+            foreach ($result as $row)
+            {
+                $sqla = "SELECT DISTINCT CASE WHEN abt_tel<> 7 THEN a.abt_name ELSE 
+                            (CASE WHEN rag.abt_ID = 7 THEN rag.rag_bezk ELSE '' END) END AS abt_name
+                		FROM MA_Funktion mf 
+                		LEFT OUTER JOIN fhiiqm.Mitarbeiter m ON mf.persknr=m.persknr
+                		LEFT OUTER JOIN fhiiqm.Abteilung a ON m.abt_tel=a.abt_ID
+                		LEFT OUTER JOIN fhiiqm.MA_RaumArbGruppe ma ON mf.persknr=ma.persknr
+                		LEFT OUTER JOIN fhiiqm.RaumArb_Gruppe rag ON ma.rag_ID=rag.rag_ID 
+                        WHERE mf_ID = ".$row->mf_ID .
+                        " ORDER BY rag.abt_ID DESC"; 
+                $abtn = $dbc -> querySingleItem($sqla);
+//echo "sql = $sqla<br />, $abtn<br />";
+    			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                echo "<tr bgcolor='" . $bg . "'>";
+                if ($rag["fkt"] == -1 || $rag["nfkt"]) echo "<td$class>$row->fkt_bez $row->fkt_bem</td>";
+                echo "<td$class>$row->fkt_bereich</td>";
+                echo "<td$class>$row->titel $row->nachname, $row->vorname</td>";
+                echo "<td$class>$abtn</td>";
+                echo "<td$class>$row->geb_ID</td>";
+                echo "<td$class>$row->raum_nr</td>";
+                echo "<td$class>$row->tel</td>";
+                echo "<td$class><a href='mailto:$row->email'>$row->email</a></td></tr>\n";
+            }   
+            echo "</table>\n";
+
+            echo "<p></p><table width=60%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
+                <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
+
+            echo "</div>\n";
+            
+            echo "<br />&nbsp;&nbsp;&nbsp;";
+        }
+        else
+        {
+            echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
+            echo "</div>\n";
+        }
+
+        if (!isset($_GET["s"]))
+            echo "<br /><br />&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Gefahren\" class=\"sc\">neuer Bericht Beauftragte</a></p>\n";
+    }
+
+?>
+
+</body>
+</html>
+
--- a/fhiiqm/report/keytyp_bestand_all_report.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/report/keytyp_bestand_all_report.php	Fri Dec 20 15:19:32 2013 +0100
@@ -139,8 +139,8 @@
             <tr>
                 <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
             <?php
-                $sort = array("-1"=>"","1"=>"Schl&uuml;sseltyp","2"=>"Level","3"=>"Besitzer");
-                for ($i=1; $i<3; $i++)
+                $sort = array("-1"=>"","1"=>"Schl&uuml;sseltyp","2"=>"Level","3"=>"Besitzer","4"=>"Abteilung");
+                for ($i=1; $i<4; $i++)
                 { 
                   echo "$i.&nbsp;&nbsp;<select name='ky[sort$i]'>\n";
                   foreach ($sort as $key=>$val)
@@ -197,27 +197,28 @@
             $wherk = " AND h.keytyp_ID IN ($strkt) ";
             $wherd = " AND h.depot_ID = '".$ky["dep"]."'";
         }
-        if ($ky["sort1"]>0 || $ky["sort2"]>0)
+        if ($ky["sort1"]>0 || $ky["sort2"]>0 || $ky["sort3"]>0)
         {
             if ($ky["sort1"]>0) $ord  = " ORDER BY " . $ky["sort1"];
             if ($ky["sort2"]>0) $ord .= ",".$ky["sort2"];
+            if ($ky["sort3"]>0) $ord .= ",".$ky["sort3"];
         }
          
         $sql = "SELECT h.keytyp_ID, key_level, 
-                    CONCAT (nachname, ', ',vorname, ', ' , IFNULL(abt_name,''),' (',CASE aktiv WHEN 0 THEN 'inaktiv' ELSE 'aktiv' END, ')') AS keyowner, h.depot_ID, 'ma' AS tab,  
+                    CONCAT (nachname, ', ',vorname, ', ' , IFNULL(abt_name,''),' (',CASE aktiv WHEN 0 THEN 'inaktiv' ELSE 'aktiv' END, ')') AS keyowner, IFNULL(abt_name,'') AS abt, h.depot_ID, 'ma' AS tab,  
                 	SUM(CASE WHEN pers_action='get' THEN IFNULL(pers_anz,0) ELSE 0 END) - SUM(CASE WHEN pers_action='out' THEN IFNULL(pers_anz,0) ELSE 0 END) - SUM(CASE WHEN pers_action='lost' THEN IFNULL(pers_anz,0) ELSE 0 END) AS bestand
                 	FROM fhiiqm.Mitarbeiter m 
                 	INNER JOIN Keytyp_MA h ON m.persknr=h.persknr
                     INNER JOIN Keytyp k ON h.keytyp_ID = k.keytyp_ID 
                     LEFT OUTER JOIN Abteilung a ON m.abt_tel=a.abt_ID
                 	WHERE m.aktiv<2
-					GROUP BY h.keytyp_ID, key_level,keyowner
+					GROUP BY h.keytyp_ID, key_level,keyowner,abt
                     HAVING bestand > 0 $where $wherk
                 UNION
-                SELECT h.keytyp_ID, key_level,CONCAT(depot_ID,'-Depot') AS keyowner, h.depot_ID, 'dep' AS tab, 
+                SELECT h.keytyp_ID, key_level,CONCAT(depot_ID,'-Depot') AS keyowner, depot_ID AS abt, h.depot_ID, 'dep' AS tab, 
                     SUM(CASE WHEN depot_action='get' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='out' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='lost' THEN IFNULL(depot_anz,0) ELSE 0 END) AS bestand
                     FROM fhiiqm.Keytyp_Depot h INNER JOIN Keytyp k ON h.keytyp_ID = k.keytyp_ID
-                    GROUP BY h.keytyp_ID, key_level,keyowner
+                    GROUP BY h.keytyp_ID, key_level,keyowner,abt
                     HAVING bestand > 0 $where $wherd";
         $ianz = $dbc -> numrows($sql); 
         $sql .= $ord . $lim;
@@ -254,7 +255,7 @@
                 echo "<th>Level</th><th>Schl&uuml;sseltyp</th>";
             else            
                 echo "<th>Schl&uuml;sseltyp</th><th>Level</th>";
-            echo "<th>Besitzer</th><th>Anzahl</th>";
+            echo "<th>Besitzer</th><th>Abt.</th><th>Anzahl</th>";
             $anzt = 0;
             foreach ($result as $row)
             {
@@ -266,11 +267,12 @@
                     echo "<td>$row->keytyp_ID</td><td>$row->key_level</td>";
                 if ($row->tab == 'dep') $cl = " class = 'bold'"; else $cl = "";
                 echo "<td$cl>$row->keyowner</td>";
+                echo "<td>$row->abt</td>";
                 echo "<td class='right'>$row->bestand</td>"; 
                 echo "</tr>";
                 $anzt += $row->bestand;
             }
-            echo "<tr><td colspan='2'>&nbsp;</td><td>Summe</td><td class='right'>$anzt</td></tr>";
+            echo "<tr><td colspan='2'>&nbsp;</td><td colspan='2'>Summe</td><td class='right'>$anzt</td></tr>";
             echo "</table>\n";
             echo "<p></p><table width=40%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
                 <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
--- a/fhiiqm/report/keytyp_dep_anz_report.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/report/keytyp_dep_anz_report.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,282 +1,282 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 06/2013
- * 
- * Report Uebersicht Keytyp in Depots
- */
-
-    error_reporting(E_ALL ^ E_NOTICE);
-    
-    session_start();
-    if (! isset($_SESSION["userid"]))
-    { 
-        include_once ($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/inc/func_lib.inc.php");	
-        login($_SERVER["PHP_SELF"]);
-        exit;
-    }
-    
-    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("kr",$_SESSION["recht"]) && !in_array("ke",$_SESSION["recht"])))
-    {
-        header("Location: start.php");
-        exit;
-    }    
-
-	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
-	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
-    
-    // zulaessige Depots
-    $uid = $_SESSION["userid"];
-    $sql = "SELECT depot_ID FROM KeyDepot_userweb WHERE userid = '$uid'";
-    $res = $dbc -> queryObjectArray($sql);
-    foreach ($res as $row)
-        $adep[] = $row->depot_ID;
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
-   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
-	<title>Report &Uuml;bersicht Schl&uuml;sseltypen</title>
-</head>
-
-<body>
-
-<?php    
-    echo "&nbsp;";  
-    echo "<div class=\"float-br smaller\" valign='top'>";
-    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
-    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
-    echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/key.png\" border=\"0\" alt=\"Keytyp &Uuml:bersicht\" title=\"Schl&uuml;sseltypen im Depot\"/></div>\n";
-
-    $ky    = $_POST["ky"];    // Parameter aus Form
-    $search = $_POST["search"];
-    if (!$search) $search =  $_GET["s"];
-
-    $zeil = $ky["z"];
-    if (!$zeil) $zeil = $_GET["z"];
-    if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
-    $start = $_GET["st"];   // Start bei DS $start+1
-    if (!$start) $start=0;
-    
-    if (!is_array($ky))
-    {
-        $ky["dep"] = $_GET["d"];
-        $ky["kt"] = $_GET["k"];
-        $ky["bind"]    = $_GET["b"];
-        $ky["sort1"]   = $_GET["s1"];
-        $ky["sort2"]   = $_GET["s2"];
-    }
-    $_GET["d"] = $ky["dep"];
-    $_GET["k"] = $ky["kt"];
-    $_GET["b"] = $ky["bind"];
-    $_GET["s1"]= $ky["sort1"];
-    $_GET["s2"]= $ky["sort2"];
-    $_GET["z"]  = $zeil;
-    
-    if ($search)
-    {    
-        echo "<span class='sc'>";
-        echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/keytyp_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
-        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"&Uuml;bersicht Keytyp\" class=\"sc\">neuer Bericht &Uuml;bersicht Schl&uuml;sseltypen</a>\n";    
-        echo "</span>";
-    }
-
-    echo "<div align='center'>\n";
-    echo "<p><b>Bericht &Uuml;bersicht Schl&uuml;sseltypen </b></p>\n";
-    echo "</div>\n";
-    
-
-    if (!$search)
-    {
-?>
-        <div align="center">
-        <p>Bitte Kriterien f&uuml;r die Suche w&auml;hlen</p>
-        <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_raum" target="_self">	
-        <table width="50%" border="0" cellspacing="3" cellpadding="3">
-            <tr>
-                <td>Depot</td>
-                <td><select name="ky[dep]" onchange="this.form.submit();">
-                    <?php
-                        if ($ky["dep"] == -1) $select = "selected='selected'"; else $select = "";
-                        echo "<option $select value=\"-1\"></option>\n";
-                        $strdep = "'". implode("','",$adep) ."'";
-                        $sql = "SELECT * FROM fhiiqm.KeyDepot WHERE depot_ID IN ($strdep)";
-                        if ($res = $dbc -> queryObjectArray($sql))
-                            foreach ($res as $row)
-                            {
-                               if ($row->depot_ID == $ky['dep']) $select = "selected='selected'"; else $select = "";
-    					       echo "<option $select value=\"$row->depot_ID\">$row->depot_ID: $row->depot_bez</option>\n";
-                            }
-                        $beg=0;
-                    ?>
-                </select>
-                </td>
-            </tr>
-            <tr>
-                <td>Schl&uuml;sseltyp</td>
-                <td><select name="ky[kt]">
-                    <?php
-                        if ($ky["kt"] == -1) $select = "selected='selected'"; else $select = "";
-                        echo "<option $select value=\"-1\"></option>\n";
-                        $strdep = "'". implode("','",$adep) ."'";
-                        $sql = "SELECT key_level,d.keytyp_ID,keytyp_bez,
-                                        SUM(CASE WHEN depot_action='get' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='out' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='lost' THEN IFNULL(depot_anz,0) ELSE 0 END) AS bestand
-                                        FROM fhiiqm.Keytyp_Depot d INNER JOIN Keytyp k ON d.keytyp_ID=k.keytyp_ID 
-                                        WHERE depot_ID = '" . $ky['dep'] . "'
-                                GROUP BY key_level,d.keytyp_ID,keytyp_bez";
-                        if ($res = $dbc -> queryObjectArray($sql))
-                            foreach ($res as $row)
-                            {
-                               if ($row->keytyp_ID == $ky['kt']) $select = "selected='selected'"; else $select = "";
-    					       echo "<option $select value=\"$row->keytyp_ID\">$row->key_level - $row->keytyp_ID [$row->keytyp_bez] ($row->bestand)</option>\n";
-                            }
-                        $beg=0;
-                    ?>
-                </select>
-            </tr>
-            <tr> 
-                  <td>Verkn&uuml;pfung</td>
-                  <td>UND&nbsp;&nbsp;&nbsp;
-                    <input type="radio" name="ky[bind]" value="AND" <?php if (isset($ky["bind"]) && $ky["bind"]=="AND") echo "checked='checked'"; else  echo "checked='checked'";?>>
-                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ODER&nbsp;&nbsp;&nbsp;
-                    <input type="radio" name="ky[bind]" value="OR" <?php if (isset($ky["bind"]) && $ky["bind"]=="OR") echo "checked='checked'"; ?>></td>
-            </tr>
-            <tr>
-                <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
-            <?php
-                $sort = array("-1"=>"","1"=>"Depot","2,3"=>"Schl&uuml;sseltyp");
-                for ($i=1; $i<3; $i++)
-                { 
-                  echo "$i.&nbsp;&nbsp;<select name='ky[sort$i]'>\n";
-                  foreach ($sort as $key=>$val)
-                  {
-                    $rsort = "sort" . $i;
-                    if ($ky[$rsort] == $val) $select = "selected='selected'"; else $select = "";
-                    echo "<option $select value='$key'>$val</option>\n";
-                  }
-                  echo "</select>&nbsp;&nbsp;&nbsp;&nbsp;\n";
-                } 
-                echo "</td></tr>\n";
-        
-                $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
-                echo "<tr><td>Zeilen/Seite?</td><td><select name='ky[z]'>\n";
-                if (!$ky['z']) $ky['z'] = 9999;
-                foreach ($azeil as $key=>$val)
-                {
-                    if ($key == $ky['z']) $select = "selected='selected'"; else $select = "";
-                    echo "<option $select value='$key'>$val</option>\n";
-                }
-                echo "</select></td></tr>\n";
-        
-            ?>
-            <tr> 
-                <td>&nbsp;</td>
-                <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
-            </tr> 
-        </table>
-        </div>
-        </form>
-<?php
-    }
-    else
-    {
-        echo "<div align='center'>\n";
-        $sql = "SELECT depot_ID,key_level,d.keytyp_ID,keytyp_bez,
-            		SUM(CASE WHEN depot_action='get' THEN IFNULL(depot_anz,0) ELSE 0 END) AS anzget,
-            		SUM(CASE WHEN depot_action='out' THEN IFNULL(depot_anz,0) ELSE 0 END) AS anzout,
-            		SUM(CASE WHEN depot_action='lost' THEN IFNULL(depot_anz,0) ELSE 0 END) AS anzlost,
-            		SUM(CASE WHEN depot_action='get' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='out' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='lost' THEN IFNULL(depot_anz,0) ELSE 0 END) AS bestand
-            		FROM fhiiqm.Keytyp_Depot d INNER JOIN Keytyp k ON d.keytyp_ID=k.keytyp_ID 
-            		GROUP BY depot_ID,keytyp_ID";
-
-        $lim = " LIMIT $start,$zeil";
-        
-        if (!$ky["bind"]) $bind = " AND "; else $bind = $ky["bind"];
-        
-        if ($ky["dep"]> -1) $where = " depot_ID = '$ky[dep]' ";
-        if ($ky["kt"]> -1)
-            if ($where) $where .= "$bind keytyp_ID = '$ky[kt]' "; else $where = " keytyp_ID = '$ky[kt]' ";
-        if ($where) $where = " HAVING ($where)";
-        
-        if ($ky["sort1"]>0 || $ky["sort2"]>0)
-        {
-            if ($ky["sort1"]>0) $ord  = " ORDER BY " . $ky["sort1"];
-            if ($ky["sort2"]>0) $ord .= ",".$ky["sort2"];
-        }
-        
-        $sql .= $where;
-        $ianz = $dbc -> numrows($sql); 
-        $sql .= $ord . $lim;
-        $result = $dbc ->queryObjectArray($sql);
-        if ($dbc -> error)
-        {
-            echo "error SELECT: " . $dbc -> error . "<br /><br />";
-            echo "sql = $sql<br />\n";
-        }
-        if ($ky["dep"]> -1) $krit = " [Depot = <b>'" . $ky["dep"] ."'</b>]";
-        if ($ky["kt"] > -1)
-        { 
-            if ($krit) $bd = " ".$bind; else $bd = "";
-            $krit .= $bd." [Schl&uuml;sseltyp = <b>'".$ky["kt"]."'</b>]";
-        }
-        if ($krit )echo "Suchergebnis f&uuml;r $krit"; else echo "Suchergebnis\n";
-        printf ("<p>Anzahl Schl&uuml;sseltypen: %s</p>", $ianz);
-
-        if ($result)
-        {
-            include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
-            
-    		$bg1 = "#F8F8F8";
-    		$bg2 = "#DEDFE1";
-    		$bg = "#FFFFFF";
-            echo "<table border='1' cellspacing='0' cellpadding='2'>\n";
-            // Listenkopf
-            echo "<tr bgcolor='#68ACBF'>";
-            if ($ky["dep"] == -1) echo "<td>Depot</td>";            
-            echo "<th>Schl&uuml;sseltyp</th><th>Schl&uuml;sseltyp-Bezeichnung</th><th>Zugang</th><th>Abgang</th><th>Verlust</th><th>Bestand</th>";
-            foreach ($result as $row)
-            {
-        		if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-                echo "<tr bgcolor='" . $bg . "'>";
-                if ($ky["dep"] == -1) echo "<td>$row->depot_ID</td>";
-                echo "<td>$row->key_level - $row->keytyp_ID</td><td>$row->keytyp_bez</td>";
-                echo "<td class='right'>$row->anzget</td><td class='right'>$row->anzout</td><td class='right'>$row->anzlost</td><td class='right'>$row->bestand</td>"; 
-                echo "</tr>";
-            }
-            echo "</table>\n";
-            echo "<p></p><table width=40%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
-                <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
-            echo "</div>\n";
-        
-            echo "<br />&nbsp;&nbsp;&nbsp;";
-            if ($search != 2) // Aufruf aus fhiiqm
-            {    
-                // Parameter aus $_GET fuer weitere Seiten
-                $_GET["s"] = 1; // bewirkt weitere Suche
-                foreach ($_GET as $key=>$val)
-                {
-                    if ($key != "st") $liste .= "&" . $key ."=".$val;
-                }    
-                // Links auf andere Seiten generieren
-                liste_links($start,$zeil,$ianz,$liste);
-            }
-        }
-        else
-        {
-            echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
-            echo "</div>\n";
-            echo "<br />&nbsp;&nbsp;&nbsp;";
-        }
-        echo "<span class='sc'>";
-        echo "<br /><br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/keytyp_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
-        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"&Uuml;bersicht Keytyp\" class=\"sc\">neuer Bericht &Uuml;bersicht Schl&uuml;sseltypen</a>\n";    
-        echo "</span>";
-    }        
-?>
-</body>
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 06/2013
+ * 
+ * Report Uebersicht Keytyp in Depots
+ */
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    session_start();
+    if (! isset($_SESSION["userid"]))
+    { 
+        include_once ($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/inc/func_lib.inc.php");	
+        login($_SERVER["PHP_SELF"]);
+        exit;
+    }
+    
+    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("kr",$_SESSION["recht"]) && !in_array("ke",$_SESSION["recht"])))
+    {
+        header("Location: start.php");
+        exit;
+    }    
+
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+    
+    // zulaessige Depots
+    $uid = $_SESSION["userid"];
+    $sql = "SELECT depot_ID FROM KeyDepot_userweb WHERE userid = '$uid'";
+    $res = $dbc -> queryObjectArray($sql);
+    foreach ($res as $row)
+        $adep[] = $row->depot_ID;
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
+   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
+	<title>Report &Uuml;bersicht Schl&uuml;sseltypen</title>
+</head>
+
+<body>
+
+<?php    
+    echo "&nbsp;";  
+    echo "<div class=\"float-br smaller\" valign='top'>";
+    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+    echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/key.png\" border=\"0\" alt=\"Keytyp &Uuml:bersicht\" title=\"Schl&uuml;sseltypen im Depot\"/></div>\n";
+
+    $ky    = $_POST["ky"];    // Parameter aus Form
+    $search = $_POST["search"];
+    if (!$search) $search =  $_GET["s"];
+
+    $zeil = $ky["z"];
+    if (!$zeil) $zeil = $_GET["z"];
+    if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
+    $start = $_GET["st"];   // Start bei DS $start+1
+    if (!$start) $start=0;
+    
+    if (!is_array($ky))
+    {
+        $ky["dep"] = $_GET["d"];
+        $ky["kt"] = $_GET["k"];
+        $ky["bind"]    = $_GET["b"];
+        $ky["sort1"]   = $_GET["s1"];
+        $ky["sort2"]   = $_GET["s2"];
+    }
+    $_GET["d"] = $ky["dep"];
+    $_GET["k"] = $ky["kt"];
+    $_GET["b"] = $ky["bind"];
+    $_GET["s1"]= $ky["sort1"];
+    $_GET["s2"]= $ky["sort2"];
+    $_GET["z"]  = $zeil;
+    
+    if ($search)
+    {    
+        echo "<span class='sc'>";
+        echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/keytyp_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
+        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"&Uuml;bersicht Keytyp\" class=\"sc\">neuer Bericht &Uuml;bersicht Schl&uuml;sseltypen</a>\n";    
+        echo "</span>";
+    }
+
+    echo "<div align='center'>\n";
+    echo "<p><b>Bericht &Uuml;bersicht Schl&uuml;sseltypen </b></p>\n";
+    echo "</div>\n";
+    
+
+    if (!$search)
+    {
+?>
+        <div align="center">
+        <p>Bitte Kriterien f&uuml;r die Suche w&auml;hlen</p>
+        <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_raum" target="_self">	
+        <table width="50%" border="0" cellspacing="3" cellpadding="3">
+            <tr>
+                <td>Depot</td>
+                <td><select name="ky[dep]" onchange="this.form.submit();">
+                    <?php
+                        if ($ky["dep"] == -1) $select = "selected='selected'"; else $select = "";
+                        echo "<option $select value=\"-1\"></option>\n";
+                        $strdep = "'". implode("','",$adep) ."'";
+                        $sql = "SELECT * FROM fhiiqm.KeyDepot WHERE depot_ID IN ($strdep)";
+                        if ($res = $dbc -> queryObjectArray($sql))
+                            foreach ($res as $row)
+                            {
+                               if ($row->depot_ID == $ky['dep']) $select = "selected='selected'"; else $select = "";
+    					       echo "<option $select value=\"$row->depot_ID\">$row->depot_ID: $row->depot_bez</option>\n";
+                            }
+                        $beg=0;
+                    ?>
+                </select>
+                </td>
+            </tr>
+            <tr>
+                <td>Schl&uuml;sseltyp</td>
+                <td><select name="ky[kt]">
+                    <?php
+                        if ($ky["kt"] == -1) $select = "selected='selected'"; else $select = "";
+                        echo "<option $select value=\"-1\"></option>\n";
+                        $strdep = "'". implode("','",$adep) ."'";
+                        $sql = "SELECT key_level,d.keytyp_ID,keytyp_bez,
+                                        SUM(CASE WHEN depot_action='get' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='out' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='lost' THEN IFNULL(depot_anz,0) ELSE 0 END) AS bestand
+                                        FROM fhiiqm.Keytyp_Depot d INNER JOIN Keytyp k ON d.keytyp_ID=k.keytyp_ID 
+                                        WHERE depot_ID = '" . $ky['dep'] . "'
+                                GROUP BY key_level,d.keytyp_ID,keytyp_bez";
+                        if ($res = $dbc -> queryObjectArray($sql))
+                            foreach ($res as $row)
+                            {
+                               if ($row->keytyp_ID == $ky['kt']) $select = "selected='selected'"; else $select = "";
+    					       echo "<option $select value=\"$row->keytyp_ID\">$row->key_level - $row->keytyp_ID [$row->keytyp_bez] ($row->bestand)</option>\n";
+                            }
+                        $beg=0;
+                    ?>
+                </select>
+            </tr>
+            <tr> 
+                  <td>Verkn&uuml;pfung</td>
+                  <td>UND&nbsp;&nbsp;&nbsp;
+                    <input type="radio" name="ky[bind]" value="AND" <?php if (isset($ky["bind"]) && $ky["bind"]=="AND") echo "checked='checked'"; else  echo "checked='checked'";?>>
+                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ODER&nbsp;&nbsp;&nbsp;
+                    <input type="radio" name="ky[bind]" value="OR" <?php if (isset($ky["bind"]) && $ky["bind"]=="OR") echo "checked='checked'"; ?>></td>
+            </tr>
+            <tr>
+                <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
+            <?php
+                $sort = array("-1"=>"","1"=>"Depot","2,3"=>"Schl&uuml;sseltyp");
+                for ($i=1; $i<3; $i++)
+                { 
+                  echo "$i.&nbsp;&nbsp;<select name='ky[sort$i]'>\n";
+                  foreach ($sort as $key=>$val)
+                  {
+                    $rsort = "sort" . $i;
+                    if ($ky[$rsort] == $val) $select = "selected='selected'"; else $select = "";
+                    echo "<option $select value='$key'>$val</option>\n";
+                  }
+                  echo "</select>&nbsp;&nbsp;&nbsp;&nbsp;\n";
+                } 
+                echo "</td></tr>\n";
+        
+                $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
+                echo "<tr><td>Zeilen/Seite?</td><td><select name='ky[z]'>\n";
+                if (!$ky['z']) $ky['z'] = 9999;
+                foreach ($azeil as $key=>$val)
+                {
+                    if ($key == $ky['z']) $select = "selected='selected'"; else $select = "";
+                    echo "<option $select value='$key'>$val</option>\n";
+                }
+                echo "</select></td></tr>\n";
+        
+            ?>
+            <tr> 
+                <td>&nbsp;</td>
+                <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
+            </tr> 
+        </table>
+        </div>
+        </form>
+<?php
+    }
+    else
+    {
+        echo "<div align='center'>\n";
+        $sql = "SELECT depot_ID,key_level,d.keytyp_ID,keytyp_bez,
+            		SUM(CASE WHEN depot_action='get' THEN IFNULL(depot_anz,0) ELSE 0 END) AS anzget,
+            		SUM(CASE WHEN depot_action='out' THEN IFNULL(depot_anz,0) ELSE 0 END) AS anzout,
+            		SUM(CASE WHEN depot_action='lost' THEN IFNULL(depot_anz,0) ELSE 0 END) AS anzlost,
+            		SUM(CASE WHEN depot_action='get' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='out' THEN IFNULL(depot_anz,0) ELSE 0 END) - SUM(CASE WHEN depot_action='lost' THEN IFNULL(depot_anz,0) ELSE 0 END) AS bestand
+            		FROM fhiiqm.Keytyp_Depot d INNER JOIN Keytyp k ON d.keytyp_ID=k.keytyp_ID 
+            		GROUP BY depot_ID,keytyp_ID";
+
+        $lim = " LIMIT $start,$zeil";
+        
+        if (!$ky["bind"]) $bind = " AND "; else $bind = $ky["bind"];
+        
+        if ($ky["dep"]> -1) $where = " depot_ID = '$ky[dep]' ";
+        if ($ky["kt"]> -1)
+            if ($where) $where .= "$bind keytyp_ID = '$ky[kt]' "; else $where = " keytyp_ID = '$ky[kt]' ";
+        if ($where) $where = " HAVING ($where)";
+        
+        if ($ky["sort1"]>0 || $ky["sort2"]>0)
+        {
+            if ($ky["sort1"]>0) $ord  = " ORDER BY " . $ky["sort1"];
+            if ($ky["sort2"]>0) $ord .= ",".$ky["sort2"];
+        }
+        
+        $sql .= $where;
+        $ianz = $dbc -> numrows($sql); 
+        $sql .= $ord . $lim;
+        $result = $dbc ->queryObjectArray($sql);
+        if ($dbc -> error)
+        {
+            echo "error SELECT: " . $dbc -> error . "<br /><br />";
+            echo "sql = $sql<br />\n";
+        }
+        if ($ky["dep"]> -1) $krit = " [Depot = <b>'" . $ky["dep"] ."'</b>]";
+        if ($ky["kt"] > -1)
+        { 
+            if ($krit) $bd = " ".$bind; else $bd = "";
+            $krit .= $bd." [Schl&uuml;sseltyp = <b>'".$ky["kt"]."'</b>]";
+        }
+        if ($krit )echo "Suchergebnis f&uuml;r $krit"; else echo "Suchergebnis\n";
+        printf ("<p>Anzahl Schl&uuml;sseltypen: %s</p>", $ianz);
+
+        if ($result)
+        {
+            include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+            
+    		$bg1 = "#F8F8F8";
+    		$bg2 = "#DEDFE1";
+    		$bg = "#FFFFFF";
+            echo "<table border='1' cellspacing='0' cellpadding='2'>\n";
+            // Listenkopf
+            echo "<tr bgcolor='#68ACBF'>";
+            if ($ky["dep"] == -1) echo "<td>Depot</td>";            
+            echo "<th>Schl&uuml;sseltyp</th><th>Schl&uuml;sseltyp-Bezeichnung</th><th>Zugang</th><th>Abgang</th><th>Verlust</th><th>Bestand</th>";
+            foreach ($result as $row)
+            {
+        		if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                echo "<tr bgcolor='" . $bg . "'>";
+                if ($ky["dep"] == -1) echo "<td>$row->depot_ID</td>";
+                echo "<td>$row->key_level - $row->keytyp_ID</td><td>$row->keytyp_bez</td>";
+                echo "<td class='right'>$row->anzget</td><td class='right'>$row->anzout</td><td class='right'>$row->anzlost</td><td class='right'>$row->bestand</td>"; 
+                echo "</tr>";
+            }
+            echo "</table>\n";
+            echo "<p></p><table width=40%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
+                <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
+            echo "</div>\n";
+        
+            echo "<br />&nbsp;&nbsp;&nbsp;";
+            if ($search != 2) // Aufruf aus fhiiqm
+            {    
+                // Parameter aus $_GET fuer weitere Seiten
+                $_GET["s"] = 1; // bewirkt weitere Suche
+                foreach ($_GET as $key=>$val)
+                {
+                    if ($key != "st") $liste .= "&" . $key ."=".$val;
+                }    
+                // Links auf andere Seiten generieren
+                liste_links($start,$zeil,$ianz,$liste);
+            }
+        }
+        else
+        {
+            echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
+            echo "</div>\n";
+            echo "<br />&nbsp;&nbsp;&nbsp;";
+        }
+        echo "<span class='sc'>";
+        echo "<br /><br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/keytyp_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
+        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"&Uuml;bersicht Keytyp\" class=\"sc\">neuer Bericht &Uuml;bersicht Schl&uuml;sseltypen</a>\n";    
+        echo "</span>";
+    }        
+?>
+</body>
 </html>
\ No newline at end of file
--- a/fhiiqm/report/keytyp_dep_history_report.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/report/keytyp_dep_history_report.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,278 +1,278 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 07/2013
- * 
- * Report Historie Keytyp in Depots
- */
-
-    error_reporting(E_ALL ^ E_NOTICE);
-    
-    session_start();
-    if (! isset($_SESSION["userid"]))
-    { 
-        include_once ($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/inc/func_lib.inc.php");	
-        login($_SERVER["PHP_SELF"]);
-        exit;
-    }
-    
-    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("kr",$_SESSION["recht"]) && !in_array("ke",$_SESSION["recht"])))
-    {
-        header("Location: start.php");
-        exit;
-    }    
-
-	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
-	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
-    
-    // zulaessige Depots
-    $uid = $_SESSION["userid"];
-    $sql = "SELECT depot_ID FROM KeyDepot_userweb WHERE userid = '$uid'";
-    $res = $dbc -> queryObjectArray($sql);
-    foreach ($res as $row)
-        $adep[] = $row->depot_ID;
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
-   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
-	<title>Report Historie Schl&uuml;sseltypen</title>
-</head>
-
-<body>
-
-<?php    
-    echo "&nbsp;";  
-    echo "<div class=\"float-br smaller\" valign='top'>";
-    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
-    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
-    echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/key.png\" border=\"0\" alt=\"Keytyp &Uuml:bersicht\" title=\"Schl&uuml;sseltypen im Depot\"/></div>\n";
-
-    $ky    = $_POST["ky"];    // Parameter aus Form
-    $search = $_POST["search"];
-    if (!$search) $search =  $_GET["s"];
-
-    $zeil = $ky["z"];
-    if (!$zeil) $zeil = $_GET["z"];
-    if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
-    $start = $_GET["st"];   // Start bei DS $start+1
-    if (!$start) $start=0;
-    
-    if (!is_array($ky))
-    {
-        $ky["dep"] = $_GET["d"];
-        $ky["kt"] = $_GET["k"];
-        $ky["bind"]    = $_GET["b"];
-        $ky["sort1"]   = $_GET["s1"];
-        $ky["sort2"]   = $_GET["s2"];
-    }
-    $_GET["d"] = $ky["dep"];
-    $_GET["k"] = $ky["kt"];
-    $_GET["b"] = $ky["bind"];
-    $_GET["s1"]= $ky["sort1"];
-    $_GET["s2"]= $ky["sort2"];
-    $_GET["z"]  = $zeil;
-    
-    if ($search)
-    {    
-        echo "<span class='sc'>";
-        echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/keytyp_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
-        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Historie Keytyp\" class=\"sc\">neuer Bericht Historie Schl&uuml;sseltypen</a>\n";    
-        echo "</span>";
-    }
-
-    echo "<div align='center'>\n";
-    echo "<p><b>Bericht Historie Schl&uuml;sseltypen </b></p>\n";
-    echo "</div>\n";
-    
-
-    if (!$search)
-    {
-?>
-        <div align="center">
-        <p>Bitte Kriterien f&uuml;r die Suche w&auml;hlen</p>
-        <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_raum" target="_self">	
-        <table width="50%" border="0" cellspacing="3" cellpadding="3">
-            <tr>
-                <td>Depot</td>
-                <td><select name="ky[dep]">
-                    <?php
-                        if ($ky["dep"] == -1) $select = "selected='selected'"; else $select = "";
-                        echo "<option $select value=\"-1\"></option>\n";
-                        $strdep = "'". implode("','",$adep) ."'";
-                        $sql = "SELECT * FROM fhiiqm.KeyDepot WHERE depot_ID IN ($strdep)";
-                        if ($res = $dbc -> queryObjectArray($sql))
-                            foreach ($res as $row)
-                            {
-                               if ($row->depot_ID == $ky['dep']) $select = "selected='selected'"; else $select = "";
-    					       echo "<option $select value=\"$row->depot_ID\">$row->depot_ID: $row->depot_bez</option>\n";
-                            }
-                        $beg=0;
-                    ?>
-                </select>
-                </td>
-            </tr>
-            <tr>
-                <td>Schl&uuml;sseltyp</td>
-                <td><select name="ky[kt]">
-                    <?php
-                        if ($ky["kt"] == -1) $select = "selected='selected'"; else $select = "";
-                        echo "<option $select value=\"-1\"></option>\n";
-                        $sql = "SELECT key_level,keytyp_ID,keytyp_bez
-                                        FROM Keytyp 
-                                        ORDER BY key_level";
-                        if ($res = $dbc -> queryObjectArray($sql))
-                            foreach ($res as $row)
-                            {
-                               if ($row->keytyp_ID == $ky['kt']) $select = "selected='selected'"; else $select = "";
-    					       echo "<option $select value=\"$row->keytyp_ID\">$row->key_level - $row->keytyp_ID [$row->keytyp_bez]</option>\n";
-                            }
-                        $beg=0;
-                    ?>
-                </select>
-            </tr>
-            <tr> 
-                  <td>Verkn&uuml;pfung</td>
-                  <td>UND&nbsp;&nbsp;&nbsp;
-                    <input type="radio" name="ky[bind]" value="AND" <?php if (isset($ky["bind"]) && $ky["bind"]=="AND") echo "checked='checked'"; else  echo "checked='checked'";?>>
-                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ODER&nbsp;&nbsp;&nbsp;
-                    <input type="radio" name="ky[bind]" value="OR" <?php if (isset($ky["bind"]) && $ky["bind"]=="OR") echo "checked='checked'"; ?>></td>
-            </tr>
-            <tr>
-                <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
-            <?php
-                $sort = array("-1"=>"","4"=>"Depot","1,2"=>"Schl&uuml;sseltyp", "5"=>"Datum");
-                for ($i=1; $i<4; $i++)
-                { 
-                  echo "$i.&nbsp;&nbsp;<select name='ky[sort$i]'>\n";
-                  foreach ($sort as $key=>$val)
-                  {
-                    $rsort = "sort" . $i;
-                    if ($ky[$rsort] == $val) $select = "selected='selected'"; else $select = "";
-                    echo "<option $select value='$key'>$val</option>\n";
-                  }
-                  echo "</select>&nbsp;&nbsp;&nbsp;&nbsp;\n";
-                } 
-                echo "</td></tr>\n";
-        
-                $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
-                echo "<tr><td>Zeilen/Seite?</td><td><select name='ky[z]'>\n";
-                if (!$ky['z']) $ky['z'] = 9999;
-                foreach ($azeil as $key=>$val)
-                {
-                    if ($key == $ky['z']) $select = "selected='selected'"; else $select = "";
-                    echo "<option $select value='$key'>$val</option>\n";
-                }
-                echo "</select></td></tr>\n";
-        
-            ?>
-            <tr> 
-                <td>&nbsp;</td>
-                <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
-            </tr> 
-        </table>
-        </div>
-        </form>
-<?php
-    }
-    else
-    {
-
-        echo "<div align='center'>\n";
-        $sql = "SELECT key_level, d.keytyp_ID,keytyp_bez,depot_ID,depot_date,depot_action,depot_anz,depot_bem 
-                FROM fhiiqm.Keytyp_Depot d INNER JOIN Keytyp k ON d.keytyp_ID=k.keytyp_ID";
-
-        $lim = " LIMIT $start,$zeil";
-        
-        if (!$ky["bind"]) $bind = " AND "; else $bind = $ky["bind"];
-        
-        if ($ky["dep"]> -1) $where = " depot_ID = '$ky[dep]' ";
-        if ($ky["kt"]> -1)
-            if ($where) $where .= "$bind d.keytyp_ID = '$ky[kt]' "; else $where = " d.keytyp_ID = '$ky[kt]' ";
-        if ($where) $where = " WHERE ($where)";
-        
-        if ($ky["sort1"]>0 || $ky["sort2"]>0)
-        {
-            if ($ky["sort1"]>0) $ord  = " ORDER BY " . $ky["sort1"];
-            if ($ky["sort2"]>0) $ord .= ",".$ky["sort2"];
-        }
-        
-        $sql .= $where;
-        $ianz = $dbc -> numrows($sql); 
-        $sql .= $ord . $lim;
-        $result = $dbc ->queryObjectArray($sql);
-        if ($dbc -> error)
-        {
-            echo "error SELECT: " . $dbc -> error . "<br /><br />";
-            echo "sql = $sql<br />\n";
-        }
-        if ($ky["dep"]> -1) $krit = " [Depot = <b>'" . $ky["dep"] ."'</b>]";
-        if ($ky["kt"] > -1)
-        { 
-            if ($krit) $bd = " ".$bind; else $bd = "";
-            $krit .= $bd." [Schl&uuml;sseltyp = <b>'".$ky["kt"]."'</b>]";
-        }
-        if ($krit )echo "Suchergebnis f&uuml;r $krit"; else echo "Suchergebnis\n";
-        printf ("<p>Anzahl Transaktionen: %s</p>", $ianz);
-
-        if ($result)
-        {
-            include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
-            $aaction = array("get" => "erhalten", "out" => "ausgegeben", "lost" => "verloren");
-            
-    		$bg1 = "#F8F8F8";
-    		$bg2 = "#DEDFE1";
-    		$bg = "#FFFFFF";
-            echo "<table border='1' cellspacing='0' cellpadding='2'>\n";
-            // Listenkopf
-            echo "<tr bgcolor='#68ACBF'>";
-            echo "<th>Schl&uuml;sseltyp</th><th>Schl&uuml;sseltyp-Bezeichnung</th>";
-            if ($ky["dep"] == -1) echo "<th>Depot</th>";
-            echo "<th>Datum</th><th>Aktion</th><th>Anzahl</th><th>Bemerkung</th>";
-            foreach ($result as $row)
-            {
-        		if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-                echo "<tr bgcolor='" . $bg . "'>";
-                echo "<td>$row->key_level - $row->keytyp_ID</td><td>$row->keytyp_bez</td>";
-                if ($ky["dep"] == -1) echo "<td>$row->depot_ID</td>";
-                $ddate = new DateTime($row->depot_date);
-                echo "<td>".$ddate->format("d.m.Y")."</td><td>".$aaction["$row->depot_action"]."</td><td class='right'>$row->depot_anz</td><td>$row->depot_bem</td>"; 
-                echo "</tr>";
-            }
-            echo "</table>\n";
-            echo "<p></p><table width=40%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
-                <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
-            echo "</div>\n";
-        
-            echo "<br />&nbsp;&nbsp;&nbsp;";
-            if ($search != 2) // Aufruf aus fhiiqm
-            {    
-                // Parameter aus $_GET fuer weitere Seiten
-                $_GET["s"] = 1; // bewirkt weitere Suche
-                foreach ($_GET as $key=>$val)
-                {
-                    if ($key != "st") $liste .= "&" . $key ."=".$val;
-                }    
-                // Links auf andere Seiten generieren
-                liste_links($start,$zeil,$ianz,$liste);
-            }
-        }
-        else
-        {
-            echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
-            echo "</div>\n";
-            echo "<br />&nbsp;&nbsp;&nbsp;";
-        }
-        echo "<span class='sc'>";
-        echo "<br /><br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/keytyp_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
-        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Historie Keytyp\" class=\"sc\">neuer Bericht Historie Schl&uuml;sseltypen</a>\n";    
-        echo "</span>";
-    }        
-?>
-</body>
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 07/2013
+ * 
+ * Report Historie Keytyp in Depots
+ */
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    session_start();
+    if (! isset($_SESSION["userid"]))
+    { 
+        include_once ($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/inc/func_lib.inc.php");	
+        login($_SERVER["PHP_SELF"]);
+        exit;
+    }
+    
+    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("kr",$_SESSION["recht"]) && !in_array("ke",$_SESSION["recht"])))
+    {
+        header("Location: start.php");
+        exit;
+    }    
+
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+    
+    // zulaessige Depots
+    $uid = $_SESSION["userid"];
+    $sql = "SELECT depot_ID FROM KeyDepot_userweb WHERE userid = '$uid'";
+    $res = $dbc -> queryObjectArray($sql);
+    foreach ($res as $row)
+        $adep[] = $row->depot_ID;
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
+   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
+	<title>Report Historie Schl&uuml;sseltypen</title>
+</head>
+
+<body>
+
+<?php    
+    echo "&nbsp;";  
+    echo "<div class=\"float-br smaller\" valign='top'>";
+    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+    echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/key.png\" border=\"0\" alt=\"Keytyp &Uuml:bersicht\" title=\"Schl&uuml;sseltypen im Depot\"/></div>\n";
+
+    $ky    = $_POST["ky"];    // Parameter aus Form
+    $search = $_POST["search"];
+    if (!$search) $search =  $_GET["s"];
+
+    $zeil = $ky["z"];
+    if (!$zeil) $zeil = $_GET["z"];
+    if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
+    $start = $_GET["st"];   // Start bei DS $start+1
+    if (!$start) $start=0;
+    
+    if (!is_array($ky))
+    {
+        $ky["dep"] = $_GET["d"];
+        $ky["kt"] = $_GET["k"];
+        $ky["bind"]    = $_GET["b"];
+        $ky["sort1"]   = $_GET["s1"];
+        $ky["sort2"]   = $_GET["s2"];
+    }
+    $_GET["d"] = $ky["dep"];
+    $_GET["k"] = $ky["kt"];
+    $_GET["b"] = $ky["bind"];
+    $_GET["s1"]= $ky["sort1"];
+    $_GET["s2"]= $ky["sort2"];
+    $_GET["z"]  = $zeil;
+    
+    if ($search)
+    {    
+        echo "<span class='sc'>";
+        echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/keytyp_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
+        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Historie Keytyp\" class=\"sc\">neuer Bericht Historie Schl&uuml;sseltypen</a>\n";    
+        echo "</span>";
+    }
+
+    echo "<div align='center'>\n";
+    echo "<p><b>Bericht Historie Schl&uuml;sseltypen </b></p>\n";
+    echo "</div>\n";
+    
+
+    if (!$search)
+    {
+?>
+        <div align="center">
+        <p>Bitte Kriterien f&uuml;r die Suche w&auml;hlen</p>
+        <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_raum" target="_self">	
+        <table width="50%" border="0" cellspacing="3" cellpadding="3">
+            <tr>
+                <td>Depot</td>
+                <td><select name="ky[dep]">
+                    <?php
+                        if ($ky["dep"] == -1) $select = "selected='selected'"; else $select = "";
+                        echo "<option $select value=\"-1\"></option>\n";
+                        $strdep = "'". implode("','",$adep) ."'";
+                        $sql = "SELECT * FROM fhiiqm.KeyDepot WHERE depot_ID IN ($strdep)";
+                        if ($res = $dbc -> queryObjectArray($sql))
+                            foreach ($res as $row)
+                            {
+                               if ($row->depot_ID == $ky['dep']) $select = "selected='selected'"; else $select = "";
+    					       echo "<option $select value=\"$row->depot_ID\">$row->depot_ID: $row->depot_bez</option>\n";
+                            }
+                        $beg=0;
+                    ?>
+                </select>
+                </td>
+            </tr>
+            <tr>
+                <td>Schl&uuml;sseltyp</td>
+                <td><select name="ky[kt]">
+                    <?php
+                        if ($ky["kt"] == -1) $select = "selected='selected'"; else $select = "";
+                        echo "<option $select value=\"-1\"></option>\n";
+                        $sql = "SELECT key_level,keytyp_ID,keytyp_bez
+                                        FROM Keytyp 
+                                        ORDER BY key_level";
+                        if ($res = $dbc -> queryObjectArray($sql))
+                            foreach ($res as $row)
+                            {
+                               if ($row->keytyp_ID == $ky['kt']) $select = "selected='selected'"; else $select = "";
+    					       echo "<option $select value=\"$row->keytyp_ID\">$row->key_level - $row->keytyp_ID [$row->keytyp_bez]</option>\n";
+                            }
+                        $beg=0;
+                    ?>
+                </select>
+            </tr>
+            <tr> 
+                  <td>Verkn&uuml;pfung</td>
+                  <td>UND&nbsp;&nbsp;&nbsp;
+                    <input type="radio" name="ky[bind]" value="AND" <?php if (isset($ky["bind"]) && $ky["bind"]=="AND") echo "checked='checked'"; else  echo "checked='checked'";?>>
+                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ODER&nbsp;&nbsp;&nbsp;
+                    <input type="radio" name="ky[bind]" value="OR" <?php if (isset($ky["bind"]) && $ky["bind"]=="OR") echo "checked='checked'"; ?>></td>
+            </tr>
+            <tr>
+                <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
+            <?php
+                $sort = array("-1"=>"","4"=>"Depot","1,2"=>"Schl&uuml;sseltyp", "5"=>"Datum");
+                for ($i=1; $i<4; $i++)
+                { 
+                  echo "$i.&nbsp;&nbsp;<select name='ky[sort$i]'>\n";
+                  foreach ($sort as $key=>$val)
+                  {
+                    $rsort = "sort" . $i;
+                    if ($ky[$rsort] == $val) $select = "selected='selected'"; else $select = "";
+                    echo "<option $select value='$key'>$val</option>\n";
+                  }
+                  echo "</select>&nbsp;&nbsp;&nbsp;&nbsp;\n";
+                } 
+                echo "</td></tr>\n";
+        
+                $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
+                echo "<tr><td>Zeilen/Seite?</td><td><select name='ky[z]'>\n";
+                if (!$ky['z']) $ky['z'] = 9999;
+                foreach ($azeil as $key=>$val)
+                {
+                    if ($key == $ky['z']) $select = "selected='selected'"; else $select = "";
+                    echo "<option $select value='$key'>$val</option>\n";
+                }
+                echo "</select></td></tr>\n";
+        
+            ?>
+            <tr> 
+                <td>&nbsp;</td>
+                <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
+            </tr> 
+        </table>
+        </div>
+        </form>
+<?php
+    }
+    else
+    {
+
+        echo "<div align='center'>\n";
+        $sql = "SELECT key_level, d.keytyp_ID,keytyp_bez,depot_ID,depot_date,depot_action,depot_anz,depot_bem 
+                FROM fhiiqm.Keytyp_Depot d INNER JOIN Keytyp k ON d.keytyp_ID=k.keytyp_ID";
+
+        $lim = " LIMIT $start,$zeil";
+        
+        if (!$ky["bind"]) $bind = " AND "; else $bind = $ky["bind"];
+        
+        if ($ky["dep"]> -1) $where = " depot_ID = '$ky[dep]' ";
+        if ($ky["kt"]> -1)
+            if ($where) $where .= "$bind d.keytyp_ID = '$ky[kt]' "; else $where = " d.keytyp_ID = '$ky[kt]' ";
+        if ($where) $where = " WHERE ($where)";
+        
+        if ($ky["sort1"]>0 || $ky["sort2"]>0)
+        {
+            if ($ky["sort1"]>0) $ord  = " ORDER BY " . $ky["sort1"];
+            if ($ky["sort2"]>0) $ord .= ",".$ky["sort2"];
+        }
+        
+        $sql .= $where;
+        $ianz = $dbc -> numrows($sql); 
+        $sql .= $ord . $lim;
+        $result = $dbc ->queryObjectArray($sql);
+        if ($dbc -> error)
+        {
+            echo "error SELECT: " . $dbc -> error . "<br /><br />";
+            echo "sql = $sql<br />\n";
+        }
+        if ($ky["dep"]> -1) $krit = " [Depot = <b>'" . $ky["dep"] ."'</b>]";
+        if ($ky["kt"] > -1)
+        { 
+            if ($krit) $bd = " ".$bind; else $bd = "";
+            $krit .= $bd." [Schl&uuml;sseltyp = <b>'".$ky["kt"]."'</b>]";
+        }
+        if ($krit )echo "Suchergebnis f&uuml;r $krit"; else echo "Suchergebnis\n";
+        printf ("<p>Anzahl Transaktionen: %s</p>", $ianz);
+
+        if ($result)
+        {
+            include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+            $aaction = array("get" => "erhalten", "out" => "ausgegeben", "lost" => "verloren");
+            
+    		$bg1 = "#F8F8F8";
+    		$bg2 = "#DEDFE1";
+    		$bg = "#FFFFFF";
+            echo "<table border='1' cellspacing='0' cellpadding='2'>\n";
+            // Listenkopf
+            echo "<tr bgcolor='#68ACBF'>";
+            echo "<th>Schl&uuml;sseltyp</th><th>Schl&uuml;sseltyp-Bezeichnung</th>";
+            if ($ky["dep"] == -1) echo "<th>Depot</th>";
+            echo "<th>Datum</th><th>Aktion</th><th>Anzahl</th><th>Bemerkung</th>";
+            foreach ($result as $row)
+            {
+        		if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                echo "<tr bgcolor='" . $bg . "'>";
+                echo "<td>$row->key_level - $row->keytyp_ID</td><td>$row->keytyp_bez</td>";
+                if ($ky["dep"] == -1) echo "<td>$row->depot_ID</td>";
+                $ddate = new DateTime($row->depot_date);
+                echo "<td>".$ddate->format("d.m.Y")."</td><td>".$aaction["$row->depot_action"]."</td><td class='right'>$row->depot_anz</td><td>$row->depot_bem</td>"; 
+                echo "</tr>";
+            }
+            echo "</table>\n";
+            echo "<p></p><table width=40%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
+                <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
+            echo "</div>\n";
+        
+            echo "<br />&nbsp;&nbsp;&nbsp;";
+            if ($search != 2) // Aufruf aus fhiiqm
+            {    
+                // Parameter aus $_GET fuer weitere Seiten
+                $_GET["s"] = 1; // bewirkt weitere Suche
+                foreach ($_GET as $key=>$val)
+                {
+                    if ($key != "st") $liste .= "&" . $key ."=".$val;
+                }    
+                // Links auf andere Seiten generieren
+                liste_links($start,$zeil,$ianz,$liste);
+            }
+        }
+        else
+        {
+            echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
+            echo "</div>\n";
+            echo "<br />&nbsp;&nbsp;&nbsp;";
+        }
+        echo "<span class='sc'>";
+        echo "<br /><br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/keytyp_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
+        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Historie Keytyp\" class=\"sc\">neuer Bericht Historie Schl&uuml;sseltypen</a>\n";    
+        echo "</span>";
+    }        
+?>
+</body>
 </html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/report/laser_report.php	Fri Dec 20 15:19:32 2013 +0100
@@ -0,0 +1,229 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 10/2013
+ * 
+ * Report Laser
+ * 
+ */
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    if (!isset($_GET['s']) || $_GET['s'] != 2 )
+    {
+        session_start();
+        if (! isset($_SESSION["userid"]))
+        { 
+            include_once ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");	
+            login($_SERVER["PHP_SELF"]);
+            exit;
+        }
+        
+        if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("lr",$_SESSION["recht"]) && !in_array("le",$_SESSION["recht"])))
+        {
+            header("Location: start.php");
+            exit;
+        }
+    }    
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
+   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
+	<title>Report Laser</title>
+</head>
+
+<body>
+
+<?php    
+    echo "&nbsp;";  
+    if (!isset($_GET['s']) || $_GET['s'] != 2 )
+    {
+        echo "<div class=\"float-br smaller\" valign='top'>";
+        echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+        echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+    }
+    echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/laser.png\" border=\"0\" alt=\"Laser\" title=\"Laser\"/></div>\n";
+    
+    $las    = $_POST["las"];    // Parameter aus Form
+    $search = $_POST["search"];
+    if (!$search) $search =  $_GET["s"];
+
+    $zeil = $las["z"];
+    if (!$zeil) $zeil = $_GET["z"];
+    if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
+    $start = $_GET["st"];   // Start bei DS $start+1
+    if (!$start) $start=0;
+
+    if (!is_array($las))
+    {
+        $las["geb"]     = $_GET["g"];
+        $las["rnum"]    = $_GET["r"];
+        $las["abt"]     = $_GET["a"];
+        $las["kl"]      = $_GET["k"];
+        $las["bind"]    = $_GET["b"];
+        $las["sort1"]   = $_GET["s1"];
+        $las["sort2"]   = $_GET["s2"];
+    }
+    $_GET["z"] = $zeil;
+    $_GET["g"] = $las["geb"];
+    $_GET["r"] = $las["rnum"];
+    $_GET["a"] = $las["abt"];
+    $_GET["k"] = $las["kl"];
+    $_GET["b"] = $las["bind"];
+    $_GET["s1"] = $las["sort1"];
+    $_GET["s2"] = $las["sort2"];
+//    print_r($las); echo "<br /><br />";
+    if ($search && $_GET['s'] != 2)
+    {    
+        echo "<span class='sc'>";
+        echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/laser_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
+        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Laser\" class=\"sc\">neuer Bericht Laser</a>\n";    
+        echo "</span>";
+    }
+    echo "<div align='center'>\n";
+    echo "<p><b>Bericht Laser</b></p>\n";
+    echo "</div>\n";
+    
+    if (!$search)
+    {
+        include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/form/laser_search_form.inc.php");
+    }
+    else
+    {
+        echo "<div align='center'>\n";
+
+    	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+        include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+    
+    	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+        $sql = "SELECT las_bez,las_art_bez,las_klasse_ID,abt_name,geb_ID,l.raum_ID,raum_nr,CONCAT(nachname,', ',IFNULL(vorname,'')) AS vma
+                FROM Laser l
+                LEFT OUTER JOIN Laser_Art la ON l.las_art_ID=la.las_art_ID
+                LEFT OUTER JOIN Mitarbeiter m ON l.persknr=m.persknr
+                LEFT OUTER JOIN Abteilung a ON m.abt_tel=a.abt_ID
+                LEFT OUTER JOIN Raum r ON l.raum_ID=r.raum_ID";
+        $lim = " LIMIT $start,$zeil";
+        
+        if (!$las["bind"]) $bind = " AND "; else $bind = $las["bind"];
+        
+        if ($las["geb"]> -1) 
+        {
+            $where = " geb_ID = '$las[geb]' ";
+            $krit = " [Geb&auml;ude = '" . $las["geb"] ."']";
+        }
+        if ($las["rnum"]) 
+        {
+            if ($where) $where .= "$bind raum_ID = '$las[rnum]' "; else $where = " raum_ID = '$las[rnum]'' ";
+            if ($krit) $bd = " ".$bind; else $bd = "";            
+            $rnr = $dbc -> querySingleItem("SELECT raum_nr FROM Raum WHERE raum_ID = ". $las["rnum"]);    
+            $krit .= $bd. " [Raum-Nr. = '$rnr']";
+        }
+        if ($las["abt"]> -1)
+        {
+            if ($where) $where .= "$bind abt_name = '$las[abt]' "; else $where = " abt_name = '$las[abt]' ";
+            if ($krit) $bd = " ".$bind; else $bd = "";
+            $krit .= $bd . " [Abteilung = '" . $las["abt"] ."']";            
+        } 
+        if ($las["kl"]> -1)
+        {
+            if ($where) $where .= "$bind las_klasse_ID = '$las[kl]' "; else $where = " las_klasse_ID = '$las[kl]' ";
+            if ($krit) $bd = " ".$bind; else $bd = "";
+            $krit .= $bd . " [Laserklasse = '" . $las["kl"] ."']";            
+        } 
+        if ($where) $where = " WHERE $where";
+        
+        if ($las["sort1"]>0 || $las["sort2"]>0)
+        {
+            if ($las["sort1"]>0) $ord  = " ORDER BY ".$las["sort1"];
+            if ($las["sort2"]>0) $ord .= ",".$las["sort2"];
+        }
+        $sql .= $where;
+        if ($ord) $ord .= ",1"; else $ord = " ORDER BY 1 ";
+        $sqlg = $sql. $ord . $lim;
+//        echo "sql = $sqlg<br />\n";
+        $result = $dbc ->queryObjectArray($sqlg);
+
+        if ($krit )echo "Ergebnis der Suche nach $krit";
+
+        if ($result)
+        {
+    		$bg1 = "#F8F8F8";
+    		$bg2 = "#DEDFE1";
+    		$bg = "#FFFFFF";
+
+            $ianz = $dbc -> numrows($sql);
+
+            //$ianz = $dbc -> numrows($sql); //liefert nur $zeil!
+            printf ("<p>Anzahl gefundener Datensätze: %s</p>", $ianz);
+            
+            echo "<table width='99%' border='1' cellspacing='0' cellpadding='2'>\n";
+            $cols=7;
+            // Listenkopf
+            echo "<tr bgcolor='#68ACBF'>";
+            echo "<th>Laserbezeichnung</th>";    
+            echo "<th>Art</th>";    
+            if ($las["kl"] == -1 || $las["bind"] == 'OR') echo "<th>Klasse</th>";    
+            echo "<th>Standort</th>";    
+            if ($las["abt"] == -1 || $las["bind"] == 'OR') echo "<th>Abt.</th>";    
+            echo "<th>Verantwortlicher</th>";
+            echo "</tr>";
+
+            foreach ($result as $row)
+            {
+    			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                echo "<tr bgcolor='" . $bg . "'>";
+                echo "<td>$row->las_bez</td>"; 
+                echo "<td>$row->las_art_bez</td>"; 
+                if ($las["kl"] == -1 || $las["bind"] == 'OR') echo "<td class='center'>$row->las_klasse_ID</td>"; 
+                if ($row->raum_nr) echo "<td>$row->geb_ID, $row->raum_nr</td>"; else echo "<td>&nbsp;</td>";
+                if ($las["abt"] == -1 || $las["bind"] == 'OR') echo "<td>$row->abt_name</td>"; 
+                echo "<td>$row->vma</td></td>"; 
+            }
+            echo "</table>\n";
+
+
+            echo "<p></p><table width=80%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
+                <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
+            echo "</div>\n";
+            
+            echo "<br />&nbsp;&nbsp;&nbsp;";
+            if ($search != 2) // Aufruf aus fhiiqm
+            {    
+                // Parameter aus $_GET fuer weitere Seiten
+                $_GET["s"] = 1; // bewirkt weitere Suche
+                foreach ($_GET as $key=>$val)
+                {
+                    if ($key != "st") $liste .= "&" . $key ."=".$val;
+                }    
+                // Links auf andere Seiten generieren
+                liste_links($start,$zeil,$ianz,$liste);
+            }
+        }
+        else
+        {
+            echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
+            echo "</div>\n";
+            echo "<br />&nbsp;&nbsp;&nbsp;";
+        }
+        if ($search != 2)
+        {    
+            echo "<span class='sc'>";
+            echo "<br /><br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/laser_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
+            echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"RAG GMV\" class=\"sc\">neuer Bericht Laser</a>\n";    
+            echo "</span>";
+        }
+        else
+            echo "<a href='javascript:history.back();' onMouseOver=\"{window.status='Zur&uuml;ck'; return true;}\">&laquo; Zur&uuml;ck</a>";
+    }
+    
+?>
+
+</body>
+</html>
\ No newline at end of file
--- a/fhiiqm/report/proz_short_report.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/report/proz_short_report.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,339 +1,438 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 03/2013
- * 
- * Report Projekt fuer Website Haustechnik
- */
-
-    error_reporting(E_ALL ^ E_NOTICE);
-    
-    if (!isset($_GET['s']) || $_GET['s'] != 2 )
-    {
-        session_start();
-        if (! isset($_SESSION["userid"]))
-        { 
-            include_once ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");	
-            login($_SERVER["PHP_SELF"]);
-            exit;
-        }
-        
-        if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("pzr",$_SESSION["recht"]) && !in_array("pze",$_SESSION["recht"])))
-        {
-            header("Location: start.php");
-            exit;
-        }
-    }    
-	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
-	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
-   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
-	<title>Report Projekte, &Uuml;bersicht</title>
-</head>
-
-<body>
-
-<?php    
-    echo "&nbsp;";  
-    if (!isset($_GET['s']) || $_GET['s'] != 2 )
-    {
-        echo "<div class=\"float-br smaller\" valign='top'>";
-        echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
-        echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
-    }
-    echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/sheduled_task.png\" border=\"0\" alt=\"Projekt\" title=\"Projekt\"/></div>\n";
-    
-    $pz    = $_POST["pz"];    // Parameter aus Form
-    $search = $_POST["search"];
-    if (!$search) $search =  $_GET["s"];
-
-    $zeil = $pz["z"];
-    if (!$zeil) $zeil = $_GET["z"];
-    if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
-    $start = $_GET["st"];   // Start bei DS $start+1
-    if (!$start) $start=0;
-    $psep = $_GET["sp"];  // 1 Projekt je Druckseite
-    if (!$psep) $psep = $pz["sep"];
-    $pid = $_GET['i'];
-
-    if (!is_array($pz))
-    {
-        $pz["stat"] = $_GET["su"];
-//        $pz["va"] = $_GET["v"];
-        $pz["pgid"] = $_GET["p"];
-        $pz["bind"] = $_GET["b"];
-        if (!$pz["bind"]) $pz["bind"] = 'AND';
-        $pz["sort1"] = $_GET["s1"];
-        $pz["sort2"] = $_GET["s2"];
-        $pz["sep"]     = $_GET["sp"];   
-    }
-        $_GET["su"] = $pz["stat"];
-//        $_GET["v"] = $pz["va"];
-        $_GET["p"] = $pz["pgid"];
-        $_GET["b"] = $pz["bind"];
-        $_GET["sp"] = $pz["sep"];
-        $_GET["s1"] = $pz["sort1"];
-        $_GET["s2"] = $pz["sort2"];
-        $_GET["z"] = $zeil;
-        $_GET['i'] = $pid;
-
-    if ($search && $_GET['s'] != 2)
-    {    
-        echo "<span class='sc'>";
-        echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/pz_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
-        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"RAG GMV\" class=\"sc\">neuer Bericht Projekte</a>\n";    
-        echo "</span>";
-    }
-    echo "<div align='center'>\n";
-    echo "<p><b>Bericht Projekte - &Uuml;bersicht</b></p>\n";
-    echo "</div>\n";
-    
-    if (!$search)
-    {
-    ?>
-        <div align="center">
-        <p>Bitte Kriterien f&uuml;r die Suche w&auml;hlen</p>
-        <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_proj" target="_self">	
-        <table width="50%" border="0" cellspacing="3" cellpadding="3">
-            <tr>
-                <td>Status</td>
-                <td>
-                    <select name="pz[stat]" size="1">
-                    <?php 
-                        if ($pz["stat"] == -1) $select = " selected = 'selected'"; else $select = "";
-                        echo "<option $select value=\"-1\"></option>\n";
-                        $sql = "SELECT proz_stat_ID, proz_stat_bez FROM Proz_Status ORDER BY 1";
-                        if ($result = $dbc->queryObjectArray($sql))
-                        {
-                            foreach ($result as $row)
-                            {
-                                $select = ($row->proz_stat_ID == $pz['stat'])? " selected = 'selected'" : "";
-        					   echo "<option$select value=\"$row->proz_stat_ID\">$row->proz_stat_bez</option>\n";
-                            }
-                        }
-                    ?>
-                    </select>
-                </td>
-            </tr>
-<!--            <tr><td>Verantwortlicher</td><td><input type="text" name="pz[va]" value="<?php echo $pz['va']; ?>" /></td></tr> -->
-            <tr>
-                <td>Produktgruppe</td>
-                <td>
-                    <select name="pz[pgid]" size="1">
-            <?php
-                // Recht Produktgruppe beruecksichtigen
-                if (is_array($_SESSION["prodg"]))
-                {
-                        foreach ($_SESSION["prodg"] as $val)
-                            $listg .= ",'" .$val . "'";
-                        $listg = substr($listg,1);
-                        echo "prodg = $listg<br />";
-                        $sql = "SELECT prod_group_ID, prod_group_name FROM fhiiqm.Produkt_Gruppe WHERE prod_group_ID IN('$listg')";                
-                }
-                else
-                    $sql = "SELECT prod_group_ID, prod_group_name FROM fhiiqm.Produkt_Gruppe";  
-                if ($pz['pgid'] == -1) $select = " selected "; else $select = "";
-                echo "<option $select value=\"-1\"></option>\n";
-                if ($result = $dbc->queryObjectArray($sql))
-                {
-                    foreach ($result as $row)
-                    {
-                        if (strlen($row->prod_group_name) > 70) 
-                            $prod=str_replace(" ","&nbsp;",htmlentities(substr($row->prod_group_name,0,70))) ."..."; 
-                        else 
-                            $prod=str_replace(" ","&nbsp;",htmlentities($row->prod_group_name));
-                        if ($row->prod_group_ID == $pz['pgid'])
-    					   echo "<option $color selected value=\"$row->prod_group_ID\">$row->prod_group_ID - $prod</option>\n";
-    				    else
-    					   echo "<option $color value=\"$row->prod_group_ID\">$row->prod_group_ID - $prod</option>\n";
-                    }
-                }
-            echo "
-            </select>\n";
-            ?>
-                </td>
-            </tr>
-            <tr> 
-                  <td>Verkn&uuml;pfung</td>
-                  <td>UND&nbsp;&nbsp;&nbsp;
-                    <input type="radio" name="pz[bind]" value="AND" <?php if (isset($pz["bind"]) && $pz["bind"]=="AND") echo "checked='checked'"; else  echo "checked='checked'";?>>
-                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ODER&nbsp;&nbsp;&nbsp;
-                    <input type="radio" name="pz[bind]" value="OR" <?php if (isset($pz["bind"]) && $pz["bind"]=="OR") echo "checked='checked'"; ?>></td>
-            </tr>
-            <tr>
-                <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
-            <?php
-                $sort = array("-1"=>"","proz_bez"=>"Bezeichnung","verantw"=>"Verantwortlicher","proz_stat"=>"Status","prod_name"=>"Produkt");
-                for ($i=1; $i<3; $i++)
-                { 
-                  echo "$i.&nbsp;&nbsp;<select name='pz[sort$i]'>\n";
-                  foreach ($sort as $key=>$val)
-                  {
-                    $rsort = "sort" . $i;
-                    if ($pz[$rsort] == $val) $select= " selected"; else $select = "";
-                    echo "<option$select value='$key'>$val</option>\n";
-                  }
-                  echo "</select>&nbsp;&nbsp;&nbsp;&nbsp;\n";
-                } 
-                echo "</td></tr>\n";
-                echo "</td></tr>\n";
-        
-                $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
-                echo "<tr><td>Zeilen/Seite?</td><td><select name='pz[z]'>\n";
-                if (!$pz['z']) $pz['z'] = 9999;
-                foreach ($azeil as $key=>$val)
-                {
-                    if ($key == $pz['z']) $select = "selected"; else $select = "";
-                    echo "<option $select value='$key'>$val</option>\n";
-                }
-                echo "</select></td></tr>\n";
-        
-            ?>
-            <tr> 
-                <td>&nbsp;</td>
-                <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
-            </tr> 
-        </table>
-        </div>
-        </form>
-<?php        
-    }
-    else
-    {
-    	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
-        include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
-    
-    	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
-        
-        $sql = "SELECT proz_ID,proz_bez,proz_bez_l,proz_start_pl,proz_end_pl,proz_kost_pl,proz_start,proz_end,proz_kosten,
-                    proz_ref_ID,proz_bem,persknr,verantw,persknr_a,auftragg,proz_stat_ID,proz_stat,proz_urg_ID,proz_urg_bez,
-                    produkt_ID,prod_name,prod_group_ID,proz_step_ID,proz_step,step_stat_ID,step_stat,step_bem 
-                FROM fhiiqm.v_projekt_report ";
-
-        $lim = " LIMIT $start,$zeil";
-        $where = "";
-        $krit = "";
-        $bind = $pz["bind"];
-        if ($pz["stat"] > "-1")
-        { 
-            $where .= " proz_stat_ID = ".$pz["stat"];
-            $stat = $dbc->querySingleItem("SELECT proz_stat_bez FROM Proz_Status WHERE proz_stat_ID =".$pz["stat"]);
-            $krit = " [Projektstatus = '$stat'] ";
-        }    
-        if ($pz["pgid"] > "-1")
-        { 
-            if ($where) $bd = $bind; else $bd = "";
-            $where .= " $bd prod_group_ID = ".$pz["pgid"];
-            $prodg = $dbc->querySingleItem("SELECT prod_group_name FROM fhiiqm.Produkt_Gruppe WHERE prod_group_ID =".$pz["pgid"]);
-            $krit = " [Produktgruppe = '$prodg'] ";
-        }    
-/*        if ($pz["va"])
-        { 
-            if ($where) $bd = $bind; else $bd = "";
-            $where .= " $bd verantw LIKE '".$pz["va"] . "%' ";
-            $krit .= $bd . " [Verantwortlicher wie '".$pz["va"]."*'] ";
-        }       */ 
-        if ($pid)
-        {
-            if ($where) $bd = $bind; else $bd = "";
-            $where .= " $bd proz_ID = $pid";
-        }   
-        if ($pz["sort1"]>"-1" || $pz["sort2"]>"-1")
-        {
-            if ($pz["sort1"]>"-1") $ord  = " ORDER BY " . $pz["sort1"];
-            if ($pz["sort2"]>"-1") $ord .= ",".$pz["sort2"];
-            $ord .= ",proz_step_ID ";
-        }
-        else $ord = " ORDER BY proz_bez,proz_step_ID";
-        if ($where) $where = " WHERE $where";
-        
-        $sql .= $where . $ord .$lim;
-//echo "sql = $sql<br />\n";
-        $result = $dbc -> queryObjectArray($sql);
-
-        echo "<div align='center'>\n";
-
-        echo "<p>Klick auf '<img src=\"/fhiiqm/img/details.gif\" alt='Details' title='Details' border='0'/>' -> Details zum Projekt</p>";
-        if ($krit) echo "<p>Projekte f&uuml;r $krit</p>"; else echo "<p>&nbsp;</p>";
-        
-        if ($result)
-        {
-            $sql = "SELECT COUNT(*) FROM v_projekt_report $where"; 
-            $ianz = $dbc -> querySingleItem($sql);
-    		$bg1 = "#F8F8F8";
-    		$bg2 = "#DEDFE1";
-    		$bg = "#FFFFFF";
-
-            echo "<table border='1' cellspacing='0' cellpadding='2' width='80%'>\n";
-            // Listenkopf
-            echo "<tr bgcolor='#68ACBF'>";
-            echo "<th>Projekt</th>";
-            echo "<th>Beschreibung</th>";
-            echo "<th>zu Produkt</th>";
-            echo "<th>Verantwortlicher</th>";
-            echo "<th>Status</th>";
-            echo "<th>&nbsp;</th></tr>\n";
-            foreach ($result as $row)
-            {
-                foreach ($row as &$val) if (is_null($val) || $val <=' ') $val = "&nbsp;";
-                if ($vproz != $row->proz_ID)
-                {
-        			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-                    echo "<tr bgcolor='" . $bg . "' background='../img/linelightblue.gif'>";
-                    echo "<td>$row->proz_bez</td>";
-                    echo "<td>$row->proz_bez_l</td>";
-                    echo "<td>$row->prod_name</td>";
-                    echo "<td>$row->verantw</td>";
-                    echo "<td>$row->proz_stat</td>";
-                    echo "<td><a href='/fhiiqm/report/prozess_report.php?i=$row->proz_ID&s=2'><img src=\"/fhiiqm/img/details.gif\" alt='Details' title='Details' border='0'/></a></td>";
-                }
-                $vproz = $row->proz_ID;
-            }
-            echo "</table>\n";
-            echo "<p></p><table width=90%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
-                <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
-            echo "</div>\n";
-            echo "<br />&nbsp;&nbsp;&nbsp;";
-    
-            if ($search != 2) // Aufruf aus fhiiqm
-            {    
-                // Parameter aus $_GET fuer weitere Seiten
-                $_GET["s"] = 1; // bewirkt weitere Suche
-                foreach ($_GET as $key=>$val)
-                {
-                    if ($key != "st") $liste .= "&" . $key ."=".$val;
-                }    
-                // Links auf andere Seiten generieren
-                liste_links($start,$zeil,$ianz,$liste);
-                echo "<br />&nbsp;&nbsp;&nbsp;";
-            }
-        }
-        else
-        {
-            echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
-            echo "</div>\n";
-            echo "<br />&nbsp;&nbsp;&nbsp;";
-        }
-
-        if ($search != 2)
-        {    
-            echo "<span class='sc'>";
-            echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/pz_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
-            echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Projekt\" class=\"sc\">neuer Bericht Projekte</a>\n";    
-            echo "</span>";
-        }
-        else
-            echo "<a href='javascript:history.back();' onMouseOver=\"{window.status='Zur&uuml;ck'; return true;}\">&laquo; Zur&uuml;ck</a>";
-    }
-?>
-
-</body>
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 03/2013
+ * 
+ * Report Projekt fuer Website Haustechnik
+ */
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    if (!isset($_GET['s']) || $_GET['s'] != 2 )
+    {
+        session_start();
+        if (! isset($_SESSION["userid"]))
+        { 
+            include_once ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");	
+            login($_SERVER["PHP_SELF"]);
+            exit;
+        }
+        
+        if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("pzr",$_SESSION["recht"]) && !in_array("pze",$_SESSION["recht"])))
+        {
+            header("Location: start.php");
+            exit;
+        }
+    }    
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
+   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
+	<title>Report Projekte, &Uuml;bersicht</title>
+</head>
+
+<body>
+
+<?php    
+    echo "&nbsp;";  
+    if (!isset($_GET['s']) || $_GET['s'] != 2 )
+    {
+        echo "<div class=\"float-br smaller\" valign='top'>";
+        echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+        echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+    }
+    echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/sheduled_task.png\" border=\"0\" alt=\"Projekt\" title=\"Projekt\"/></div>\n";
+    
+    $pz    = $_POST["pz"];    // Parameter aus Form
+    $search = $_POST["search"];
+    if (!$search) $search =  $_GET["s"];
+
+    $zeil = $pz["z"];
+    if (!$zeil) $zeil = $_GET["z"];
+    if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
+    $start = $_GET["st"];   // Start bei DS $start+1
+    if (!$start) $start=0;
+    $psep = $_GET["sp"];  // 1 Projekt je Druckseite
+    if (!$psep) $psep = $pz["sep"];
+    $pid = $_GET['i'];
+
+    if (!is_array($pz))
+    {
+        $pz["stat"] = $_GET["su"];
+//        $pz["va"] = $_GET["v"];
+        $pz["pgid"] = $_GET["p"];
+        $pz["abta"] = $_GET["a"];
+        $pz["bind"] = $_GET["b"];
+        if (!$pz["bind"]) $pz["bind"] = 'AND';
+        $pz["sort1"] = $_GET["s1"];
+        $pz["sort2"] = $_GET["s2"];
+        $pz["sep"]     = $_GET["sp"];   
+    }
+        $_GET["su"] = $pz["stat"];
+//        $_GET["v"] = $pz["va"];
+        $_GET["p"] = $pz["pgid"];
+        $_GET["a"] = $pz["abta"];
+        $_GET["b"] = $pz["bind"];
+        $_GET["sp"] = $pz["sep"];
+        $_GET["s1"] = $pz["sort1"];
+        $_GET["s2"] = $pz["sort2"];
+        $_GET["z"] = $zeil;
+        $_GET['i'] = $pid;
+
+    if ($search && $_GET['s'] != 2)
+    {    
+        echo "<span class='sc'>";
+        echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/pz_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
+        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"RAG GMV\" class=\"sc\">neuer Bericht Projekte - &Uuml;bersicht</a>\n";    
+        echo "</span>";
+    }
+    else
+        echo "<a href='javascript:history.back();' onMouseOver=\"{window.status='Zur&uuml;ck'; return true;}\">&laquo; Zur&uuml;ck</a>";
+    echo "<div align='center'>\n";
+    echo "<p><b>Bericht Projekte - &Uuml;bersicht</b></p>\n";
+    echo "</div>\n";
+    
+    if (!$search)
+    {
+    ?>
+        <div align="center">
+        <p>Bitte Kriterien f&uuml;r die Suche w&auml;hlen</p>
+        <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_proj" target="_self">	
+        <table width="50%" border="0" cellspacing="3" cellpadding="3">
+            <tr>
+                <td>Status</td>
+                <td>
+                    <select name="pz[stat]" size="1">
+                    <?php 
+                        if ($pz["stat"] == -1) $select = " selected = 'selected'"; else $select = "";
+                        echo "<option $select value=\"-1\"></option>\n";
+                        $sql = "SELECT proz_stat_ID, proz_stat_bez FROM Proz_Status ORDER BY 1";
+                        if ($result = $dbc->queryObjectArray($sql))
+                        {
+                            foreach ($result as $row)
+                            {
+                                $select = ($row->proz_stat_ID == $pz['stat'])? " selected = 'selected'" : "";
+        					   echo "<option$select value=\"$row->proz_stat_ID\">$row->proz_stat_bez</option>\n";
+                            }
+                        }
+                    ?>
+                    </select>
+                </td>
+            </tr>
+<!--            <tr><td>Verantwortlicher</td><td><input type="text" name="pz[va]" value="<?php echo $pz['va']; ?>" /></td></tr> -->
+            <tr>
+                <td>Produktgruppe</td>
+                <td>
+                    <select name="pz[pgid]" size="1">
+            <?php
+                // Recht Produktgruppe beruecksichtigen
+                if (is_array($_SESSION["prodg"]))
+                {
+                        foreach ($_SESSION["prodg"] as $val)
+                            $listg .= ",'" .$val . "'";
+                        $listg = substr($listg,1);
+                        echo "prodg = $listg<br />";
+                        $sql = "SELECT prod_group_ID, prod_group_name FROM fhiiqm.Produkt_Gruppe WHERE prod_group_ID IN('$listg')";                
+                }
+                else
+                    $sql = "SELECT prod_group_ID, prod_group_name FROM fhiiqm.Produkt_Gruppe";  
+                if ($pz['pgid'] == -1) $select = " selected "; else $select = "";
+                echo "<option $select value=\"-1\"></option>\n";
+                if ($result = $dbc->queryObjectArray($sql))
+                {
+                    foreach ($result as $row)
+                    {
+                        if (strlen($row->prod_group_name) > 70) 
+                            $prod=str_replace(" ","&nbsp;",htmlentities(substr($row->prod_group_name,0,70))) ."..."; 
+                        else 
+                            $prod=str_replace(" ","&nbsp;",htmlentities($row->prod_group_name));
+                        if ($row->prod_group_ID == $pz['pgid'])
+    					   echo "<option $color selected value=\"$row->prod_group_ID\">$row->prod_group_ID - $prod</option>\n";
+    				    else
+    					   echo "<option $color value=\"$row->prod_group_ID\">$row->prod_group_ID - $prod</option>\n";
+                    }
+                }
+            echo "
+            </select>\n";
+            ?>
+                </td>
+            </tr>
+            <tr>
+                <td>Abteilung Auftraggeber</td>
+                <td>
+                    <select name="pz[abta]" size="1">
+                    <?php
+                        if ($pz["abta"] == -1) $select = " selected = 'selected'"; else $select = "";
+                        echo "<option $select value=\"-1\"></option>\n";
+                        $sql = "SELECT abt_ID, abt_name FROM Abteilung WHERE abt_ID<8 ORDER BY abt_ID+0";
+                        if ($result = $dbc->queryObjectArray($sql))
+                        {
+                            foreach ($result as $row)
+                            {
+                                $select = ($row->abt_ID == $pz['abta'])? " selected = 'selected'" : "";
+                                echo "<option$select value=\"$row->abt_ID\">$row->abt_name</option>\n";
+                            }
+                        }
+                    ?>
+                    </select>
+                </td>
+            </tr>
+            
+            <tr> 
+                  <td>Verkn&uuml;pfung</td>
+                  <td>UND&nbsp;&nbsp;&nbsp;
+                    <input type="radio" name="pz[bind]" value="AND" <?php if (isset($pz["bind"]) && $pz["bind"]=="AND") echo "checked='checked'"; else  echo "checked='checked'";?>>
+                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ODER&nbsp;&nbsp;&nbsp;
+                    <input type="radio" name="pz[bind]" value="OR" <?php if (isset($pz["bind"]) && $pz["bind"]=="OR") echo "checked='checked'"; ?>></td>
+            </tr>
+            <tr>
+                <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
+            <?php
+                $sort = array("-1"=>"","proz_bez"=>"Bezeichnung","verantw"=>"Verantwortlicher","proz_stat"=>"Status","prod_name"=>"Produkt");
+                for ($i=1; $i<3; $i++)
+                { 
+                  echo "$i.&nbsp;&nbsp;<select name='pz[sort$i]'>\n";
+                  foreach ($sort as $key=>$val)
+                  {
+                    $rsort = "sort" . $i;
+                    if ($pz[$rsort] == $val) $select= " selected"; else $select = "";
+                    echo "<option$select value='$key'>$val</option>\n";
+                  }
+                  echo "</select>&nbsp;&nbsp;&nbsp;&nbsp;\n";
+                } 
+                echo "</td></tr>\n";
+                echo "</td></tr>\n";
+        
+                $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
+                echo "<tr><td>Zeilen/Seite?</td><td><select name='pz[z]'>\n";
+                if (!$pz['z']) $pz['z'] = 9999;
+                foreach ($azeil as $key=>$val)
+                {
+                    if ($key == $pz['z']) $select = "selected"; else $select = "";
+                    echo "<option $select value='$key'>$val</option>\n";
+                }
+                echo "</select></td></tr>\n";
+        
+            ?>
+            <tr> 
+                <td>&nbsp;</td>
+                <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
+            </tr> 
+        </table>
+        </div>
+        </form>
+<?php        
+    }
+    else
+    {
+    	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+        include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+    
+    	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+        
+/*        $sql = "SELECT proz_ID,proz_bez,proz_bez_l,proz_start_pl,proz_end_pl,proz_kost_pl,proz_start,proz_end,proz_kosten,
+                    proz_ref_ID,proz_bem,persknr,verantw,persknr_a,auftragg,proz_stat_ID,proz_stat,proz_urg_ID,proz_urg_bez,
+                    produkt_ID,prod_name,prod_group_ID,proz_step_ID,proz_step,step_stat_ID,step_stat,step_bem 
+                FROM fhiiqm.v_projekt_report "; */
+        $sql = "SELECT p.proz_ID,proz_bez,proz_bez_l,
+                	p.persknr,CONCAT(m.nachname,', ',m.vorname) AS verantw,p.proz_stat_ID,proz_stat_bez AS proz_stat,
+                	p.produkt_ID,prod_name,prod_group_ID, rag_bez,
+					p.persknr_a,CONCAT(ma.nachname,', ',ma.vorname) AS anford, abt_name, ma.abt_tel, 
+                    p.proz_start,p.proz_end,p.proz_start_pl,p.proz_end_pl 
+                FROM fhiiqm.Prozess p
+                LEFT OUTER JOIN fhiiqm.Produkt k ON p.produkt_ID = k.produkt_ID
+                LEFT OUTER JOIN fhiiqm.Mitarbeiter m ON p.persknr=m.persknr
+                LEFT OUTER JOIN fhiiqm.Proz_Status s ON p.proz_stat_ID=s.proz_stat_ID
+                LEFT OUTER JOIN fhiiqm.Proz_RaumArbGruppe prag ON p.proz_ID=prag.proz_ID
+                LEFT OUTER JOIN fhiiqm.RaumArb_Gruppe rag ON prag.rag_ID=rag.rag_ID
+				LEFT OUTER JOIN Mitarbeiter ma ON p.persknr_a=ma.persknr
+				LEFT OUTER JOIN Abteilung a ON ma.abt_tel=a.abt_ID";
+
+        $lim = " LIMIT $start,$zeil";
+        $where = "";
+        $krit = "";
+        $bind = $pz["bind"];
+        if ($pz["stat"] > "-1")
+        { 
+            $where .= " p.proz_stat_ID = ".$pz["stat"];
+            $stat = $dbc->querySingleItem("SELECT proz_stat_bez FROM Proz_Status WHERE proz_stat_ID =".$pz["stat"]);
+            $krit = " [Projektstatus = '$stat'] ";
+        }    
+        if ($pz["pgid"] > "-1")
+        { 
+            if ($where) $bd = " ".$bind; else $bd = "";
+            $where .= " $bd prod_group_ID = ".$pz["pgid"];
+            $prodg = $dbc->querySingleItem("SELECT prod_group_name FROM fhiiqm.Produkt_Gruppe WHERE prod_group_ID =".$pz["pgid"]);
+            $krit .= $bd." [Produktgruppe = '$prodg'] ";
+        }    
+/*        if ($pz["va"])
+        { 
+            if ($where) $bd = $bind; else $bd = "";
+            $where .= " $bd verantw LIKE '".$pz["va"] . "%' ";
+            $krit .= $bd . " [Verantwortlicher wie '".$pz["va"]."*'] ";
+        }       */ 
+        if ($pz["abta"] > "-1")
+        { 
+            if ($where) $bd = $bind; else $bd = "";
+            $where .= " $bd ma.abt_tel = ".$pz["abta"];
+            $abtn = $dbc->querySingleItem("SELECT abt_name FROM fhiiqm.Abteilung WHERE abt_ID =".$pz["abta"]);
+            $krit .= $bd." [Abteilung Auftraggeber = '$abtn'] ";
+        }    
+        if ($pid)
+        {
+            if ($where) $bd = $bind; else $bd = "";
+            $where .= " $bd p.proz_ID = $pid";
+        }   
+        if ($pz["sort1"]>"-1" || $pz["sort2"]>"-1")
+        {
+            if ($pz["sort1"]>"-1") $ord  = " ORDER BY " . $pz["sort1"];
+            if ($pz["sort2"]>"-1") $ord .= ",".$pz["sort2"];
+//            $ord .= ",proz_step_ID ";
+            $ord .= ",p.proz_ID ";
+        }
+//        else $ord = " ORDER BY proz_bez,proz_step_ID";
+        else $ord = " ORDER BY proz_bez,p.proz_ID";
+        if ($where) $where = " WHERE $where";
+        
+        $sql .= $where . $ord .$lim;
+//echo "sql = $sql<br />\n";
+        $result = $dbc -> queryObjectArray($sql);
+
+        echo "<div align='center'>\n";
+
+        echo "<p>Klick auf '<img src=\"/fhiiqm/img/details.gif\" alt='Details' title='Details' border='0'/>' -> Details zum Projekt</p>";
+        if ($krit) echo "<p>Projekte f&uuml;r $krit</p>"; else echo "<p>&nbsp;</p>";
+        
+        if ($result)
+        {
+//            $sql = "SELECT COUNT(*) FROM v_projekt_report $where";
+            if ($search != 2) $search =1;
+            $sql = "SELECT COUNT(*) 
+                FROM fhiiqm.Prozess p
+                LEFT OUTER JOIN fhiiqm.Produkt k ON p.produkt_ID = k.produkt_ID
+                LEFT OUTER JOIN fhiiqm.Mitarbeiter m ON p.persknr=m.persknr
+                LEFT OUTER JOIN fhiiqm.Proz_Status s ON p.proz_stat_ID=s.proz_stat_ID
+                LEFT OUTER JOIN fhiiqm.Proz_RaumArbGruppe prag ON p.proz_ID=prag.proz_ID
+                LEFT OUTER JOIN fhiiqm.RaumArb_Gruppe rag ON prag.rag_ID=rag.rag_ID
+				LEFT OUTER JOIN Mitarbeiter ma ON p.persknr_a=ma.persknr
+				LEFT OUTER JOIN Abteilung a ON ma.abt_tel=a.abt_ID $where";
+            $ianz = $dbc -> querySingleItem($sql);
+    		$bg1 = "#F8F8F8";
+    		$bg2 = "#DEDFE1";
+    		$bg = "#FFFFFF";
+
+            echo "<table border='1' cellspacing='0' cellpadding='2' width='80%'>\n";
+            // Listenkopf
+            echo "<tr bgcolor='#68ACBF'>";
+            echo "<th>Projekt</th>";
+            echo "<th>Beschreibung</th>";
+            echo "<th>zu Produkt</th>";
+            echo "<th>Verantwortlicher</th>";
+            echo "<th>Status</th>";
+            echo "<th width='5%'>Plan Start</th>";
+            echo "<th width='5%'>Plan Ende</th>";
+            echo "<th width='5%'>Ist Start</th>";
+            echo "<th width='5%'>Ist Ende</th>";
+            echo "<th>betroffene AG</th>";
+            echo "<th>&nbsp;</th></tr>\n";
+            foreach ($result as $row)
+            {
+                foreach ($row as &$val) if (is_null($val) || $val <=' ') $val = "&nbsp;";
+                if ($vproz != $row->proz_ID)
+                {
+                    if ($ende)
+                    {
+                        echo "</td>"; 
+                        echo "<td><a href='/fhiiqm/report/prozess_report.php?i=$vproz&s=$search'><img src=\"/fhiiqm/img/details.gif\" alt='Details' title='Details' border='0'/></a></td></tr>\n";
+                    } 
+        			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                    echo "<tr bgcolor='" . $bg . "' background='../img/linelightblue.gif'>";
+                    echo "<td>$row->proz_bez</td>";
+                    echo "<td>$row->proz_bez_l</td>";
+                    echo "<td>$row->prod_name</td>";
+                    echo "<td>$row->verantw</td>";
+                    echo "<td>$row->proz_stat</td>";
+                    if ($row->proz_start_pl>"&nbsp;")
+                    {
+                        $dat = new DateTime($row->proz_start_pl);    
+                        echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
+                    }
+                    else  echo "<td>&nbsp;</td>";       
+                    if ($row->proz_end_pl>"&nbsp;")
+                    {
+                        $dat = new DateTime($row->proz_end_pl);    
+                        echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
+                    }
+                    else  echo "<td>&nbsp;</td>";
+                    if ($row->proz_start>"&nbsp;")
+                    {
+                        $dat = new DateTime($row->proz_start);    
+                        echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
+                    }
+                    else  echo "<td>&nbsp;</td>";       
+                    if ($row->proz_end>"&nbsp;")
+                    {
+                        $dat = new DateTime($row->proz_end);    
+                        echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
+                    }
+                    else  echo "<td>&nbsp;</td>";
+                    echo "<td>$row->rag_bez";
+                    $ende=1;
+                }
+                else
+                {
+                    echo "<br />$row->rag_bez";
+                }
+                $vproz = $row->proz_ID;
+            }
+            echo "</td>";
+             
+            echo "<td><a href='/fhiiqm/report/prozess_report.php?i=$row->proz_ID&s=$search'><img src=\"/fhiiqm/img/details.gif\" alt='Details' title='Details' border='0'/></a></td></tr>\n";
+            echo "</table>\n";
+            echo "<p></p><table width=90%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
+                <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
+            echo "</div>\n";
+            echo "<br />&nbsp;&nbsp;&nbsp;";
+    
+            if ($search != 2) // Aufruf aus fhiiqm
+            {    
+                // Parameter aus $_GET fuer weitere Seiten
+                $_GET["s"] = 1; // bewirkt weitere Suche
+                foreach ($_GET as $key=>$val)
+                {
+                    if ($key != "st") $liste .= "&" . $key ."=".$val;
+                }    
+                // Links auf andere Seiten generieren
+                liste_links($start,$zeil,$ianz,$liste);
+                echo "<br />&nbsp;&nbsp;&nbsp;";
+            }
+        }
+        else
+        {
+            echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
+            echo "</div>\n";
+            echo "<br />&nbsp;&nbsp;&nbsp;";
+        }
+
+        if ($search != 2)
+        {    
+            echo "<span class='sc'>";
+            echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/pz_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
+            echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Projekt\" class=\"sc\">neuer Bericht Projekte - &Uuml;bersicht</a>\n";    
+            echo "</span>";
+        }
+        else
+            echo "<a href='javascript:history.back();' onMouseOver=\"{window.status='Zur&uuml;ck'; return true;}\">&laquo; Zur&uuml;ck</a>";
+    }
+?>
+
+</body>
 </html>    
\ No newline at end of file
--- a/fhiiqm/report/prozess_report.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/report/prozess_report.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,430 +1,445 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 02/2013
- * 
- * Report Projekte
- *  
- */
-
-    error_reporting(E_ALL ^ E_NOTICE);
-    
-    if (!isset($_GET['s']) || $_GET['s'] != 2 )
-    {
-        session_start();
-        if (! isset($_SESSION["userid"]))
-        { 
-            include_once ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");	
-            login($_SERVER["PHP_SELF"]);
-            exit;
-        }
-        
-        if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("pzr",$_SESSION["recht"]) && !in_array("pze",$_SESSION["recht"])))
-        {
-            header("Location: start.php");
-            exit;
-        }
-    }    
-	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
-	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
-   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
-	<title>Report Projekte, Details</title>
-</head>
-
-<body>
-
-<?php    
-    echo "&nbsp;";  
-    if (!isset($_GET['s']) || $_GET['s'] != 2 )
-    {
-        echo "<div class=\"float-br smaller\" valign='top'>";
-        echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
-        echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
-    }
-    echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/sheduled_task.png\" border=\"0\" alt=\"Projekt\" title=\"Projekt\"/></div>\n";
-    
-    $pz    = $_POST["pz"];    // Parameter aus Form
-    $search = $_POST["search"];
-    if (!$search) $search =  $_GET["s"];
-
-    $zeil = $pz["z"];
-    if (!$zeil) $zeil = $_GET["z"];
-    if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
-    $start = $_GET["st"];   // Start bei DS $start+1
-    if (!$start) $start=0;
-    $psep = $_GET["sp"];  // 1 Projekt je Druckseite
-    if (!$psep) $psep = $pz["sep"];
-    $pid = $_GET['i'];
-
-    if (!is_array($pz))
-    {
-        $pz["stat"] = $_GET["su"];
-//        $pz["va"] = $_GET["v"];
-        $pz["pgid"] = $_GET["p"];
-        $pz["bind"] = $_GET["b"];
-        if (!$pz["bind"]) $pz["bind"] = 'AND';
-        $pz["sort1"] = $_GET["s1"];
-        $pz["sort2"] = $_GET["s2"];
-        $pz["sep"]     = $_GET["sp"];   
-    }
-        $_GET["su"] = $pz["stat"];
-//        $_GET["v"] = $pz["va"];
-        $_GET["p"] = $pz["pgid"];
-        $_GET["b"] = $pz["bind"];
-        $_GET["sp"] = $pz["sep"];
-        $_GET["s1"] = $pz["sort1"];
-        $_GET["s2"] = $pz["sort2"];
-        $_GET["z"] = $zeil;
-        $_GET['i'] = $pid;
-
-    if ($search && $_GET['s'] != 2)
-    {    
-        echo "<span class='sc'>";
-        echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/pz_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
-        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"RAG GMV\" class=\"sc\">neuer Bericht Projekte</a>\n";    
-        echo "</span>";
-    }
-    echo "<div align='center'>\n";
-    echo "<p><b>Bericht Projekte - Details</b></p>\n";
-    echo "</div>\n";
-    
-    if (!$search)
-    {
-    ?>
-        <div align="center">
-        <p>Bitte Kriterien f&uuml;r die Suche w&auml;hlen</p>
-        <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_proj" target="_self">	
-        <table width="50%" border="0" cellspacing="3" cellpadding="3">
-            <tr>
-                <td>Status</td>
-                <td>
-                    <select name="pz[stat]" size="1">
-                    <?php 
-                        if ($pz["stat"] == -1) $select = " selected = 'selected'"; else $select = "";
-                        echo "<option $select value=\"-1\"></option>\n";
-                        $sql = "SELECT proz_stat_ID, proz_stat_bez FROM Proz_Status ORDER BY 1";
-                        if ($result = $dbc->queryObjectArray($sql))
-                        {
-                            foreach ($result as $row)
-                            {
-                                $select = ($row->proz_stat_ID == $pz['stat'])? " selected = 'selected'" : "";
-        					   echo "<option$select value=\"$row->proz_stat_ID\">$row->proz_stat_bez</option>\n";
-                            }
-                        }
-                    ?>
-                    </select>
-                </td>
-            </tr>
-<!--            <tr><td>Verantwortlicher</td><td><input type="text" name="pz[va]" value="<?php echo $pz['va']; ?>" /></td></tr> -->
-            <tr>
-                <td>Produktgruppe</td>
-                <td>
-                    <select name="pz[pgid]" size="1">
-            <?php
-                // Recht Produktgruppe beruecksichtigen
-                if (is_array($_SESSION["prodg"]))
-                {
-                        foreach ($_SESSION["prodg"] as $val)
-                            $listg .= ",'" .$val . "'";
-                        $listg = substr($listg,1);
-                        echo "prodg = $listg<br />";
-                        $sql = "SELECT prod_group_ID, prod_group_name FROM fhiiqm.Produkt_Gruppe WHERE prod_group_ID IN('$listg')";                
-                }
-                else
-                    $sql = "SELECT prod_group_ID, prod_group_name FROM fhiiqm.Produkt_Gruppe";  
-                if ($pz['pgid'] == -1) $select = " selected "; else $select = "";
-                echo "<option $select value=\"-1\"></option>\n";
-                if ($result = $dbc->queryObjectArray($sql))
-                {
-                    foreach ($result as $row)
-                    {
-                        if (strlen($row->prod_group_name) > 70) 
-                            $prod=str_replace(" ","&nbsp;",htmlentities(substr($row->prod_group_name,0,70))) ."..."; 
-                        else 
-                            $prod=str_replace(" ","&nbsp;",htmlentities($row->prod_group_name));
-                        if ($row->prod_group_ID == $pz['pgid'])
-    					   echo "<option $color selected value=\"$row->prod_group_ID\">$row->prod_group_ID - $prod</option>\n";
-    				    else
-    					   echo "<option $color value=\"$row->prod_group_ID\">$row->prod_group_ID - $prod</option>\n";
-                    }
-                }
-            echo "
-            </select>\n";
-            ?>
-                </td>
-            </tr>
-            <tr><td>Projekte separat?</td><td><input type="checkbox" name="pz[sep]" value="1" <?php if ($psep) echo "checked='checked'"; ?>/></td></tr>
-            <tr> 
-                  <td>Verkn&uuml;pfung</td>
-                  <td>UND&nbsp;&nbsp;&nbsp;
-                    <input type="radio" name="pz[bind]" value="AND" <?php if (isset($pz["bind"]) && $pz["bind"]=="AND") echo "checked='checked'"; else  echo "checked='checked'";?>>
-                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ODER&nbsp;&nbsp;&nbsp;
-                    <input type="radio" name="pz[bind]" value="OR" <?php if (isset($pz["bind"]) && $pz["bind"]=="OR") echo "checked='checked'"; ?>></td>
-            </tr>
-            <tr>
-                <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
-            <?php
-                $sort = array("-1"=>"","proz_bez"=>"Bezeichnung","verantw"=>"Verantwortlicher","proz_stat"=>"Status","prod_name"=>"Produkt");
-                for ($i=1; $i<3; $i++)
-                { 
-                  echo "$i.&nbsp;&nbsp;<select name='pz[sort$i]'>\n";
-                  foreach ($sort as $key=>$val)
-                  {
-                    $rsort = "sort" . $i;
-                    if ($pz[$rsort] == $val) $select= " selected"; else $select = "";
-                    echo "<option$select value='$key'>$val</option>\n";
-                  }
-                  echo "</select>&nbsp;&nbsp;&nbsp;&nbsp;\n";
-                } 
-                echo "</td></tr>\n";
-                echo "</td></tr>\n";
-        
-                $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
-                echo "<tr><td>Zeilen/Seite?</td><td><select name='pz[z]'>\n";
-                if (!$pz['z']) $pz['z'] = 9999;
-                foreach ($azeil as $key=>$val)
-                {
-                    if ($key == $pz['z']) $select = "selected"; else $select = "";
-                    echo "<option $select value='$key'>$val</option>\n";
-                }
-                echo "</select></td></tr>\n";
-        
-            ?>
-            <tr> 
-                <td>&nbsp;</td>
-                <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
-            </tr> 
-        </table>
-        </div>
-        </form>
-<?php        
-    }
-    else
-    {
-    	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
-        include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
-    
-    	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
-        
-        $sql = "SELECT proz_ID,proz_bez,proz_bez_l,proz_start_pl,proz_end_pl,proz_kost_pl,proz_start,proz_end,proz_kosten,
-                    proz_ref_ID,proz_bem,persknr,verantw,persknr_a,auftragg,proz_stat_ID,proz_stat,proz_urg_ID,proz_urg_bez,
-                    produkt_ID,prod_name,prod_group_ID,proz_step_ID,proz_step,step_stat_ID,step_stat,step_bem 
-                FROM fhiiqm.v_projekt_report ";
-
-        $lim = " LIMIT $start,$zeil";
-        $where = "";
-        $krit = "";
-        $bind = $pz["bind"];
-        if ($pz["stat"] > "-1")
-        { 
-            $where .= " proz_stat_ID = ".$pz["stat"];
-            $stat = $dbc->querySingleItem("SELECT proz_stat_bez FROM Proz_Status WHERE proz_stat_ID =".$pz["stat"]);
-            $krit = " [Projektstatus = '$stat'] ";
-        }    
-        if ($pz["pgid"] > "-1")
-        { 
-            if ($where) $bd = $bind; else $bd = "";
-            $where .= " $bd prod_group_ID = ".$pz["pgid"];
-            $prodg = $dbc->querySingleItem("SELECT prod_group_name FROM fhiiqm.Produkt_Gruppe WHERE prod_group_ID =".$pz["pgid"]);
-            $krit = " [Produktgruppe = '$prodg'] ";
-        }    
-/*        if ($pz["va"])
-        { 
-            if ($where) $bd = $bind; else $bd = "";
-            $where .= " $bd verantw LIKE '".$pz["va"] . "%' ";
-            $krit .= $bd . " [Verantwortlicher wie '".$pz["va"]."*'] ";
-        }       */ 
-        if ($pid)
-        {
-            if ($where) $bd = $bind; else $bd = "";
-            $where .= " $bd proz_ID = $pid";
-        }   
-        if ($pz["sort1"]>"-1" || $pz["sort2"]>"-1")
-        {
-            if ($pz["sort1"]>"-1") $ord  = " ORDER BY " . $pz["sort1"];
-            if ($pz["sort2"]>"-1") $ord .= ",".$pz["sort2"];
-            $ord .= ",step_sort ";
-        }
-        else $ord = " ORDER BY proz_bez,step_sort";
-        if ($where) $where = " WHERE $where";
-        
-        $sql .= $where . $ord .$lim;
-//echo "sql = $sql<br />\n";
-        $result = $dbc -> queryObjectArray($sql);
-
-        echo "<div align='center'>\n";
-
-        if ($krit) echo "<p>Projekte f&uuml;r $krit</p>"; else echo "<p>&nbsp;</p>";
-        
-        if ($result)
-        {
-            $sql = "SELECT COUNT(*) FROM v_projekt_report $where"; 
-            $ianz = $dbc -> querySingleItem($sql);
-    		$bg1 = "#F8F8F8";
-    		$bg2 = "#DEDFE1";
-    		$bg = "#FFFFFF";
-
-            echo "<table border='1' cellspacing='0' cellpadding='2' width='99%'>\n";
-            // Listenkopf
-            echo "<tr bgcolor='#68ACBF'>";
-            echo "<th width='11%'>Projekt</th>";
-            echo "<th width='11%'>Beschreibung</th>";
-            echo "<th width='7%'>zu Produkt</th>";
-            echo "<th width='7%'>Verantwortlicher</th>";
-            echo "<th width='7%'>Auftraggeber</th>";
-            echo "<th width='7%'>Status</th>";
-            echo "<th width='5%'>Wichtigkeit</th>";
-            echo "<th width='5%'>Plan Start</th>";
-            echo "<th width='5%'>Plan Ende</th>";
-            echo "<th width='6%'>Plan Kosten(&euro;)</th>";
-            echo "<th width='5%'>Ist Start</th>";
-            echo "<th width='5%'>Ist Ende</th>";
-            echo "<th width='6%'>Ist Kosten(&euro;)</th>";
-            echo "<th>Bemerkung</th></tr>\n";
-            echo "<tr bgcolor='#68ACBF'>";
-            echo "<th colspan='2'>&nbsp;</th>";
-            echo "<th colspan='3'><i>Schritt</i></th>";
-            echo "<th><i>Status</i></th>";
-            echo "<th colspan='8'><i>Bemerkung</i></th></tr>\n";
-            foreach ($result as $row)
-            {
-                foreach ($row as &$val) if (is_null($val) || $val <=' ') $val = "&nbsp;";
-                if ($vproz != $row->proz_ID)
-                {
-                    if ($psep)
-                    {
-                        if ($begin)
-                        {
-                            echo "</table>\n";
-                            echo "<p style=\"page-break-after:always\">&nbsp;</p>\n";
-                            echo "<p><b>Bericht Projekte</b></p>\n";
-                            if ($krit)echo "<p>Projekte f&uuml;r $krit</p>"; else echo "<p>&nbsp;</p>";
-                            echo "<table border='1' cellspacing='0' cellpadding='2' width='99%'>\n";
-                            // Listenkopf
-                            echo "<tr bgcolor='#68ACBF'>";
-                            echo "<th width='11%'>Projekt</th>";
-                            echo "<th width='11%'>Beschreibung</th>";
-                            echo "<th width='7%'>zu Produkt</th>";
-                            echo "<th width='7%'>Verantwortlicher</th>";
-                            echo "<th width='7%'>Auftraggeber</th>";
-                            echo "<th width='7%'>Status</th>";
-                            echo "<th width='5%'>Wichtigkeit</th>";
-                            echo "<th width='5%'>Plan Start</th>";
-                            echo "<th width='5%'>Plan Ende</th>";
-                            echo "<th width='6%'>Plan Kosten(&euro;)</th>";
-                            echo "<th width='5%'>Ist Start</th>";
-                            echo "<th width='5%'>Ist Ende</th>";
-                            echo "<th width='6%'>Ist Kosten(&euro;)</th>";
-                            echo "<th>Bemerkung</th></tr>\n";
-                            echo "<tr bgcolor='#68ACBF'>";
-                            echo "<th colspan='2'>&nbsp;</th>";
-                            echo "<th colspan='3'><i>Schritt</i></th>";
-                            echo "<th><i>Status</i></th>";
-                            echo "<th colspan='8'><i>Bemerkung</i></th></tr>\n";
-                        }
-                        
-                    }
-        			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-                    echo "<tr bgcolor='" . $bg . "' background='../img/linelightblue.gif'>";
-                    echo "<td>$row->proz_bez</td>";
-                    echo "<td>$row->proz_bez_l</td>";
-                    echo "<td>$row->prod_name</td>";
-                    echo "<td>$row->verantw</td>";
-                    echo "<td>$row->auftragg</td>";
-                    echo "<td>$row->proz_stat</td>";
-                    echo "<td>$row->proz_urg_bez</td>";
-                    if ($row->proz_start_pl>"&nbsp;")
-                    {
-                        $dat = new DateTime($row->proz_start_pl);    
-                        echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
-                    }
-                    else  echo "<td>&nbsp;</td>";       
-                    if ($row->proz_end_pl>"&nbsp;")
-                    {
-                        $dat = new DateTime($row->proz_end_pl);    
-                        echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
-                    }
-                    else  echo "<td>&nbsp;</td>";
-                    if ($row->proz_kost_pl>"&nbsp;") echo "<td class='right'>".number_format($row->proz_kost_pl,2,",","."); else echo "<td>&nbsp;</td>";        
-                    if ($row->proz_start>"&nbsp;")
-                    {
-                        $dat = new DateTime($row->proz_start);    
-                        echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
-                    }
-                    else  echo "<td>&nbsp;</td>";       
-                    if ($row->proz_end>"&nbsp;")
-                    {
-                        $dat = new DateTime($row->proz_end);    
-                        echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
-                    }
-                    else  echo "<td>&nbsp;</td>";
-                    if ($row->proz_kosten>"&nbsp;") echo "<td class='right'>".number_format($row->proz_kosten,2,",","."); else echo "<td>&nbsp;</td>";       
-                    echo "<td>$row->proz_bem</td></tr>\n";
-                    echo "<tr bgcolor='" . $bg . "'>";
-                    echo "<td colspan='2'>&nbsp;</td>";
-                    echo "<td colspan='3'><i>$row->proz_step</i></td>";
-                    echo "<td><i>$row->step_stat</i></td>";
-                    echo "<td colspan='8'><i>$row->step_bem</i></td></tr>\n";
-           
-                }
-                if ($vproz == $row->proz_ID && $vstep != $row->proz_step_ID)
-                {
-                    echo "<tr bgcolor='" . $bg . "'>";
-                    echo "<td colspan='2'>&nbsp;</td>";
-                    echo "<td colspan='3'><i>$row->proz_step</i></td>";
-                    echo "<td><i>$row->step_stat</i></td>";
-                    echo "<td colspan='8'><i>$row->step_bem</i></td></tr>\n";
-                }
-                $vproz = $row->proz_ID;
-                $vstep = $row->proz_step_ID;
-                $begin = 1;
-            }
-            echo "</table>\n";
-            echo "<p></p><table width=90%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
-                <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
-            echo "</div>\n";
-            echo "<br />&nbsp;&nbsp;&nbsp;";
-    
-            if ($search != 2) // Aufruf aus fhiiqm
-            {    
-                // Parameter aus $_GET fuer weitere Seiten
-                $_GET["s"] = 1; // bewirkt weitere Suche
-                foreach ($_GET as $key=>$val)
-                {
-                    if ($key != "st") $liste .= "&" . $key ."=".$val;
-                }    
-                // Links auf andere Seiten generieren
-                liste_links($start,$zeil,$ianz,$liste);
-                echo "<br />&nbsp;&nbsp;&nbsp;";
-            }
-        }
-        else
-        {
-            echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
-            echo "</div>\n";
-            echo "<br />&nbsp;&nbsp;&nbsp;";
-        }
-
-        if ($search != 2)
-        {    
-            echo "<span class='sc'>";
-            echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/pz_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
-            echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Projekt\" class=\"sc\">neuer Bericht Projekte</a>\n";    
-            echo "</span>";
-        }
-        else
-            echo "<a href='javascript:history.back();' onMouseOver=\"{window.status='Zur&uuml;ck'; return true;}\">&laquo; Zur&uuml;ck</a>";
-    }
-?>
-
-</body>
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 02/2013
+ * 
+ * Report Projekte
+ *  
+ */
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    if (!isset($_GET['s']) || $_GET['s'] != 2 )
+    {
+        session_start();
+        if (! isset($_SESSION["userid"]))
+        { 
+            include_once ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");	
+            login($_SERVER["PHP_SELF"]);
+            exit;
+        }
+        
+        if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("pzr",$_SESSION["recht"]) && !in_array("pze",$_SESSION["recht"])))
+        {
+            header("Location: start.php");
+            exit;
+        }
+    }    
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
+   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
+	<title>Report Projekte, Details</title>
+</head>
+
+<body>
+
+<?php    
+    echo "&nbsp;";  
+    if (!isset($_GET['s']) || $_GET['s'] != 2 )
+    {
+        echo "<div class=\"float-br smaller\" valign='top'>";
+        echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+        echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+    }
+    echo "<div class=\"float-r\"><img src=\"/fhiiqm/img/sheduled_task.png\" border=\"0\" alt=\"Projekt\" title=\"Projekt\"/></div>\n";
+    
+    $pz    = $_POST["pz"];    // Parameter aus Form
+    $search = $_POST["search"];
+    if (!$search) $search =  $_GET["s"];
+
+    $zeil = $pz["z"];
+    if (!$zeil) $zeil = $_GET["z"];
+    if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
+    $start = $_GET["st"];   // Start bei DS $start+1
+    if (!$start) $start=0;
+    $psep = $_GET["sp"];  // 1 Projekt je Druckseite
+    if (!$psep) $psep = $pz["sep"];
+    $pid = $_GET['i'];
+
+    if (!is_array($pz))
+    {
+        $pz["stat"] = $_GET["su"];
+//        $pz["va"] = $_GET["v"];
+        $pz["pgid"] = $_GET["p"];
+        $pz["bind"] = $_GET["b"];
+        if (!$pz["bind"]) $pz["bind"] = 'AND';
+        $pz["sort1"] = $_GET["s1"];
+        $pz["sort2"] = $_GET["s2"];
+        $pz["sep"]     = $_GET["sp"];   
+    }
+        $_GET["su"] = $pz["stat"];
+//        $_GET["v"] = $pz["va"];
+        $_GET["p"] = $pz["pgid"];
+        $_GET["b"] = $pz["bind"];
+        $_GET["sp"] = $pz["sep"];
+        $_GET["s1"] = $pz["sort1"];
+        $_GET["s2"] = $pz["sort2"];
+        $_GET["z"] = $zeil;
+        $_GET['i'] = $pid;
+
+    if ($search && $_GET['s'] != 2)
+    {    
+        echo "<span class='sc'>";
+        echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/pz_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
+        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"RAG GMV\" class=\"sc\">neuer Bericht Projekte - Details</a>\n";    
+        echo "</span>";
+    }
+    echo "<div align='center'>\n";
+    echo "<p><b>Bericht Projekte - Details</b></p>\n";
+    echo "</div>\n";
+    
+    if (!$search)
+    {
+    ?>
+        <div align="center">
+        <p>Bitte Kriterien f&uuml;r die Suche w&auml;hlen</p>
+        <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_proj" target="_self">	
+        <table width="50%" border="0" cellspacing="3" cellpadding="3">
+            <tr>
+                <td>Status</td>
+                <td>
+                    <select name="pz[stat]" size="1">
+                    <?php 
+                        if ($pz["stat"] == -1) $select = " selected = 'selected'"; else $select = "";
+                        echo "<option $select value=\"-1\"></option>\n";
+                        $sql = "SELECT proz_stat_ID, proz_stat_bez FROM Proz_Status ORDER BY 1";
+                        if ($result = $dbc->queryObjectArray($sql))
+                        {
+                            foreach ($result as $row)
+                            {
+                                $select = ($row->proz_stat_ID == $pz['stat'])? " selected = 'selected'" : "";
+        					   echo "<option$select value=\"$row->proz_stat_ID\">$row->proz_stat_bez</option>\n";
+                            }
+                        }
+                    ?>
+                    </select>
+                </td>
+            </tr>
+<!--            <tr><td>Verantwortlicher</td><td><input type="text" name="pz[va]" value="<?php echo $pz['va']; ?>" /></td></tr> -->
+            <tr>
+                <td>Produktgruppe</td>
+                <td>
+                    <select name="pz[pgid]" size="1">
+            <?php
+                // Recht Produktgruppe beruecksichtigen
+                if (is_array($_SESSION["prodg"]))
+                {
+                        foreach ($_SESSION["prodg"] as $val)
+                            $listg .= ",'" .$val . "'";
+                        $listg = substr($listg,1);
+                        echo "prodg = $listg<br />";
+                        $sql = "SELECT prod_group_ID, prod_group_name FROM fhiiqm.Produkt_Gruppe WHERE prod_group_ID IN('$listg')";                
+                }
+                else
+                    $sql = "SELECT prod_group_ID, prod_group_name FROM fhiiqm.Produkt_Gruppe";  
+                if ($pz['pgid'] == -1) $select = " selected "; else $select = "";
+                echo "<option $select value=\"-1\"></option>\n";
+                if ($result = $dbc->queryObjectArray($sql))
+                {
+                    foreach ($result as $row)
+                    {
+                        if (strlen($row->prod_group_name) > 70) 
+                            $prod=str_replace(" ","&nbsp;",htmlentities(substr($row->prod_group_name,0,70))) ."..."; 
+                        else 
+                            $prod=str_replace(" ","&nbsp;",htmlentities($row->prod_group_name));
+                        if ($row->prod_group_ID == $pz['pgid'])
+    					   echo "<option $color selected value=\"$row->prod_group_ID\">$row->prod_group_ID - $prod</option>\n";
+    				    else
+    					   echo "<option $color value=\"$row->prod_group_ID\">$row->prod_group_ID - $prod</option>\n";
+                    }
+                }
+            echo "
+            </select>\n";
+            ?>
+                </td>
+            </tr>
+            <tr><td>Projekte separat?</td><td><input type="checkbox" name="pz[sep]" value="1" <?php if ($psep) echo "checked='checked'"; ?>/></td></tr>
+            <tr> 
+                  <td>Verkn&uuml;pfung</td>
+                  <td>UND&nbsp;&nbsp;&nbsp;
+                    <input type="radio" name="pz[bind]" value="AND" <?php if (isset($pz["bind"]) && $pz["bind"]=="AND") echo "checked='checked'"; else  echo "checked='checked'";?>>
+                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ODER&nbsp;&nbsp;&nbsp;
+                    <input type="radio" name="pz[bind]" value="OR" <?php if (isset($pz["bind"]) && $pz["bind"]=="OR") echo "checked='checked'"; ?>></td>
+            </tr>
+            <tr>
+                <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
+            <?php
+                $sort = array("-1"=>"","proz_bez"=>"Bezeichnung","verantw"=>"Verantwortlicher","proz_stat"=>"Status","prod_name"=>"Produkt");
+                for ($i=1; $i<3; $i++)
+                { 
+                  echo "$i.&nbsp;&nbsp;<select name='pz[sort$i]'>\n";
+                  foreach ($sort as $key=>$val)
+                  {
+                    $rsort = "sort" . $i;
+                    if ($pz[$rsort] == $val) $select= " selected"; else $select = "";
+                    echo "<option$select value='$key'>$val</option>\n";
+                  }
+                  echo "</select>&nbsp;&nbsp;&nbsp;&nbsp;\n";
+                } 
+                echo "</td></tr>\n";
+                echo "</td></tr>\n";
+        
+                $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
+                echo "<tr><td>Zeilen/Seite?</td><td><select name='pz[z]'>\n";
+                if (!$pz['z']) $pz['z'] = 9999;
+                foreach ($azeil as $key=>$val)
+                {
+                    if ($key == $pz['z']) $select = "selected"; else $select = "";
+                    echo "<option $select value='$key'>$val</option>\n";
+                }
+                echo "</select></td></tr>\n";
+        
+            ?>
+            <tr> 
+                <td>&nbsp;</td>
+                <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
+            </tr> 
+        </table>
+        </div>
+        </form>
+<?php        
+    }
+    else
+    {
+    	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+        include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");
+    
+    	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+        
+        $sql = "SELECT proz_ID,proz_bez,proz_bez_l,proz_start_pl,proz_end_pl,proz_kost_pl,proz_start,proz_end,proz_kosten,
+                    proz_ref_ID,proz_bem,persknr,verantw,persknr_a,auftragg,proz_stat_ID,proz_stat,proz_urg_ID,proz_urg_bez,
+                    produkt_ID,prod_name,prod_group_ID,proz_step_ID,proz_step,step_stat_ID,step_stat,step_bem 
+                FROM fhiiqm.v_projekt_report ";
+
+        $lim = " LIMIT $start,$zeil";
+        $where = "";
+        $krit = "";
+        $bind = $pz["bind"];
+        if ($pz["stat"] > "-1")
+        { 
+            $where .= " proz_stat_ID = ".$pz["stat"];
+            $stat = $dbc->querySingleItem("SELECT proz_stat_bez FROM Proz_Status WHERE proz_stat_ID =".$pz["stat"]);
+            $krit = " [Projektstatus = '$stat'] ";
+        }    
+        if ($pz["pgid"] > "-1")
+        { 
+            if ($where) $bd = $bind; else $bd = "";
+            $where .= " $bd prod_group_ID = ".$pz["pgid"];
+            $prodg = $dbc->querySingleItem("SELECT prod_group_name FROM fhiiqm.Produkt_Gruppe WHERE prod_group_ID =".$pz["pgid"]);
+            $krit .= $bd." [Produktgruppe = '$prodg'] ";
+        }    
+/*        if ($pz["va"])
+        { 
+            if ($where) $bd = $bind; else $bd = "";
+            $where .= " $bd verantw LIKE '".$pz["va"] . "%' ";
+            $krit .= $bd . " [Verantwortlicher wie '".$pz["va"]."*'] ";
+        }       */ 
+        if ($pid)
+        {
+            if ($where) $bd = $bind; else $bd = "";
+            $where .= " $bd proz_ID = $pid";
+        }   
+        if ($pz["sort1"]>"-1" || $pz["sort2"]>"-1")
+        {
+            if ($pz["sort1"]>"-1") $ord  = " ORDER BY " . $pz["sort1"];
+            if ($pz["sort2"]>"-1") $ord .= ",".$pz["sort2"];
+            $ord .= ",proz_bez,proz_ID,step_sort ";
+        }
+        else $ord = " ORDER BY proz_bez,proz_ID,step_sort";
+        if ($where) $where = " WHERE $where";
+        
+        $sql .= $where . $ord .$lim;
+//echo "sql = $sql<br />\n";
+        $result = $dbc -> queryObjectArray($sql);
+
+        echo "<div align='center'>\n";
+
+        if ($krit) echo "<p>Projekte f&uuml;r $krit</p>"; else echo "<p>&nbsp;</p>";
+        
+        if ($result)
+        {
+            $sql = "SELECT COUNT(*) FROM v_projekt_report $where"; 
+            $ianz = $dbc -> querySingleItem($sql);
+    		$bg1 = "#F8F8F8";
+    		$bg2 = "#DEDFE1";
+    		$bg = "#FFFFFF";
+
+            echo "<table border='1' cellspacing='0' cellpadding='2' width='99%'>\n";
+            // Listenkopf
+            echo "<tr bgcolor='#68ACBF'>";
+            echo "<th width='11%'>Projekt</th>";
+            echo "<th width='11%'>Beschreibung</th>";
+            echo "<th width='7%'>zu Produkt</th>";
+            echo "<th width='7%'>Verantwortlicher</th>";
+            echo "<th width='7%'>Auftraggeber</th>";
+            echo "<th width='7%'>Status</th>";
+            echo "<th width='5%'>Wichtigkeit</th>";
+            echo "<th width='5%'>Plan Start</th>";
+            echo "<th width='5%'>Plan Ende</th>";
+            echo "<th width='6%'>Plan Kosten(&euro;)</th>";
+            echo "<th width='5%'>Ist Start</th>";
+            echo "<th width='5%'>Ist Ende</th>";
+            echo "<th width='6%'>Ist Kosten(&euro;)</th>";
+            echo "<th>Bemerkung</th></tr>\n";
+            echo "<tr bgcolor='#68ACBF'>";
+            echo "<th colspan='2'>&nbsp;</th>";
+            echo "<th colspan='3'><i>Schritt</i></th>";
+            echo "<th><i>Status</i></th>";
+            echo "<th colspan='8'><i>Bemerkung</i></th></tr>\n";
+            foreach ($result as $row)
+            {
+                foreach ($row as &$val) if (is_null($val) || $val <=' ') $val = "&nbsp;";
+                if ($vproz != $row->proz_ID)
+                {
+                    if ($psep)
+                    {
+                        if ($begin)
+                        {
+                            echo "</table>\n";
+                            echo "<p style=\"page-break-after:always\">&nbsp;</p>\n";
+                            echo "<p><b>Bericht Projekte</b></p>\n";
+                            if ($krit)echo "<p>Projekte f&uuml;r $krit</p>"; else echo "<p>&nbsp;</p>";
+                            echo "<table border='1' cellspacing='0' cellpadding='2' width='99%'>\n";
+                            // Listenkopf
+                            echo "<tr bgcolor='#68ACBF'>";
+                            echo "<th width='11%'>Projekt</th>";
+                            echo "<th width='11%'>Beschreibung</th>";
+                            echo "<th width='7%'>zu Produkt</th>";
+                            echo "<th width='7%'>Verantwortlicher</th>";
+                            echo "<th width='7%'>Auftraggeber</th>";
+                            echo "<th width='7%'>Status</th>";
+                            echo "<th width='5%'>Wichtigkeit</th>";
+                            echo "<th width='5%'>Plan Start</th>";
+                            echo "<th width='5%'>Plan Ende</th>";
+                            echo "<th width='6%'>Plan Kosten(&euro;)</th>";
+                            echo "<th width='5%'>Ist Start</th>";
+                            echo "<th width='5%'>Ist Ende</th>";
+                            echo "<th width='6%'>Ist Kosten(&euro;)</th>";
+                            echo "<th>Bemerkung</th></tr>\n";
+                            echo "<tr bgcolor='#68ACBF'>";
+                            echo "<th colspan='2'>&nbsp;</th>";
+                            echo "<th colspan='3'><i>Schritt</i></th>";
+                            echo "<th><i>Status</i></th>";
+                            echo "<th colspan='8'><i>Bemerkung</i></th></tr>\n";
+                        }
+                        
+                    }
+                    
+        			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                    echo "<tr bgcolor='" . $bg . "' background='../img/linelightblue.gif'>";
+                    echo "<td>$row->proz_bez</td>";
+                    echo "<td>$row->proz_bez_l</td>";
+                    echo "<td>$row->prod_name</td>";
+                    echo "<td>$row->verantw</td>";
+                    echo "<td>$row->auftragg</td>";
+                    echo "<td>$row->proz_stat</td>";
+                    echo "<td>$row->proz_urg_bez</td>";
+                    if ($row->proz_start_pl>"&nbsp;")
+                    {
+                        $dat = new DateTime($row->proz_start_pl);    
+                        echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
+                    }
+                    else  echo "<td>&nbsp;</td>";       
+                    if ($row->proz_end_pl>"&nbsp;")
+                    {
+                        $dat = new DateTime($row->proz_end_pl);    
+                        echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
+                    }
+                    else  echo "<td>&nbsp;</td>";
+                    if ($row->proz_kost_pl>"&nbsp;") echo "<td class='right'>".number_format($row->proz_kost_pl,2,",","."); else echo "<td>&nbsp;</td>";        
+                    if ($row->proz_start>"&nbsp;")
+                    {
+                        $dat = new DateTime($row->proz_start);    
+                        echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
+                    }
+                    else  echo "<td>&nbsp;</td>";       
+                    if ($row->proz_end>"&nbsp;")
+                    {
+                        $dat = new DateTime($row->proz_end);    
+                        echo "<td class=\"left\">" . $dat->format('d.m.Y')."</td>";
+                    }
+                    else  echo "<td>&nbsp;</td>";
+                    if ($row->proz_kosten>"&nbsp;") echo "<td class='right'>".number_format($row->proz_kosten,2,",","."); else echo "<td>&nbsp;</td>";       
+                    echo "<td>$row->proz_bem</td></tr>\n";
+                    // betroffenen Arbeitsgruppen
+                    $rag = array();
+                    $sqlag = "SELECT rag_bez FROM Proz_RaumArbGruppe p 
+                                LEFT OUTER JOIN RaumArb_Gruppe r ON p.rag_ID=r.rag_ID WHERE p.proz_ID = ".$row->proz_ID . " ORDER BY 1";
+                    $rrag = $dbc -> queryObjectArray($sqlag);
+                    foreach ($rrag as $ro)
+                        $rag[] = $ro->rag_bez;
+                    if (is_array($rag) && count($rag)>0)
+                    {
+                        $srag = implode(" | ", $rag);
+                        echo "<tr bgcolor='" . $bg . "' background='../img/linelightblue.gif'><td>&nbsp;</td><td>betroffene Arbeitsgruppen:</td>";
+                        echo "<td colspan='12'>$srag</td></tr>\n";
+                    } 
+                    echo "<tr bgcolor='" . $bg . "'>";
+                    echo "<td colspan='2'>&nbsp;</td>";
+                    echo "<td colspan='3'><i>$row->proz_step</i></td>";
+                    echo "<td><i>$row->step_stat</i></td>";
+                    echo "<td colspan='8'><i>$row->step_bem</i></td></tr>\n";
+                    
+           
+                }
+                if ($vproz == $row->proz_ID && $vstep != $row->proz_step_ID)
+                {
+                    echo "<tr bgcolor='" . $bg . "'>";
+                    echo "<td colspan='2'>&nbsp;</td>";
+                    echo "<td colspan='3'><i>$row->proz_step</i></td>";
+                    echo "<td><i>$row->step_stat</i></td>";
+                    echo "<td colspan='8'><i>$row->step_bem</i></td></tr>\n";
+                }
+                $vproz = $row->proz_ID;
+                $vstep = $row->proz_step_ID;
+                $begin = 1;
+            }
+            echo "</table>\n";
+            echo "<p></p><table width=90%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
+                <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
+            echo "</div>\n";
+            echo "<br />&nbsp;&nbsp;&nbsp;";
+    
+            if ($search != 2) // Aufruf aus fhiiqm
+            {    
+                // Parameter aus $_GET fuer weitere Seiten
+                $_GET["s"] = 1; // bewirkt weitere Suche
+                foreach ($_GET as $key=>$val)
+                {
+                    if ($key != "st") $liste .= "&" . $key ."=".$val;
+                }    
+                // Links auf andere Seiten generieren
+                liste_links($start,$zeil,$ianz,$liste);
+                echo "<br />&nbsp;&nbsp;&nbsp;";
+            }
+        }
+        else
+        {
+            echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
+            echo "</div>\n";
+            echo "<br />&nbsp;&nbsp;&nbsp;";
+        }
+
+        if ($search != 2)
+        {    
+            echo "<span class='sc'>";
+            echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/pz_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
+            echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Projekt\" class=\"sc\">neuer Bericht Projekte - Details</a>\n";    
+            echo "</span>";
+        }
+        else
+            echo "<a href='javascript:history.back();' onMouseOver=\"{window.status='Zur&uuml;ck'; return true;}\">&laquo; Zur&uuml;ck</a>";
+    }
+?>
+
+</body>
 </html>    
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/report/raum_info_as1_report.php	Fri Dec 20 15:19:32 2013 +0100
@@ -0,0 +1,351 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 10/2013
+ *
+ * Report Labor Info(portrait)
+ * $_GET['s']=2 - Aufruf aus adm-fhi-Seite ohne Anmeldung
+ * 
+ */
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    if (!isset($_GET['s']) || $_GET['s'] != 2 )
+    {
+        session_start();
+        if (! isset($_SESSION["userid"]))
+        { 
+            include_once ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");	
+            login($_SERVER["PHP_SELF"]);
+            exit;
+        }
+        
+        if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("ddr",$_SESSION["recht"]) && !in_array("dde",$_SESSION["recht"]) && 
+            !in_array("rr",$_SESSION["recht"]) && !in_array("re",$_SESSION["recht"])))
+        {
+            header("Location: start.php");
+            exit;
+        }
+    }        
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+    
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
+   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
+	<title>Report Labor Info</title>
+</head>
+
+<body>
+<?php
+    echo "&nbsp;";  
+    if (!isset($_GET['s']) || $_GET['s'] != 2 )
+    {
+        echo "<div class=\"float-br smaller sc\" valign='top'>";
+        echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+        echo "&nbsp;&nbsp;&nbsp;<a href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+        echo "<div class=\"float-r sc\"><img src=\"/fhiiqm/img/house.png\" border=\"0\" alt=\"Raum\" title=\"Raum\"/></div>\n";
+    }
+
+    $rag    = $_POST["rag"];    // Parameter aus Form
+    $search = $_POST["search"];
+    if (!$search) $search =  $_GET["s"];
+
+    $zeil = $rag["z"];
+    if (!$zeil) $zeil = $_GET["z"];
+    if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
+    $start = $_GET["st"];   // Start bei DS $start+1
+    if (!$start) $start=0;
+    
+
+    if (!is_array($rag))
+    {
+        $rag["geb"]     = $_GET["g"];
+        $rag["rnum"]   = $_GET["r"];
+        $rag["rtyp"]   = $_GET["t"];
+        $rag["bind"]    = $_GET["b"];
+        $rag["sort1"]   = $_GET["s1"];
+    }
+/*
+    $_GET["g"] = $rag["geb"];
+    $_GET["r"] = $rag["rnum"];
+    $_GET["t"] = $rag["rtyp"];
+    $_GET["b"] = $rag["bind"];
+    $_GET["s1"] = $rag["sort1"];
+    $_GET["z"]  = $zeil;
+*/   
+    if ($search && $_GET['s'] != 2)
+    {    
+        echo "<span class='sc'>";
+        echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/raum_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
+        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Report Labor Info\" class='sc'>neuer Bericht Raum Information AS</a>\n";    
+        echo "</span>";
+    }
+    echo "<div align='center'>\n";
+    echo "<p class='sc'><b>Report Raum Informationen Arbeitssicherheit</b></p>\n";
+    echo "</div>\n";
+    
+
+    if (!$search)
+    {
+?>
+        <div align="center">
+        <p>Bitte Kriterien f&uuml;r die Suche w&auml;hlen</p>
+        <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_raum" target="_self">	
+        <table width="50%" border="0" cellspacing="3" cellpadding="3">
+            <tr>
+                <td>Haus</td>
+                <td>
+                    <select name="rag[geb]" size="1" onchange="this.form.submit();">
+                    <?php 
+                        if ($rag["geb"] == "") $select = " selected "; else $select = "";
+                        echo "<option $select value=\"\"></option>\n";
+                        $sql = "SELECT geb_ID, geb_name FROM Haus ORDER BY 1";
+                        if ($result = $dbc->queryObjectArray($sql))
+                        {
+                            foreach ($result as $row)
+                            {
+                                if ($row->geb_ID == $rag['geb'])
+            					   echo "<option selected value=\"$row->geb_ID\">$row->geb_ID - $row->geb_name</option>\n";
+            				    else
+            					   echo "<option value=\"$row->geb_ID\">$row->geb_ID - $row->geb_name</option>\n";
+                            }
+                        }
+                    ?>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>Raum-Nummer</td>
+                <td><select name="rag[rnum]">
+                    <?php 
+                        if ($rag["rnum"] == "0") $select = " selected "; else $select = "";
+                        echo "<option $select value=\"0\"></option>\n";
+                        if (isset($rag["geb"]) && $rag["geb"] > "") $where = " WHERE geb_ID = '".$rag["geb"]."'"; else $where = "";
+                        echo "Gebaeude: ".$rag["geb"]."<br />\n";
+                        $sql = "SELECT geb_ID, raum_ID,raum_nr,raum_name FROM fhiiqm.Raum $where ORDER BY 1,3";
+                        if ($result = $dbc->queryObjectArray($sql))
+                        {
+                            foreach ($result as $row)
+                            {
+                                if ($row->raum_ID == $rag['rnum'])
+            					   echo "<option selected value=\"$row->raum_ID\">$row->geb_ID - $row->raum_nr, $row->raum_name</option>\n";
+            				    else
+            					   echo "<option value=\"$row->raum_ID\">$row->geb_ID - $row->raum_nr, $row->raum_name</option>\n";
+                            }
+                        }
+                    ?>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>Raumtyp</td>
+                <td><select name="rag[rtyp]">
+                <?php 
+                    if ($rag["rtyp"] == "") $select = " selected "; else $select = "";
+                    echo "<option $select value=\"\"></option>\n";
+                    $sql = "SELECT raumtyp_ID,raumtyp_bez FROM fhiiqm.Raum_Typ WHERE raumtyp_ID IN ('LA', 'LC', 'T', 'WE') ORDER BY 1";
+                    if ($result = $dbc->queryObjectArray($sql))
+                    {
+                        foreach ($result as $row)
+                        {
+                            if ($row->raumtyp_ID == $rag['rtyp'])
+        					   echo "<option selected value=\"$row->raumtyp_ID\">$row->raumtyp_ID - $row->raumtyp_bez</option>\n";
+        				    else
+        					   echo "<option value=\"$row->raumtyp_ID\">$row->raumtyp_ID - $row->raumtyp_bez</option>\n";
+                        }
+                    }
+                ?>
+                </select></td>
+            </tr>
+            <tr> 
+                  <td>Verkn&uuml;pfung</td>
+                  <td>UND&nbsp;&nbsp;&nbsp;
+                    <input type="radio" name="rag[bind]" value="AND" <?php if (isset($rag["bind"]) && $rag["bind"]=="AND") echo "checked"; else  echo "checked";?>>
+                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ODER&nbsp;&nbsp;&nbsp;
+                    <input type="radio" name="rag[bind]" value="OR" <?php if (isset($rag["bind"]) && $rag["bind"]=="OR") echo "checked"; ?>></td>
+            </tr>
+            <tr>
+                <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
+            <?php
+                $sort = array(""=>"","1"=>"Geb&auml;ude, Raum-Nr.","2"=>"Raum-Nr., Geb&auml;ude","5"=>"Raum-Typ, Geb&auml;ude, Raum-Nr.");
+                for ($i=1; $i<2; $i++)
+                { 
+                  echo "<select name='rag[sort$i]'>\n";
+                  foreach ($sort as $key=>$val)
+                  {
+                    $rsort = "sort" . $i;
+                    if ($rag[$rsort] == $val) $select= " selected"; else $select = "";
+                    echo "<option$select value='$key'>$val</option>\n";
+                  }
+                  echo "</select>&nbsp;&nbsp;&nbsp;&nbsp;\n";
+                } 
+                echo "</td></tr>\n";
+/*        
+                $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
+                echo "<tr><td>Zeilen/Seite?</td><td><select name='rag[z]'>\n";
+                if (!$rag['z']) $rag['z'] = 9999;
+                foreach ($azeil as $key=>$val)
+                {
+                    if ($key == $rag['z']) $select = "selected"; else $select = "";
+                    echo "<option $select value='$key'>$val</option>\n";
+                }
+                echo "</select></td></tr>\n";
+*/        
+            ?>
+            <tr> 
+                <td>&nbsp;</td>
+                <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
+            </tr> 
+        </table>
+        </div>
+        </form>
+<?php
+    }
+    else
+    {
+        echo "<div align='center'>\n";
+        
+        if ($rag["geb"]>"!") $krit = " [Geb&auml;ude = '" . $rag["geb"] ."']";
+        if ($krit) $bd = " ".$rag["bind"]; else $bd = "";
+        if ($rag["rnum"])
+        { 
+            $rnr = $dbc -> querySingleItem("SELECT raum_nr FROM Raum WHERE raum_ID = ". $rag["rnum"]);    
+            $krit .= $bd. " [Raum-Nr. = '$rnr']";
+        }
+        $bd = ($krit)? (" ".$rag["bind"]) : " ";
+        if ($rag["rtyp"]) $krit .= $bd . " [Raumtyp = '".$rag["rtyp"]."']";
+        
+        $sql = "CALL raum_vma_tel_las_gefbgr_report('".$rag["sort1"]."','".$rag["bind"]."','".$rag["geb"]."','".$rag["rnum"]."','".$rag["rtyp"]."',$start,$zeil,@anz)";
+        // mit gefaehrdungsbezeichnung und Gruppenbezeichnung    
+        $result = $dbc -> queryObjectArray($sql);
+        if ($result)
+        {
+//            print_r ($result);   
+            echo "<p class='sc'>$krit</p>";
+            $begin = 0;
+            foreach ($result as $row)
+            {
+    		$bg1 = "#F8F8F8";
+    		$bg2 = "#DEDFE1";
+    		$bg = "#FFFFFF";
+                if ($begin) echo "<p style=\"page-break-before:always\">&nbsp;</p>";
+                echo "<h2>Raum Information</h2>\n";
+                echo "<table width='90%' border='1' frame='box' rules='rows' cellspacing='2' cellpadding='5'>\n";
+                echo "<tr><td class='big' width='40%'><b>Geb&auml;ude: $row->geb_ID</b></td><td class='big' width='60%'><b>Raum-Nr.: $row->raum_nr
+                        </b></td></tr>\n";
+                echo "<tr><td class='big'><b>Raumbezeichnung: </b></td><td class='big'><b>$row->raum_name</b></td></tr>\n";
+                echo "<tr><td class='big'><b>Arbeitsgruppe(n):</b></td><td class='big'>".str_replace(";","<br />",$row->ag)."</td></tr>\n";
+    			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                if ($row->las_anz || $row->al_anz)
+                {
+                    echo "<tr bgcolor='$bg'><td class='big'><b>Gefährdungen Ger&auml;te:</b></td><td class='big'>";
+                    if ($row->las_anz)
+                        echo "Laser (Klassen 3A, 3B, 4), Anzahl: ".$row->las_anz. "<br />";
+                    if ($row->al_anz)
+                        echo "Anlagen: ".$row->al_anz. "<br />";
+                    echo "</td></tr>\n";
+                }    
+                else
+                    echo "<tr bgcolor='$bg'><td class='big' colspan='2'><b>Gefährdungen Ger&auml;te:</b></td></tr>\n";
+    			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                echo "<tr bgcolor='$bg'><td class='big' colspan='2'><b>Allgemeine Gefährdungen:</b></td></tr>";
+                if (isset($row->gef) && $row->gef)
+                {
+                    $first = true;
+                    $vgbez = "";
+                    $agef = explode(";",$row->gef);
+                    foreach ($agef as $gef)
+                    {
+                        list($gf,$gfb,$gbez) = explode("|",$gef);
+                        if ($gbez != $vgbez) 
+                        {    
+                            if (!$first) echo "</td></tr>";
+                            if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                            echo "<tr bgcolor='$bg'><td class='big valignb'>&nbsp;&nbsp;&nbsp;$gbez</td><td class='big valignb'>";
+                            $first = true;
+                            $apbez = array();
+                        }
+                        $gid = urlencode(trim($gf));
+                        echo "<img name='gefahr' width='30px' src=" . "'/fhiiqm/inc/show_img_gef.inc.php?gid=$gid' alt='$gf' title='$gf'>&nbsp;&nbsp;&nbsp;";
+                        echo "$gfb<br />";
+                        $vgbez = $gbez;
+                        $first = false;
+                    } 
+                }
+                if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                echo "<tr bgcolor='$bg'><td class='big' colspan='2'><b>Bei Störungen zu benachrichtigen:</b></td></tr>\n";
+                if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                echo "<tr bgcolor='$bg'><td class='big' colspan='2'><b>&nbsp;&nbsp;tagsüber</b></td></tr>\n";
+                if ($row->vmatel>"!")
+                {
+                    $sp = "&nbsp;&nbsp;&nbsp;";
+                    if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;                    
+                    echo "<tr bgcolor='$bg'><td class='big'>".$sp."Notdienst</td><td class='big'>030 8413 - 9</td></tr>\n";                    $vpnr = 0;                    
+                    $mat = explode(";",$row->vmatel);   //persknr:MA|tel
+                    $first = true;
+                    foreach ($mat as $ma)
+                    {
+                        $pnr = substr($ma,0,strpos($ma,":"));
+                        $tel = substr($ma,strpos($ma,"|")+1);
+                        $nam = substr($ma,strpos($ma,":")+1,strlen($ma)-strlen($pnr)-strlen($tel)-2);
+                        if ($pnr != $vpnr)
+                        {
+                            if (!$first) echo "</td></tr>\n";
+                            if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                            echo "<tr bgcolor='$bg'><td class='big'>$sp$nam</td><td class='big'>030 8413 - $tel";
+                        }
+                        else echo ", 030 8413 - $tel";
+                        $first = false;
+                        $vpnr = $pnr;
+                    }
+                    echo "</td></tr>\n";
+                }
+                else
+                { 
+                    if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                    echo "<tr bgcolor='$bg'><td class='big' colspan='2'>&nbsp;</td></tr>\n";
+                }
+                if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                echo "<tr bgcolor='$bg'><td class='big' colspan='2'><b>&nbsp;&nbsp;ausserhalb der Arbeitszeit / Wochenende</b></td></tr>\n";
+                if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                echo "<tr bgcolor='$bg'><td class='big'>&nbsp;&nbsp;&nbsp;zentraler Service</td><td class='big'>030 8413 - 4444</td></tr>\n";
+                if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                echo "<tr bgcolor='$bg'><td class='big'><b>Bemerkungen:</b></td><td class='big'>".nl2br($row->raum_bem)."</td></tr>\n";
+                if ($row->raum_feuerl)
+                {
+                    if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                    echo "<tr bgcolor='$bg'><td class='big'><b>Feuerl&ouml;scher im Raum:</b></td><td class='big'>$row->raum_feuerl</td></tr>\n";
+                }
+                echo "</table>\n";
+                $begin = 1;
+            }
+
+            echo "<p></p><table width=99%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
+                <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
+            
+        }
+        else echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
+        
+        echo "</div>\n";
+        if ($search != 2)
+        {    
+            echo "<span  class=\"sc\">";
+            echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/raum_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
+            echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Report Labor Info\" class='sc'>neuer Bericht Raum Information AS</a></span>\n";
+        }
+        else
+            echo "<a class='sc' href='javascript:history.back();' onMouseOver=\"{window.status='Zur&uuml;ck'; return true;}\">&laquo; Zur&uuml;ck</a>";
+    }
+
+?>
+
+</body>
+</html>
\ No newline at end of file
--- a/fhiiqm/report/raum_info_as_report.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/report/raum_info_as_report.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,349 +1,349 @@
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 05/2013
- *
- * Report Labor Info(portrait)
- * $_GET['s']=2 - Aufruf aus adm-fhi-Seite ohne Anmeldung
- * 
- */
-
-    error_reporting(E_ALL ^ E_NOTICE);
-    
-    if (!isset($_GET['s']) || $_GET['s'] != 2 )
-    {
-        session_start();
-        if (! isset($_SESSION["userid"]))
-        { 
-            include_once ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");	
-            login($_SERVER["PHP_SELF"]);
-            exit;
-        }
-        
-        if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("ddr",$_SESSION["recht"]) && !in_array("dde",$_SESSION["recht"]) && 
-            !in_array("rr",$_SESSION["recht"]) && !in_array("re",$_SESSION["recht"])))
-        {
-            header("Location: start.php");
-            exit;
-        }
-    }        
-	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
-	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
-    
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
-   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
-	<title>Report Labor Info</title>
-</head>
-
-<body>
-<?php
-    echo "&nbsp;";  
-    if (!isset($_GET['s']) || $_GET['s'] != 2 )
-    {
-        echo "<div class=\"float-br smaller sc\" valign='top'>";
-        echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
-        echo "&nbsp;&nbsp;&nbsp;<a href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
-        echo "<div class=\"float-r sc\"><img src=\"/fhiiqm/img/house.png\" border=\"0\" alt=\"Raum\" title=\"Raum\"/></div>\n";
-    }
-
-    $rag    = $_POST["rag"];    // Parameter aus Form
-    $search = $_POST["search"];
-    if (!$search) $search =  $_GET["s"];
-
-    $zeil = $rag["z"];
-    if (!$zeil) $zeil = $_GET["z"];
-    if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
-    $start = $_GET["st"];   // Start bei DS $start+1
-    if (!$start) $start=0;
-    
-
-    if (!is_array($rag))
-    {
-        $rag["geb"]     = $_GET["g"];
-        $rag["rnum"]   = $_GET["r"];
-        $rag["rtyp"]   = $_GET["t"];
-        $rag["bind"]    = $_GET["b"];
-        $rag["sort1"]   = $_GET["s1"];
-    }
-/*
-    $_GET["g"] = $rag["geb"];
-    $_GET["r"] = $rag["rnum"];
-    $_GET["t"] = $rag["rtyp"];
-    $_GET["b"] = $rag["bind"];
-    $_GET["s1"] = $rag["sort1"];
-    $_GET["z"]  = $zeil;
-*/   
-    if ($search && $_GET['s'] != 2)
-    {    
-        echo "<span class='sc'>";
-        echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/raum_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
-        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Report Labor Info\" class='sc'>neuer Bericht Raum Information AS</a>\n";    
-        echo "</span>";
-    }
-    echo "<div align='center'>\n";
-    echo "<p class='sc'><b>Report Raum Informationen Arbeitssicherheit</b></p>\n";
-    echo "</div>\n";
-    
-
-    if (!$search)
-    {
-?>
-        <div align="center">
-        <p>Bitte Kriterien f&uuml;r die Suche w&auml;hlen</p>
-        <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_raum" target="_self">	
-        <table width="50%" border="0" cellspacing="3" cellpadding="3">
-            <tr>
-                <td>Haus</td>
-                <td>
-                    <select name="rag[geb]" size="1" onchange="this.form.submit();">
-                    <?php 
-                        if ($rag["geb"] == "") $select = " selected "; else $select = "";
-                        echo "<option $select value=\"\"></option>\n";
-                        $sql = "SELECT geb_ID, geb_name FROM Haus ORDER BY 1";
-                        if ($result = $dbc->queryObjectArray($sql))
-                        {
-                            foreach ($result as $row)
-                            {
-                                if ($row->geb_ID == $rag['geb'])
-            					   echo "<option selected value=\"$row->geb_ID\">$row->geb_ID - $row->geb_name</option>\n";
-            				    else
-            					   echo "<option value=\"$row->geb_ID\">$row->geb_ID - $row->geb_name</option>\n";
-                            }
-                        }
-                    ?>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>Raum-Nummer</td>
-                <td><select name="rag[rnum]">
-                    <?php 
-                        if ($rag["rnum"] == "0") $select = " selected "; else $select = "";
-                        echo "<option $select value=\"0\"></option>\n";
-                        if (isset($rag["geb"]) && $rag["geb"] > "") $where = " WHERE geb_ID = '".$rag["geb"]."'"; else $where = "";
-                        echo "Gebaeude: ".$rag["geb"]."<br />\n";
-                        $sql = "SELECT geb_ID, raum_ID,raum_nr,raum_name FROM fhiiqm.Raum $where ORDER BY 1,3";
-                        if ($result = $dbc->queryObjectArray($sql))
-                        {
-                            foreach ($result as $row)
-                            {
-                                if ($row->raum_ID == $rag['rnum'])
-            					   echo "<option selected value=\"$row->raum_ID\">$row->geb_ID - $row->raum_nr, $row->raum_name</option>\n";
-            				    else
-            					   echo "<option value=\"$row->raum_ID\">$row->geb_ID - $row->raum_nr, $row->raum_name</option>\n";
-                            }
-                        }
-                    ?>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>Raumtyp</td>
-                <td><select name="rag[rtyp]">
-                <?php 
-                    if ($rag["rtyp"] == "") $select = " selected "; else $select = "";
-                    echo "<option $select value=\"\"></option>\n";
-                    $sql = "SELECT raumtyp_ID,raumtyp_bez FROM fhiiqm.Raum_Typ WHERE raumtyp_ID IN ('LA', 'LC', 'T', 'WE') ORDER BY 1";
-                    if ($result = $dbc->queryObjectArray($sql))
-                    {
-                        foreach ($result as $row)
-                        {
-                            if ($row->raumtyp_ID == $rag['rtyp'])
-        					   echo "<option selected value=\"$row->raumtyp_ID\">$row->raumtyp_ID - $row->raumtyp_bez</option>\n";
-        				    else
-        					   echo "<option value=\"$row->raumtyp_ID\">$row->raumtyp_ID - $row->raumtyp_bez</option>\n";
-                        }
-                    }
-                ?>
-                </select></td>
-            </tr>
-            <tr> 
-                  <td>Verkn&uuml;pfung</td>
-                  <td>UND&nbsp;&nbsp;&nbsp;
-                    <input type="radio" name="rag[bind]" value="AND" <?php if (isset($rag["bind"]) && $rag["bind"]=="AND") echo "checked"; else  echo "checked";?>>
-                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ODER&nbsp;&nbsp;&nbsp;
-                    <input type="radio" name="rag[bind]" value="OR" <?php if (isset($rag["bind"]) && $rag["bind"]=="OR") echo "checked"; ?>></td>
-            </tr>
-            <tr>
-                <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
-            <?php
-                $sort = array(""=>"","1"=>"Geb&auml;ude, Raum-Nr.","2"=>"Raum-Nr., Geb&auml;ude","5"=>"Raum-Typ, Geb&auml;ude, Raum-Nr.");
-                for ($i=1; $i<2; $i++)
-                { 
-                  echo "<select name='rag[sort$i]'>\n";
-                  foreach ($sort as $key=>$val)
-                  {
-                    $rsort = "sort" . $i;
-                    if ($rag[$rsort] == $val) $select= " selected"; else $select = "";
-                    echo "<option$select value='$key'>$val</option>\n";
-                  }
-                  echo "</select>&nbsp;&nbsp;&nbsp;&nbsp;\n";
-                } 
-                echo "</td></tr>\n";
-/*        
-                $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
-                echo "<tr><td>Zeilen/Seite?</td><td><select name='rag[z]'>\n";
-                if (!$rag['z']) $rag['z'] = 9999;
-                foreach ($azeil as $key=>$val)
-                {
-                    if ($key == $rag['z']) $select = "selected"; else $select = "";
-                    echo "<option $select value='$key'>$val</option>\n";
-                }
-                echo "</select></td></tr>\n";
-*/        
-            ?>
-            <tr> 
-                <td>&nbsp;</td>
-                <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
-            </tr> 
-        </table>
-        </div>
-        </form>
-<?php
-    }
-    else
-    {
-        echo "<div align='center'>\n";
-        
-        if ($rag["geb"]>"!") $krit = " [Geb&auml;ude = '" . $rag["geb"] ."']";
-        if ($krit) $bd = " ".$rag["bind"]; else $bd = "";
-        if ($rag["rnum"])
-        { 
-            $rnr = $dbc -> querySingleItem("SELECT raum_nr FROM Raum WHERE raum_ID = ". $rag["rnum"]);    
-            $krit .= $bd. " [Raum-Nr. = '$rnr']";
-        }
-        $bd = ($krit)? (" ".$rag["bind"]) : " ";
-        if ($rag["rtyp"]) $krit .= $bd . " [Raumtyp = '".$rag["rtyp"]."']";
-        
-        $sql = "CALL raum_vma_tel_las_gefgr_report('".$rag["sort1"]."','".$rag["bind"]."','".$rag["geb"]."','".$rag["rnum"]."','".$rag["rtyp"]."',$start,$zeil,@anz)";
-
-        $result = $dbc -> queryObjectArray($sql);
-        if ($result)
-        {
-//            print_r ($result);   
-            echo "<p class='sc'>$krit</p>";
-            $begin = 0;
-            foreach ($result as $row)
-            {
-    		$bg1 = "#F8F8F8";
-    		$bg2 = "#DEDFE1";
-    		$bg = "#FFFFFF";
-                if ($begin) echo "<p style=\"page-break-before:always\">&nbsp;</p>";
-                echo "<h3>Raum Information</h3>\n";
-                echo "<table width='90%' border='1' frame='box' rules='rows' cellspacing='2' cellpadding='8'>\n";
-                echo "<tr><td width='45%'><b>Geb&auml;ude: $row->geb_ID</b></td><td width='55%'><b>Raum-Nr.: $row->raum_nr</b>
-                        &nbsp;&nbsp;&nbsp;$row->raum_name</td></tr>\n";
-                echo "<tr><td><b>Arbeitsgruppe(n):</b></td><td>".str_replace(";","<br />",$row->ag)."</td></tr>\n";
-    			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-                if ($row->las_anz || $row->al_anz)
-                {
-                    echo "<tr bgcolor='$bg'><td><b>Gefährdungen Ger&auml;te:</b></td><td>";
-                    if ($row->las_anz)
-                        echo "Laser (Klassen 3A, 3B, 4): ".$row->las_anz. "<br />";
-                    if ($row->al_anz)
-                        echo "Anlagen: ".$row->al_anz. "<br />";
-                    echo "</td></tr>\n";
-                }    
-                else
-                    echo "<tr bgcolor='$bg'><td colspan='2'><b>Gefährdungen Ger&auml;te:</b></td></tr>\n";
-    			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-                echo "<tr bgcolor='$bg'><td colspan='2'><b>Allgemeine Gefährdungen:</b></td></tr>";
-                if (isset($row->gef) && $row->gef)
-                {
-                    $first = true;
-                    $vgbez = "";
-                    $agef = explode(";",$row->gef);
-                    foreach ($agef as $gef)
-                    {
-                        list($gf,$gbez) = explode("|",$gef);
-                        if ($gbez != $vgbez) 
-                        {    
-                            if (!$first) echo "</td></tr>";
-                            if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-                            echo "<tr bgcolor='$bg'><td>&nbsp;&nbsp;&nbsp;$gbez</td><td>";
-                            $first = true;
-                            $apbez = array();
-                        }
-                        $sql = "SELECT gefahr_pic_bez FROM Gefahr WHERE gefahr_ID='" . $gf ."'";
-                    	$pbez = $dbc -> querySingleItem($sql);
-                        if (!in_array($pbez,$apbez))
-                        { 
-                            $apbez[] = $pbez;
-                            $gid = urlencode(trim($gf));
-                            echo "<img name='gefahr' width='30px' src=" . "'/fhiiqm/inc/show_img_gef.inc.php?gid=$gid' alt='$gf' title='$gf'>&nbsp;&nbsp;&nbsp;";
-                        }
-                        $vgbez = $gbez;
-                        $first = false;
-                    } 
-                }
-                if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-                echo "<tr bgcolor='$bg'><td colspan='2'><b>Bei Störungen zu benachrichtigen:</b></td></tr>\n";
-                if ($row->vmatel>"!")
-                {
-                    $vpnr = 0;                    
-                    $mat = explode(";",$row->vmatel);   //persknr:MA|tel
-                    $first = true;
-                    foreach ($mat as $ma)
-                    {
-                        $pnr = substr($ma,0,strpos($ma,":"));
-                        $tel = substr($ma,strpos($ma,"|")+1);
-                        $nam = substr($ma,strpos($ma,":")+1,strlen($ma)-strlen($pnr)-strlen($tel)-2);
-                        $sp = "&nbsp;&nbsp;&nbsp;";
-                        if ($pnr != $vpnr)
-                        {
-                            if (!$first) echo "</td></tr>\n";
-                            if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-                            echo "<tr bgcolor='$bg'><td>$sp$nam</td><td>Telefon: $tel";
-                        }
-                        else echo ", $tel";
-                        $first = false;
-                        $vpnr = $pnr;
-                    }
-                    echo "</td></tr>\n";
-                }
-                else
-                { 
-                    if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-                    echo "<tr bgcolor='$bg'><td colspan='2'>&nbsp;</td></tr>\n";
-                }
-                if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-                echo "<tr bgcolor='$bg'><td><b>Bemerkungen:</b></td><td>$row->raum_bem</td></tr>\n";
-                if ($row->raum_feuerl)
-                {
-                    if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
-                    echo "<tr bgcolor='$bg'><td><b>Feuerl&ouml;scher im Raum:</b></td><td>$row->raum_feuerl</td></tr>\n";
-                }
-                echo "</table>\n";
-                echo "<p>Innerbetrieblicher Notdienst:   Telefonzentrale: <b>9</b>,   nachts/Wochenende: <b>4444</b></p>\n";
-                $begin = 1;
-            }
-
-            echo "<p></p><table width=99%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
-                <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
-            
-        }
-        else echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
-        
-        echo "</div>\n";
-        if ($search != 2)
-        {    
-            echo "<span  class=\"sc\">";
-            echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/raum_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
-            echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Report Labor Info\" class='sc'>neuer Bericht Raum Information AS</a></span>\n";
-        }
-        else
-            echo "<a class='sc' href='javascript:history.back();' onMouseOver=\"{window.status='Zur&uuml;ck'; return true;}\">&laquo; Zur&uuml;ck</a>";
-    }
-
-?>
-
-</body>
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 05/2013
+ *
+ * Report Labor Info(portrait)
+ * $_GET['s']=2 - Aufruf aus adm-fhi-Seite ohne Anmeldung
+ * 
+ */
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    if (!isset($_GET['s']) || $_GET['s'] != 2 )
+    {
+        session_start();
+        if (! isset($_SESSION["userid"]))
+        { 
+            include_once ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/func_lib.inc.php");	
+            login($_SERVER["PHP_SELF"]);
+            exit;
+        }
+        
+        if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("ddr",$_SESSION["recht"]) && !in_array("dde",$_SESSION["recht"]) && 
+            !in_array("rr",$_SESSION["recht"]) && !in_array("re",$_SESSION["recht"])))
+        {
+            header("Location: start.php");
+            exit;
+        }
+    }        
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+    
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS"  media="screen"/> 
+   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS"  media="print"/> 
+	<title>Report Labor Info</title>
+</head>
+
+<body>
+<?php
+    echo "&nbsp;";  
+    if (!isset($_GET['s']) || $_GET['s'] != 2 )
+    {
+        echo "<div class=\"float-br smaller sc\" valign='top'>";
+        echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+        echo "&nbsp;&nbsp;&nbsp;<a href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+        echo "<div class=\"float-r sc\"><img src=\"/fhiiqm/img/house.png\" border=\"0\" alt=\"Raum\" title=\"Raum\"/></div>\n";
+    }
+
+    $rag    = $_POST["rag"];    // Parameter aus Form
+    $search = $_POST["search"];
+    if (!$search) $search =  $_GET["s"];
+
+    $zeil = $rag["z"];
+    if (!$zeil) $zeil = $_GET["z"];
+    if (!$zeil) $zeil = 9999; // Anzahl der gezeigten Zeilen
+    $start = $_GET["st"];   // Start bei DS $start+1
+    if (!$start) $start=0;
+    
+
+    if (!is_array($rag))
+    {
+        $rag["geb"]     = $_GET["g"];
+        $rag["rnum"]   = $_GET["r"];
+        $rag["rtyp"]   = $_GET["t"];
+        $rag["bind"]    = $_GET["b"];
+        $rag["sort1"]   = $_GET["s1"];
+    }
+/*
+    $_GET["g"] = $rag["geb"];
+    $_GET["r"] = $rag["rnum"];
+    $_GET["t"] = $rag["rtyp"];
+    $_GET["b"] = $rag["bind"];
+    $_GET["s1"] = $rag["sort1"];
+    $_GET["z"]  = $zeil;
+*/   
+    if ($search && $_GET['s'] != 2)
+    {    
+        echo "<span class='sc'>";
+        echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/raum_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
+        echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Report Labor Info\" class='sc'>neuer Bericht Raum Information AS</a>\n";    
+        echo "</span>";
+    }
+    echo "<div align='center'>\n";
+    echo "<p class='sc'><b>Report Raum Informationen Arbeitssicherheit</b></p>\n";
+    echo "</div>\n";
+    
+
+    if (!$search)
+    {
+?>
+        <div align="center">
+        <p>Bitte Kriterien f&uuml;r die Suche w&auml;hlen</p>
+        <form action="<?php $_SERVER['PHP_SELF'] ?>" method="post" enctype="application/x-www-form-urlencoded" name="form_raum" target="_self">	
+        <table width="50%" border="0" cellspacing="3" cellpadding="3">
+            <tr>
+                <td>Haus</td>
+                <td>
+                    <select name="rag[geb]" size="1" onchange="this.form.submit();">
+                    <?php 
+                        if ($rag["geb"] == "") $select = " selected "; else $select = "";
+                        echo "<option $select value=\"\"></option>\n";
+                        $sql = "SELECT geb_ID, geb_name FROM Haus ORDER BY 1";
+                        if ($result = $dbc->queryObjectArray($sql))
+                        {
+                            foreach ($result as $row)
+                            {
+                                if ($row->geb_ID == $rag['geb'])
+            					   echo "<option selected value=\"$row->geb_ID\">$row->geb_ID - $row->geb_name</option>\n";
+            				    else
+            					   echo "<option value=\"$row->geb_ID\">$row->geb_ID - $row->geb_name</option>\n";
+                            }
+                        }
+                    ?>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>Raum-Nummer</td>
+                <td><select name="rag[rnum]">
+                    <?php 
+                        if ($rag["rnum"] == "0") $select = " selected "; else $select = "";
+                        echo "<option $select value=\"0\"></option>\n";
+                        if (isset($rag["geb"]) && $rag["geb"] > "") $where = " WHERE geb_ID = '".$rag["geb"]."'"; else $where = "";
+                        echo "Gebaeude: ".$rag["geb"]."<br />\n";
+                        $sql = "SELECT geb_ID, raum_ID,raum_nr,raum_name FROM fhiiqm.Raum $where ORDER BY 1,3";
+                        if ($result = $dbc->queryObjectArray($sql))
+                        {
+                            foreach ($result as $row)
+                            {
+                                if ($row->raum_ID == $rag['rnum'])
+            					   echo "<option selected value=\"$row->raum_ID\">$row->geb_ID - $row->raum_nr, $row->raum_name</option>\n";
+            				    else
+            					   echo "<option value=\"$row->raum_ID\">$row->geb_ID - $row->raum_nr, $row->raum_name</option>\n";
+                            }
+                        }
+                    ?>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>Raumtyp</td>
+                <td><select name="rag[rtyp]">
+                <?php 
+                    if ($rag["rtyp"] == "") $select = " selected "; else $select = "";
+                    echo "<option $select value=\"\"></option>\n";
+                    $sql = "SELECT raumtyp_ID,raumtyp_bez FROM fhiiqm.Raum_Typ WHERE raumtyp_ID IN ('LA', 'LC', 'T', 'WE') ORDER BY 1";
+                    if ($result = $dbc->queryObjectArray($sql))
+                    {
+                        foreach ($result as $row)
+                        {
+                            if ($row->raumtyp_ID == $rag['rtyp'])
+        					   echo "<option selected value=\"$row->raumtyp_ID\">$row->raumtyp_ID - $row->raumtyp_bez</option>\n";
+        				    else
+        					   echo "<option value=\"$row->raumtyp_ID\">$row->raumtyp_ID - $row->raumtyp_bez</option>\n";
+                        }
+                    }
+                ?>
+                </select></td>
+            </tr>
+            <tr> 
+                  <td>Verkn&uuml;pfung</td>
+                  <td>UND&nbsp;&nbsp;&nbsp;
+                    <input type="radio" name="rag[bind]" value="AND" <?php if (isset($rag["bind"]) && $rag["bind"]=="AND") echo "checked"; else  echo "checked";?>>
+                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ODER&nbsp;&nbsp;&nbsp;
+                    <input type="radio" name="rag[bind]" value="OR" <?php if (isset($rag["bind"]) && $rag["bind"]=="OR") echo "checked"; ?>></td>
+            </tr>
+            <tr>
+                <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
+            <?php
+                $sort = array(""=>"","1"=>"Geb&auml;ude, Raum-Nr.","2"=>"Raum-Nr., Geb&auml;ude","5"=>"Raum-Typ, Geb&auml;ude, Raum-Nr.");
+                for ($i=1; $i<2; $i++)
+                { 
+                  echo "<select name='rag[sort$i]'>\n";
+                  foreach ($sort as $key=>$val)
+                  {
+                    $rsort = "sort" . $i;
+                    if ($rag[$rsort] == $val) $select= " selected"; else $select = "";
+                    echo "<option$select value='$key'>$val</option>\n";
+                  }
+                  echo "</select>&nbsp;&nbsp;&nbsp;&nbsp;\n";
+                } 
+                echo "</td></tr>\n";
+/*        
+                $azeil = array(10=>'10',20=>'20',25=>'25',50=>'50',100=>'100',9999=>'alle'); // Anzahl gezeigter rows
+                echo "<tr><td>Zeilen/Seite?</td><td><select name='rag[z]'>\n";
+                if (!$rag['z']) $rag['z'] = 9999;
+                foreach ($azeil as $key=>$val)
+                {
+                    if ($key == $rag['z']) $select = "selected"; else $select = "";
+                    echo "<option $select value='$key'>$val</option>\n";
+                }
+                echo "</select></td></tr>\n";
+*/        
+            ?>
+            <tr> 
+                <td>&nbsp;</td>
+                <td><input class="button" type="submit" name="search" value="Bericht erstellen"/></td>
+            </tr> 
+        </table>
+        </div>
+        </form>
+<?php
+    }
+    else
+    {
+        echo "<div align='center'>\n";
+        
+        if ($rag["geb"]>"!") $krit = " [Geb&auml;ude = '" . $rag["geb"] ."']";
+        if ($krit) $bd = " ".$rag["bind"]; else $bd = "";
+        if ($rag["rnum"])
+        { 
+            $rnr = $dbc -> querySingleItem("SELECT raum_nr FROM Raum WHERE raum_ID = ". $rag["rnum"]);    
+            $krit .= $bd. " [Raum-Nr. = '$rnr']";
+        }
+        $bd = ($krit)? (" ".$rag["bind"]) : " ";
+        if ($rag["rtyp"]) $krit .= $bd . " [Raumtyp = '".$rag["rtyp"]."']";
+        
+        $sql = "CALL raum_vma_tel_las_gefgr_report('".$rag["sort1"]."','".$rag["bind"]."','".$rag["geb"]."','".$rag["rnum"]."','".$rag["rtyp"]."',$start,$zeil,@anz)";
+
+        $result = $dbc -> queryObjectArray($sql);
+        if ($result)
+        {
+//            print_r ($result);   
+            echo "<p class='sc'>$krit</p>";
+            $begin = 0;
+            foreach ($result as $row)
+            {
+    		$bg1 = "#F8F8F8";
+    		$bg2 = "#DEDFE1";
+    		$bg = "#FFFFFF";
+                if ($begin) echo "<p style=\"page-break-before:always\">&nbsp;</p>";
+                echo "<h3>Raum Information</h3>\n";
+                echo "<table width='90%' border='1' frame='box' rules='rows' cellspacing='2' cellpadding='8'>\n";
+                echo "<tr><td width='45%'><b>Geb&auml;ude: $row->geb_ID</b></td><td width='55%'><b>Raum-Nr.: $row->raum_nr</b>
+                        &nbsp;&nbsp;&nbsp;$row->raum_name</td></tr>\n";
+                echo "<tr><td><b>Arbeitsgruppe(n):</b></td><td>".str_replace(";","<br />",$row->ag)."</td></tr>\n";
+    			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                if ($row->las_anz || $row->al_anz)
+                {
+                    echo "<tr bgcolor='$bg'><td><b>Gefährdungen Ger&auml;te:</b></td><td>";
+                    if ($row->las_anz)
+                        echo "Laser (Klassen 3A, 3B, 4): ".$row->las_anz. "<br />";
+                    if ($row->al_anz)
+                        echo "Anlagen: ".$row->al_anz. "<br />";
+                    echo "</td></tr>\n";
+                }    
+                else
+                    echo "<tr bgcolor='$bg'><td colspan='2'><b>Gefährdungen Ger&auml;te:</b></td></tr>\n";
+    			if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                echo "<tr bgcolor='$bg'><td colspan='2'><b>Allgemeine Gefährdungen:</b></td></tr>";
+                if (isset($row->gef) && $row->gef)
+                {
+                    $first = true;
+                    $vgbez = "";
+                    $agef = explode(";",$row->gef);
+                    foreach ($agef as $gef)
+                    {
+                        list($gf,$gbez) = explode("|",$gef);
+                        if ($gbez != $vgbez) 
+                        {    
+                            if (!$first) echo "</td></tr>";
+                            if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                            echo "<tr bgcolor='$bg'><td>&nbsp;&nbsp;&nbsp;$gbez</td><td>";
+                            $first = true;
+                            $apbez = array();
+                        }
+                        $sql = "SELECT gefahr_pic_bez FROM Gefahr WHERE gefahr_ID='" . $gf ."'";
+                    	$pbez = $dbc -> querySingleItem($sql);
+                        if ($pbez && !in_array($pbez,$apbez))
+                        { 
+                            $apbez[] = $pbez;
+                            $gid = urlencode(trim($gf));
+                            echo "<img name='gefahr' width='30px' src=" . "'/fhiiqm/inc/show_img_gef.inc.php?gid=$gid' alt='$gf' title='$gf'>&nbsp;&nbsp;&nbsp;";
+                        }
+                        $vgbez = $gbez;
+                        $first = false;
+                    } 
+                }
+                if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                echo "<tr bgcolor='$bg'><td colspan='2'><b>Bei Störungen zu benachrichtigen:</b></td></tr>\n";
+                if ($row->vmatel>"!")
+                {
+                    $vpnr = 0;                    
+                    $mat = explode(";",$row->vmatel);   //persknr:MA|tel
+                    $first = true;
+                    foreach ($mat as $ma)
+                    {
+                        $pnr = substr($ma,0,strpos($ma,":"));
+                        $tel = substr($ma,strpos($ma,"|")+1);
+                        $nam = substr($ma,strpos($ma,":")+1,strlen($ma)-strlen($pnr)-strlen($tel)-2);
+                        $sp = "&nbsp;&nbsp;&nbsp;";
+                        if ($pnr != $vpnr)
+                        {
+                            if (!$first) echo "</td></tr>\n";
+                            if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                            echo "<tr bgcolor='$bg'><td>$sp$nam</td><td>Telefon: $tel";
+                        }
+                        else echo ", $tel";
+                        $first = false;
+                        $vpnr = $pnr;
+                    }
+                    echo "</td></tr>\n";
+                }
+                else
+                { 
+                    if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                    echo "<tr bgcolor='$bg'><td colspan='2'>&nbsp;</td></tr>\n";
+                }
+                if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                echo "<tr bgcolor='$bg'><td><b>Bemerkungen:</b></td><td>$row->raum_bem</td></tr>\n";
+                if ($row->raum_feuerl)
+                {
+                    if ($bg == $bg1) $bg = $bg2; else $bg = $bg1;
+                    echo "<tr bgcolor='$bg'><td><b>Feuerl&ouml;scher im Raum:</b></td><td>$row->raum_feuerl</td></tr>\n";
+                }
+                echo "</table>\n";
+                echo "<p>Innerbetrieblicher Notdienst:   Telefonzentrale: <b>9</b>,   nachts/Wochenende: <b>4444</b></p>\n";
+                $begin = 1;
+            }
+
+            echo "<p></p><table width=99%><tr><td class='right'><a href=\"javascript:window.print()\" class='sc'>
+                <img src=\"/fhiiqm/img/printer.png\" alt=\"Bericht drucken\" border=\"0\" align=\"right\" title=\"Bericht drucken\"></a></td></tr></table>";
+            
+        }
+        else echo "<p class='red'>&nbsp;&nbsp;&nbsp;Leider gibt es kein Ergebnis für die von Ihnen gewählten Kriterien!</p>";
+        
+        echo "</div>\n";
+        if ($search != 2)
+        {    
+            echo "<span  class=\"sc\">";
+            echo "<br />&nbsp;&nbsp;&nbsp;<a href=\"/fhiiqm/raum_report.php\" target=\"_self\" title=\"Berichte\" class='sc'>&laquo; zur Berichts&uuml;bersicht</a>";
+            echo "&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"" . $_SERVER["PHP_SELF"] . "\" target=\"_self\" title=\"Report Labor Info\" class='sc'>neuer Bericht Raum Information AS</a></span>\n";
+        }
+        else
+            echo "<a class='sc' href='javascript:history.back();' onMouseOver=\"{window.status='Zur&uuml;ck'; return true;}\">&laquo; Zur&uuml;ck</a>";
+    }
+
+?>
+
+</body>
 </html>
\ No newline at end of file
--- a/fhiiqm/report/vtr_kuend_emaila.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/report/vtr_kuend_emaila.php	Fri Dec 20 15:19:32 2013 +0100
@@ -1,143 +1,145 @@
-#!/usr/bin/php
-<?php
-
-/**
- * @author Bettina Schwarzer, Fritz-Haber-Institut
- * @copyright 03/2012
- * 
- * sendet email an Bearbeiter am Tag ('kuendigugsfrist'+ 1) Monate vor Vertragsende = ckdate
- * + Vertrag-File als Attachment, wenn Bearbeiter kein Recht 'vr' oder 've' hat
- * auch als cron-Job einsetzbar
- * 
- */
-
-	include_once("/var/www/fhiiqm/inc/dbconnect.inc.php");
-	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
-
-    $sql = "CALL vertrag_ablauf()";
-    // liefert: cid, cname, vtypid, vtypk, cbegin, cend, cauto, cmon, email, cfile, bem, ckdate
-    
-    $result = $dbc -> queryObjectArray($sql);
-    if ($result)
-    {
-        $heute = new DateTime();
-        
-        $infoh = "  
-            <html>
-            <head>
-              <title>Vertragsinfo (IQM-DB)</title>
-            </head>
-            <body>
-              <p>Liebe(r) Frau/Herr ";
-        $infoh2 = ",</p>
-              <p>der folgende Vertrag l&auml;uft demn&auml;chst aus:</p>
-              <table border='1' cellspacing='0' cellpadding='5'>\n
-              <tr><td>Vertragsbezeichnung</td><td>VTyp</td><td>VBeginn</td><td>VEnde</td>
-                        <td>Verl&auml;ngerung</td><td>K&uuml;nd.-frist(mon)</td><td>Bemerkung</td></tr>\n";
-                        
-        $trenn = md5( time() );
-        
-        // Bearbeiter
-        $sql = "SELECT b.persknr,nachname,email 
-                FROM fhiiqm.Vertrag v LEFT OUTER JOIN Vertrag_Bearbeiter b
-                ON v.contract_ID=b.contract_ID LEFT OUTER JOIN Mitarbeiter m
-                ON b.persknr=m.persknr WHERE v.contract_ID=";
-
-        // Recht Vertrag zu sehen
-        $sql1 = "SELECT COUNT(*) FROM fhiiqm.user_recht r INNER JOIN fhiiqm.userweb u
-                    ON u.userid = r.userid
-                    WHERE recht_ID IN ('ve','vr') AND persknr IN ";
-
-        foreach ($result as $row)
-        {
-//            if (!is_null($row -> ckdate) && $row->ckdate <= $heute->format("Y-m-d") && $row->email) // nur fuer Test
-            if (!is_null($row -> ckdate) && $heute->format("Y-m-d") == $row->ckdate && $row->email) // 28.02.2012
-            {
-                $av = $row->cauto? "automatisch" : "&nbsp;";
-                if ($row->cbegin && $begin = new DateTime($row->cbegin)) $begin=$begin->format("d.m.Y"); else $begin="&nbsp;";
-                if ($row->cend && $end = new DateTime($row->cend)) $end=$end->format("d.m.Y"); else $end="&nbsp;";
-//                if ($ckd = new DateTime($row->ckdate)) $ckd=$ckd->format("d.m.Y"); else $ckd="&nbsp;";
-                $bem = $row->bem ? $row->bem : "&nbsp";
-                $info = "<tr><td><b>$row->cname</b></td><td>$row->vtypk</td><td>$begin</td><td><b>$end</b></td>
-                    <td>&nbsp;$av</td><td>&nbsp;&nbsp;&nbsp;$row->cmon</td><td>$bem</td></tr>\n";
-
-                // Adressat(en)), Attachment? ermitteln
-                $strsql = $sql .$row->cid;
-                $addr = "";
-                $pers = "";
-                if ($res = $dbc -> queryObjectArray($strsql))
-                {
-                    foreach ($res as $ro)
-                    {
-                        $addr .= $ro->email.",";
-                        $pers .= $ro->persknr.",";
-                    }    
-                    $addr = substr($addr,0,strlen($addr)-1);
-                    $pers = substr($pers,0,strlen($pers)-1);
-                    $strsql1 = $sql1 . "($pers)";
-                    $noatt = $dbc -> querySingleItem($strsql1); // = 0 -> file als Attachment
-                }
-            	// email senden
-//                $eaddr = "schwarzer@fhi-berlin.mpg.de"; // nur fuer Test
-                $eaddr = $addr;
-
-        		$eheader =   
-//        					'Reply-To:  noreply@' .$_SERVER['SERVER_NAME'] . "\r\n" .
-                            'Message-ID: <' .$trenn.'@achilleus.rz-berlin.mpg.de'.">\r\n" .
-        				    'X-Mailer: PHP v' .phpversion() . "\r\n" .
-                            'Bcc: schwarzer@fhi-berlin.mpg.de' . "\r\n" .
-                            'From: noreply@achilleus.rz-berlin.mpg.de'."\r\n" .
-                            'MIME-Version: 1.0' . "\r\n" .
-                            'Content-type: multipart/mixed;' . "\r\n" ;
-                $eheader .= " boundary = " .$trenn;
-                $eheader .= "\r\n\r\n";
-        				    
-        		$esubj = "Vertragsinformation (IQM-DB)";
-//        		$emess = $infoh.$ro->nachname.$infoh2.$addr."\n".$info ."\n";
-
-                // Mailbody vorbereiten
-                $mailbody  = "This is a multi-part message in MIME format\r\n";
-                $mailbody .= "--" .$trenn. "\r\n";
-                $mailbody .= "Content-Type: text/html; charset=iso-8859-1\r\n";
-                $mailbody .= "Content-Transfer-Encoding: 8bit\r\n\r\n";
-
-        		$emess = $mailbody . $infoh.$ro->nachname.$infoh2."\n".$info ."\n";
-        		$emess .= "</table>\n";
-                $emess .= "<p>Bitte pr&uuml;fen Sie, ob er verl&auml;ngert oder gek&uuml;ndigt werden soll.</p>\n";
-                if ($noatt == 0) $emess .= "<p>Als Attachment finden Sie das Vertragsdokument.</p>\n"; 
-                $emess .= "<br /><p>Dies ist eine automatisch generierte E-Mail, bitte nicht darauf antworten.</p>\n";  
-        		$emess .= "<p>Beste Grü&szlig;e, Ihre IQM-Datenbank</p>\n</body></html>\n";
-                
-                // Anhang anfügen
-                if ($noatt == 0)
-                {
-                    $fname = $row->cfile;
-                    $ftyp = substr($fname,strrpos($fname,".")+1);
-                    switch (strtolower($ftyp))
-                    {   
-                        case "pdf":
-                            $ctyp = " application/pdf";
-                            break;
-                        case "jpg":
-                            $ctyp = " image/jpeg";
-                            break;
-                        default:
-                            $ctyp = " application/pdf";
-                            break;
-                    }
-                    $afname = substr($fname,strpos($fname,"_")+1);
-                    $attm  = "--" .$trenn. "\r\n";
-                    $attm .= "Content-Type:$ctyp; name=\"$afname\"\r\n";
-                    $attm .= "Content-Transfer-Encoding: base64\r\n";
-                    $attm .= "Content-Disposition: attachment; filename=\"$afname\"\r\n\r\n";
-                    $attm .= chunk_split( base64_encode( file_get_contents( "/var/www/fhiiqm/documents/$fname" ) ) );
-                    $attm .= "\n";
-                    
-                    $emess .= $attm;
-                }
-
-                mail($eaddr,$esubj,$emess,$eheader);
-            }
-        }
-    }
-?>
+#!/usr/bin/php
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 03/2012
+ * 
+ * sendet email an Bearbeiter am Tag ('kuendigugsfrist'+ 1) Monate vor Vertragsende = ckdate
+ * + Vertrag-File als Attachment, wenn Bearbeiter kein Recht 'vr' oder 've' hat
+ * auch als cron-Job einsetzbar
+ * 
+ */
+
+	include_once("/var/www/fhiiqm/inc/dbconnect.inc.php");
+	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+
+    $sql = "CALL vertrag_ablauf_mf()";
+    // liefert: cid, cname, vtypid, vtypk, cbegin, cend, cauto, cmon, email, cfile, bem, ckdate
+    
+    $result = $dbc -> queryObjectArray($sql);
+    if ($result)
+    {
+        $heute = new DateTime();
+        
+        $infoh = "  
+            <html>
+            <head>
+              <title>Vertragsinfo (IQM-DB)</title>
+            </head>
+            <body>
+              <p>Liebe(r) Frau/Herr ";
+        $infoh2 = ",</p>
+              <p>der folgende Vertrag l&auml;uft demn&auml;chst aus:</p>
+              <table border='1' cellspacing='0' cellpadding='5'>\n
+              <tr><td>Vertragsbezeichnung</td><td>VTyp</td><td>VBeginn</td><td>VEnde</td>
+                        <td>Verl&auml;ngerung</td><td>K&uuml;nd.-frist(mon)</td><td>Bemerkung</td></tr>\n";
+                        
+        $trenn = md5( time() );
+        
+        // Bearbeiter
+        $sql = "SELECT b.persknr,nachname,email 
+                FROM fhiiqm.Vertrag v LEFT OUTER JOIN Vertrag_Bearbeiter b
+                ON v.contract_ID=b.contract_ID LEFT OUTER JOIN Mitarbeiter m
+                ON b.persknr=m.persknr WHERE v.contract_ID=";
+
+        // Recht Vertrag zu sehen
+        $sql1 = "SELECT COUNT(*) FROM fhiiqm.user_recht r INNER JOIN fhiiqm.userweb u
+                    ON u.userid = r.userid
+                    WHERE recht_ID IN ('ve','vr') AND persknr IN ";
+
+        foreach ($result as $row)
+        {
+//            if (!is_null($row -> ckdate) && $row->ckdate <= $heute->format("Y-m-d") && $row->email) // nur fuer Test
+            if (!is_null($row -> ckdate) && $heute->format("Y-m-d") == $row->ckdate && $row->email) // 28.02.2012
+            {
+                $av = $row->cauto? "automatisch" : "&nbsp;";
+                if ($row->cbegin && $begin = new DateTime($row->cbegin)) $begin=$begin->format("d.m.Y"); else $begin="&nbsp;";
+                if ($row->cend && $end = new DateTime($row->cend)) $end=$end->format("d.m.Y"); else $end="&nbsp;";
+//                if ($ckd = new DateTime($row->ckdate)) $ckd=$ckd->format("d.m.Y"); else $ckd="&nbsp;";
+                $bem = $row->bem ? $row->bem : "&nbsp";
+                $info = "<tr><td><b>$row->cname</b></td><td>$row->vtypk</td><td>$begin</td><td><b>$end</b></td>
+                    <td>&nbsp;$av</td><td>&nbsp;&nbsp;&nbsp;$row->cmon</td><td>$bem</td></tr>\n";
+
+                // Adressat(en)), Attachment? ermitteln
+                $strsql = $sql .$row->cid;
+                $addr = "";
+                $pers = "";
+                if ($res = $dbc -> queryObjectArray($strsql))
+                {
+                    foreach ($res as $ro)
+                    {
+                        $addr .= $ro->email.",";
+                        $pers .= $ro->persknr.",";
+                    }    
+                    $addr = substr($addr,0,strlen($addr)-1);
+                    $pers = substr($pers,0,strlen($pers)-1);
+                    $strsql1 = $sql1 . "($pers)";
+                    $noatt = $dbc -> querySingleItem($strsql1); // = 0 -> file als Attachment
+                }
+            	// email senden
+//                $eaddr = "schwarzer@fhi-berlin.mpg.de"; // nur fuer Test
+                $eaddr = $addr;
+
+        		$eheader =   
+//        					'Reply-To:  noreply@' .$_SERVER['SERVER_NAME'] . "\r\n" .
+                            'Message-ID: <' .$trenn.'@achilleus.rz-berlin.mpg.de'.">\r\n" .
+        				    'X-Mailer: PHP v' .phpversion() . "\r\n" .
+                            'Bcc: schwarzer@fhi-berlin.mpg.de' . "\r\n" .
+                            'From: noreply@achilleus.rz-berlin.mpg.de'."\r\n" .
+                            'MIME-Version: 1.0' . "\r\n" .
+                            'Content-type: multipart/mixed;' . "\r\n" ;
+                $eheader .= " boundary = " .$trenn;
+                $eheader .= "\r\n\r\n";
+        				    
+        		$esubj = "Vertragsinformation (IQM-DB)";
+//        		$emess = $infoh.$ro->nachname.$infoh2.$addr."\n".$info ."\n";
+
+                // Mailbody vorbereiten
+                $mailbody  = "This is a multi-part message in MIME format\r\n";
+                $mailbody .= "--" .$trenn. "\r\n";
+                $mailbody .= "Content-Type: text/html; charset=iso-8859-1\r\n";
+                $mailbody .= "Content-Transfer-Encoding: 8bit\r\n\r\n";
+
+        		$emess = $mailbody . $infoh.$ro->nachname.$infoh2."\n".$info ."\n";
+        		$emess .= "</table>\n";
+                $emess .= "<p>Bitte pr&uuml;fen Sie, ob er verl&auml;ngert oder gek&uuml;ndigt werden soll.</p>\n";
+                if ($noatt == 0) $emess .= "<p>Als Attachment finden Sie das Vertragsdokument.</p>\n"; 
+                $emess .= "<br /><p>Dies ist eine automatisch generierte E-Mail, bitte nicht darauf antworten.</p>\n";  
+        		$emess .= "<p>Beste Grü&szlig;e, Ihre IQM-Datenbank</p>\n</body></html>\n";
+                
+                // Anhang anfügen
+                if ($noatt == 0)
+                {
+                    // nur 1. File
+                    if (strpos($row->cfile,"|")) $fname = substr($row->cfile,0,strpos($row->cfile,"|")); else $fname=$row->cfile;
+                    $fname = $row->cfile;
+                    $ftyp = substr($fname,strrpos($fname,".")+1);
+                    switch (strtolower($ftyp))
+                    {   
+                        case "pdf":
+                            $ctyp = " application/pdf";
+                            break;
+                        case "jpg":
+                            $ctyp = " image/jpeg";
+                            break;
+                        default:
+                            $ctyp = " application/pdf";
+                            break;
+                    }
+                    $afname = substr($fname,strpos($fname,"_")+1);
+                    $attm  = "--" .$trenn. "\r\n";
+                    $attm .= "Content-Type:$ctyp; name=\"$afname\"\r\n";
+                    $attm .= "Content-Transfer-Encoding: base64\r\n";
+                    $attm .= "Content-Disposition: attachment; filename=\"$afname\"\r\n\r\n";
+                    $attm .= chunk_split( base64_encode( file_get_contents( "/var/www/fhiiqm/documents/$fname" ) ) );
+                    $attm .= "\n";
+                    
+                    $emess .= $attm;
+                }
+
+                mail($eaddr,$esubj,$emess,$eheader);
+            }
+        }
+    }
+?>
--- a/fhiiqm/start.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/start.php	Fri Dec 20 15:19:32 2013 +0100
@@ -44,12 +44,12 @@
         echo "<p>&nbsp;&nbsp;&nbsp;<a href='/fhiiqm/infos/251_fhiiqm_keytyp.pdf' title='Schl&uuml;sselverwaltung' target='_blank'>Schl&uuml;sselverwaltung</a></p>\n";
     if (in_array("ddr",$_SESSION["recht"]) || in_array("dde",$_SESSION["recht"]))
         echo "<p>&nbsp;&nbsp;&nbsp;<a href='/fhiiqm/infos/186_fhiiqm_raumverantw.pdf' title='Raumverantwortliche' target='_blank'>Raumverantwortliche erfassen</a></p>\n";
-    if (date("Y-m-d") < date("Y-m-d", mktime(0,0,0,12,25,2012)))
+    if (date("Y-m-d") < date("Y-m-d", mktime(0,0,0,12,25,2013)))
     {
         echo "<p>&nbsp;</p><p class='red'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             <img src='/fhiiqm/img/weihnachtsmann.gif' height='75' />";
         $heute = new DateTime();
-        $weih = new DateTime('2012-12-24');
+        $weih = new DateTime('2013-12-24');
         $tage = $weih -> diff($heute)->days+1;
         if ($tage <2) $tag = "Tag"; else $tag="Tage";
         echo "<span class='valignt red bigger'>noch <b>$tage</b> $tag bis <em>Weihnachten</em>!</span></p>\n";
--- a/fhiiqm/tel_flist.php	Thu Sep 12 09:04:56 2013 +0200
+++ b/fhiiqm/tel_flist.php	Fri Dec 20 15:19:32 2013 +0100
@@ -31,8 +31,8 @@
 
 <head>
 	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-   	<link href="http://achilleus.rz-berlin.mpg.de/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/> 
-   	<link href="http://achilleus.rz-berlin.mpg.de/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/> 
+   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/> 
+   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/> 
 
 	<title>Telefonliste</title>
 </head>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fhiiqm/test/ma_tel_ed_gast.php	Fri Dec 20 15:19:32 2013 +0100
@@ -0,0 +1,431 @@
+<?php
+
+/**
+ * @author Bettina Schwarzer, Fritz-Haber-Institut
+ * @copyright 12/2012
+ * 
+ * INSERT/UPDATE/(DELETE) Mitarbeiter
+ * 
+ */
+
+
+    error_reporting(E_ALL ^ E_NOTICE);
+    
+    session_start();
+    if (! isset($_SESSION["userid"]))
+    { 
+        include_once ("inc/func_lib.inc.php");	
+        login($_SERVER["PHP_SELF"]);
+        exit;
+    }
+    
+    if (is_null($_SESSION["recht"]) || (!is_null($_SESSION["recht"]) && !in_array("mtr",$_SESSION["recht"]) && !in_array("mte",$_SESSION["recht"])))
+    {
+        header("Location: start.php");
+        exit;
+    }    
+
+	include_once($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/dbconnect.inc.php");
+	if (!isset($dbc) || !$dbc) $dbc = new dbconnection();
+
+    $sub = $_POST["eintragen"];
+    $del = $_POST["del"];
+    $ma  = $_POST["ma"];
+    $okn = $_POST["okn"];
+    $ok  = $_POST["ok"];
+    if (!$okn) $ok=0;
+    $pid = $_GET["i"]; // persknr
+
+	$sort   = $_GET["s"];   // Sortierung nach Spalte
+    $dir    = $_GET["d"];   // Sortierrichtung
+    $fnum   = $_GET["f"];   // Spaltennummer, nach der aktuell gefiltert wird
+    $filter =  $_GET["b"];  // Filterbegriff 
+    $getp = "&s=$sort&d=$dir&f=$fnum&b=$filter"; // Parameter Listenanzeige
+    
+//    print_r ($ma); echo "<br />sub = $sub<br /><br />"; 
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+   	<link href="/fhiiqm/css/db.css" rel="STYLESHEET" type="TEXT/CSS" media="screen"/> 
+   	<link href="/fhiiqm/css/db_print.css" rel="STYLESHEET" type="TEXT/CSS" media="print"/> 
+    <link type="text/css" href="/fhiiqm/css/jquery/ui-lightness-1.8.21/jquery-ui-1.8.21.custom.css" rel="Stylesheet" />	
+    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-1.7.2.min.js"></script>
+    <script type="text/javascript" src="/fhiiqm/js/jquery/jquery-ui-1.8.21.custom.min.js"></script>
+	<title>MA/O bearbeiten</title>
+
+    <script type="text/javascript">
+    <!--
+    var counter = 0;
+    var limit = 99;
+    var arr = new Array();
+    var arra = new Array();
+    var arrg = new Array();
+    function addInput(divName){
+         if (counter == limit)  {
+              alert("Das Limit von " + counter + " zusätzlichen inputs ist erreicht");
+         }
+         else 
+         {
+            if (divName == 'addtel')
+            {            
+              var newdiv = document.createElement('div');
+              var opt="<option value='-1'></option>";
+              var i;
+              for (var key in arr)  
+              {
+                opt = opt.concat("<option value='",key,"'>",arr[key],"</option>\n" );
+              }
+              opt += "</select>\n";
+              newdiv.innerHTML = "<span></span><select name='ma[tel][]'>"+opt;
+              newdiv.innerHTML += "&nbsp;&nbsp;&nbsp;oder neu&nbsp;&nbsp;&nbsp;<input type='text' name='ma[ntel][]' size='20' maxlength='20' />";
+              opt = "<option value='-1'></option>";
+              for (i=1; i<10; i++)
+              {
+                opt = opt.concat("<option value=",i,">",i,"</option>\n");
+              }
+              opt += "</select>\n";
+              newdiv.innerHTML += "&nbsp;&nbsp;&nbsp;&nbsp;Priorit&auml;t&nbsp;&nbsp;&nbsp;<select name='ma[so][]'>"+opt;
+              newdiv.innerHTML += "&nbsp;&nbsp;&nbsp;&ouml;ffentlich&nbsp;&nbsp;&nbsp;<input type='checkbox' name='ma[pub][" + (counter+1) + "]' value='1' />\n";
+              document.getElementById(divName).appendChild(newdiv);
+              counter++;
+            }
+            else
+            {
+              var newdiv = document.createElement('div');
+              var opt="";
+              var optg="<option value='-1'></option>";
+              for (var key in arra)  
+              {
+                opt = opt.concat("<option value='",key,"'>",arra[key],"</option>\n" );
+              }
+              opt += "</select>\n";
+              newdiv.innerHTML = "<span></span><select name='ma[abt][]'>"+opt;
+              for (var key in arrg)  
+              {
+                var keym = parseInt(key.substr(1)); //key = abt_ID*1000+rag_ID wegen sort nach Abteilung
+                optg = optg.concat("<option value='",keym,"'>",arrg[key],"</option>\n" );
+              }
+              optg += "</select>\n";
+              newdiv.innerHTML += "&nbsp;&nbsp;&nbsp;&nbsp;Arbeitsgruppe&nbsp;&nbsp;&nbsp;&nbsp;<select name='ma[rag][]'>"+optg;                
+              newdiv.innerHTML += "<img src='/fhiiqm/img/nixt.gif' border='0' height='100%' />";
+              document.getElementById(divName).appendChild(newdiv);
+              counter++;
+            }  
+         }
+    }
+    function delInput(divId){
+            var kn = document.getElementById(divId); 
+            while (kn.childNodes.length>0 && kn.lastChild.nodeName != "SPAN" && kn.lastChild.nodeName != "A")
+            {
+//                alert ("vor "+kn.lastChild.nodeName+", nodetyp = "+ kn.lastChild.nodeType);
+                var knc = kn.lastChild;
+                    document.getElementById(divId).removeChild(knc);
+            }
+//            if (kn.lastChild.nodeName == "SELECT") document.getElementById(divId).removeChild(kn.lastChild);
+            if (kn.lastChild.nodeName == "SPAN") document.getElementById(divId).removeChild(kn.lastChild);
+    }
+    //-->
+    </script>
+
+</head>
+
+<body>
+    <script type="text/javascript">
+    <!--
+      $(document).ready(function() {
+        $("#fhi").focus();
+        $("#nname").autocomplete({
+                source: "/fhiiqm/inc/ma_ldap_ac.inc.php",
+    			minLength: 2,
+                select: function(event,ui){// $("#nname").val(ui.item.id);
+                                           $("#vname").val(ui.item.id2); 
+                                           $("#email").val(ui.item.id3); }
+    		});
+        });
+    //-->
+    </script>
+
+<?php
+    echo "&nbsp;";  
+    echo "<div class=\"float-br smaller\" valign='top'>";
+    echo "&nbsp;&nbsp;&nbsp;user: " . $_SESSION["userid"];
+    echo "&nbsp;&nbsp;&nbsp;<a class='sc' href='/fhiiqm/logout.php' title='Session beenden'>logout</a></div>\n";
+    echo "<div class=\"float-r\"><img src=\"img/group.png\" border=\"0\" alt=\"Mitarbeiter bearbeiten\" title=\"Mitarbeiter bearbeiten\"/></div>\n";
+
+    if ($pid) $text = "editieren"; else $text = "erfassen";
+    echo "<div align=\"center\">";
+    echo "<h3>Mitarbeiter/Objekte $text</h3>";
+    echo "</div>\n";
+    if ((!$sub && !$del) || !isset($ma) || !$ok) 
+    {
+        
+        if ($pid && (!$sub || !$del) && !isset($ma))
+        {
+            $sql = "SELECT nachname,vorname,titel,abt_tel,email,aktiv,timestamp,userid FROM Mitarbeiter WHERE persknr=$pid";
+            if ($result = $dbc -> queryObjectArray($sql))
+            {
+                foreach ($result as $row)
+                {
+                    $ma['name']     = $row->nachname;
+                    $ma['vname']    = $row->vorname;
+                    $ma['titel']    = $row->titel;
+                    $ma['abtm']     = $row->abt_tel;
+                    $ma['email']    = $row->email;
+                    $ma['fhi']      = $row->aktiv;
+                    $ma["tstmp"]    = $row->timestamp;
+                    $ma["uid"]      = $row->userid;
+                }    
+            }
+            // Arbeitsgruppe, Abteilung
+            $sql = "SELECT mr.rag_ID, abt_ID FROM fhiiqm.MA_RaumArbGruppe mr INNER JOIN RaumArb_Gruppe r ON mr.rag_ID=r.rag_ID 
+                    WHERE  persknr=$pid";
+            if ($result = $dbc -> queryObjectArray($sql))
+            {
+                foreach ($result as $row)
+                {
+                   $ma['abt'][] = $row->abt_ID;  
+                   $ma['rag'][] = $row->rag_ID;  
+                }
+            }
+            if (count($ma['abt']) == 0) $ma['abt'][] = $ma['abtm']; 
+            // Haus,Raum
+            $sql = "SELECT ma.raum_ID, geb_ID FROM Mitarbeiter_Raum ma INNER JOIN Raum r ON ma.raum_ID=r.raum_ID 
+                    WHERE persknr=$pid ORDER BY raum_ID"; 
+            if ($result = $dbc -> queryObjectArray($sql))
+            {
+                foreach ($result as $row)
+                {
+                   $ma['geb'] = $row->geb_ID;  
+                   $ma['raum'] = $row->raum_ID;  
+                }
+            }
+            // Telefon
+            $sql = "SELECT m.telefon_nr,public,sort
+                    FROM fhiiqm.MA_Telefon m INNER JOIN Telefon t ON m.telefon_nr=t.telefon_nr 
+                    WHERE persknr = $pid ORDER BY IFNULL(sort,99)" ;
+            if ($result = $dbc -> queryObjectArray($sql))
+            {
+                foreach ($result as $row)
+                {
+                    $ma['tel'][] = $row->telefon_nr;
+                    $ma['pub'][] = ($row->public)? 1 : 0;
+                    $ma['so'][]  = $row->sort;   
+                }
+            }
+        }
+        include ($_SERVER["DOCUMENT_ROOT"]."/fhiiqm/form/ma_tel_ed_form.inc.php");
+        
+	  	if ($sub || $del)
+        {
+		  	if ($sub)
+                $frage = "Alle Angaben ok?";
+            elseif ($del)
+                $frage = "Mitarbeiter wirklich l&ouml;schen?";
+			echo "<tr>
+			  <td class=\"red\" valign=\"top\" align=\"left\">$frage</td>
+			        <td><input type=\"checkbox\" name=\"ok\" value=\"1\"";
+			        if ($ok)  echo "checked=\"checked\""; 
+			echo " /></td>\n</tr>\n";
+        }
+        if (!is_null($_SESSION["recht"]) && in_array("mte",$_SESSION["recht"]))
+        {
+            echo "
+           	<tr><td>&nbsp;</td>\n
+            	<td><input  class=\"button\" type=\"submit\" name=\"eintragen\" value=\"  eintragen  \" />";
+            if ($pid)
+            {
+                echo "&nbsp;&nbsp;&nbsp;<input class=\"buttonr\" type=\"submit\" value=\"l&ouml;schen\" name=\"del\" title=\"delete\" />";
+//                echo "&nbsp;&nbsp;&nbsp;<input class=\"button\" type=\"submit\" value=\"duplizieren\" name=\"dup\" title=\"delete\" />";
+            }    
+           	echo "</td></tr>\n";
+        }
+        echo "</table>\n";
+        echo "</div>\n";
+    echo "<p class='sc'>&nbsp;&nbsp;&nbsp;<a href=\"ma_tel_flist.php?e=1$getp\" target=\"_self\" title=\"Telefon-Liste\">&laquo; zur Telefon-Liste</a></p>\n"; 
+    echo "</form>\n";
+    }
+    else
+    {
+        echo "<div align='center'>\n";
+        $userid = $_SESSION["userid"];
+        if ($del)
+        {   
+            if ($ma["fhi"] == 1)
+            {
+                // nur aktiv auf 0 setzen
+                $sql = "UPDATE Mitarbeiter SET aktiv=0, userid='$userid' WHERE persknr = $pid";
+                $retdi = $dbc -> execute($sql);
+                $sql = "DELETE FROM Mitarbeiter_Raum WHERE persknr = $pid";
+                $retdi = $dbc -> execute($sql);
+                $sql = "DELETE FROM MA_Telefon WHERE persknr = $pid";
+                $retdi = $dbc -> execute($sql);
+                $sql = "DELETE FROM MA_RaumArbGruppe WHERE persknr = $pid";
+                $retdi = $dbc -> execute($sql);
+            }
+            else
+            {
+                $sql = "DELETE FROM Mitarbeiter WHERE persknr = $pid";
+                $retdi = $dbc -> execute($sql);
+            }
+            if ($retdi)
+            {
+                echo "<p class='green'><b>DELETE: Daten  zu '".$ma["name"]. ", ". $ma['vname'] ."' wurden erfolgreich gel&ouml;scht.</b></p>\n";
+            }                
+            else
+            {
+                echo "<p class='red'><b>DELETE: Daten  zu '".$ma["name"]. ", ". $ma['vname'] ."' konnten nicht gel&ouml;scht werden!</b></p>\n";
+                echo "sql = $sql<br />";
+                echo "error DELETE: " . $dbc->error . "<br />";
+            }
+            include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/ma_tel_dat_show.inc.php");
+        }
+        else //INSERT oder UPDATE
+        {
+            $stmt = $dbc -> stmtinit();
+            if (is_object($stmt))
+            {
+//                if ($ma['fhi']) $aktiv = 1; else $aktiv = 2;
+                if ($ma['email'])
+                {
+                    if (strpos($ma['email'],"@") > 0) $ma['email'] = $ma['email']; else $ma['email'] = $ma['email'] . "@fhi-berlin.mpg.de";
+                } 
+                foreach ($ma as &$elem) if (!$elem) $elem = null;  // NULL-Eintrag in Leerfelder  
+                if ($pid) //UPDATE
+                {
+                    // Abt. alt in aktualisierten Abteilungen?
+                    if (!in_array($ma['abtm'],$ma['abt'])) $ma['abtm'] = $ma['abt'][0];
+                    $stmt -> prepare("UPDATE Mitarbeiter SET 
+                                        nachname = ?,
+                                        vorname = ?,
+                                        titel = ?,
+                                        email = ?,
+                                        abt_tel = ?,
+                                        aktiv = ?,
+                                        userid = ?
+                                        WHERE persknr = $pid");
+                    $stmt -> bind_param('ssssiis',$ma['name'],$ma['vname'],$ma['titel'],$ma['email'],$ma['abtm'], $ma['fhi'], $userid);
+//                    echo "UPDATE: ". var_dump($stmt);
+                    $result = $stmt -> execute();
+                    if ($stmt->error) echo "error UPDATE Mitarbeiter: " . $stmt->error . "<br><br>\n";
+                }
+                else
+                {
+                    $sql = "SELECT MAX(persknr) FROM Mitarbeiter WHERE persknr < 9500";
+                    $pid = $dbc -> querySingleItem($sql) + 1;
+                    $stmt -> prepare ("INSERT INTO Mitarbeiter (persknr, nachname, vorname, titel,email,abt_tel,aktiv,userid) VALUES (?,?,?,?,?,?,?,?)"); 
+                    $stmt -> bind_param('issssiis',$pid,$ma['name'],$ma['vname'],$ma['titel'],$ma['email'],$ma['abt'][0], $ma['fhi'], $userid);
+                    $result = $stmt -> execute();
+                    if ($stmt->error) echo "error INSERT Mitarbeiter: " . $stmt->error . "<br><br>\n";
+                    $ma['abtm'] = $ma['abt'][0];
+                }
+                if ($result)
+                {
+                    $ret = 1;
+                    // raum
+                    if ($ma["raum"] > "-1")
+                    {
+                        $sql = "DELETE FROM Mitarbeiter_Raum WHERE persknr=$pid";
+                        $redr = $dbc -> execute($sql);
+                        if ($redr)
+                        {
+                            $sql = "INSERT INTO Mitarbeiter_Raum (persknr, raum_ID) VALUES ($pid, " . $ma["raum"] . ")";
+                            $ret = $dbc -> execute($sql);
+                        } 
+                    }
+                    if (is_array($ma["rag"]) && count($ma["rag"])>0)
+                    {
+                        $sql = "DELETE FROM MA_RaumArbGruppe WHERE persknr=$pid";
+                        $redr = $dbc -> execute($sql);
+                        if ($redr)
+                        {
+                            foreach ($ma['rag'] as $rag)
+                            {
+                                if ($rag > 0)
+                                {
+                                    $sql = "INSERT INTO MA_RaumArbGruppe (persknr, rag_ID) VALUES ($pid, $rag)";
+                                    $retn = $dbc -> execute($sql);
+                                    if ($retn && $ret) $ret = 1; else $ret = 0;
+                                }
+                            }    
+                        } 
+                    }
+                    if (is_array($ma['ntel']))
+                    {
+                        foreach ($ma['ntel'] as $tel)
+                        {
+                            if ($tel > "!")
+                            {
+                                $sql = "SELECT COUNT(*) FROM Telefon WHERE telefon_nr ='$tel'";
+                                $anz = $dbc -> querySingleItem($sql);
+                                if ( $anz == 0)
+                                {
+                                    $sql = "INSERT INTO Telefon (telefon_nr) VALUES('$tel')";
+                                    $rest = $dbc -> execute($sql);
+                                    if ($rest && $ret) $ret = 1; else $ret = 0;
+                                }
+                            }    
+                        }
+                    }
+                    if ($ret)
+                    {
+                        foreach ($ma['so'] as &$prio)
+                            if ($prio == '-1') $prio = null; 
+                        $sql = "DELETE FROM MA_Telefon WHERE persknr = $pid";
+                        $redmt = $dbc -> execute($sql);
+                        if ($redmt)
+                        {
+                            $i=0;        
+                            foreach ($ma['tel'] as $tel)
+                            {
+                                if ($tel >"!" && $tel != "-1")
+                                {
+                                    if (!isset($ma['pub'][$i])) $ma['pub'][$i] = 'NULL';
+                                    if (!isset($ma['so'][$i])) $ma['so'][$i] = 'NULL';
+                                    $sql = "INSERT INTO MA_Telefon (persknr, telefon_nr, public, sort) VALUES ($pid,'$tel'," . $ma['pub'][$i] . ",". $ma['so'][$i] . ")";
+                                    $rest = $dbc -> execute($sql);
+                                    if ($rest && $ret) $ret = 1; else $ret = 0;
+                                }
+                                $i++;
+                            }
+                            $i=0;        
+                            foreach ($ma['ntel'] as $tel)
+                            {
+                                if ($tel >"!")
+                                {
+                                    if (!isset($ma['pub'][$i])) $ma['pub'][$i] = 'NULL';
+                                    if (!isset($ma['so'][$i])) $ma['so'][$i] = 'NULL';
+                                    $sql = "INSERT INTO MA_Telefon (persknr, telefon_nr, public, sort) VALUES ($pid,'$tel'," . $ma['pub'][$i] . ",". $ma['so'][$i] . ")";
+                                    $rest = $dbc -> execute($sql);
+                                    if ($rest && $ret) $ret = 1; else $ret = 0;
+                                }
+                                $i++;
+                            }
+                        }
+                    }
+                }
+            }
+            if ($result && $redmt && $ret) // INSERT/UPDATE Info
+            {
+                //Eingabe Daten erfolgreich 
+                    echo "<p class='green'><b>Mitarbeiterdaten zu " . $ma['name']. ", ". $ma['vname'] . " wurden erfolgreich gespeichert.</b></p>\n";
+                    echo "<br /><br />\n";
+            }
+            else
+            {
+                    echo "<p class='red'><b>Mitarbeiterdaten zu " . $ma['name']. ", ". $ma['vname'] . " wurden nicht oder nur teilweise gespeichert.</b></p>\n";
+                    echo "error: ". $dbc -> error;    
+                    echo "<br /><br />\n";                
+            }
+            include ($_SERVER['DOCUMENT_ROOT'] ."/fhiiqm/inc/ma_tel_dat_show.inc.php");
+        }
+        echo "</div>";
+        echo "<p class='sc'>&nbsp;&nbsp;&nbsp;<a href=\"ma_tel_flist.php?e=1$getp\" target=\"_self\" title=\"Telefonliste\">&laquo; zur Telefon-Liste</a></p>\n"; 
+        echo "<p class='sc'>&nbsp;&nbsp;&nbsp;<a href=\"".$_SERVER["PHP_SELF"]."\" target=\"_self\" title=\"Mitarbeiter erfassen\">Neuen Mitarbeiter erfassen</a></p>\n";    
+    }
+?>
+</body>
+</html>
\ No newline at end of file