--- a/fhiiqm/form/gefahr_ap_search_form.inc.php	Fri Jun 08 15:04:22 2012 +0200
+++ b/fhiiqm/form/gefahr_ap_search_form.inc.php	Thu Jul 12 13:29:11 2012 +0200
@@ -64,6 +64,31 @@
             </select>
         </td>
     </tr>
+<!--
+    <tr>
+        <td>Raum-Typ</td>
+        <td><select name="rag[rtyp]">
+            <?php
+            /* 
+                if ($rag["rtyp"] == -1) $select = " selected "; else $select = "";
+                echo "<option $select value=\"-1\"></option>\n";
+                $sql = "SELECT raumtyp_ID,raumtyp_bez FROM fhiiqm.Raum_Typ 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>Arbeitsplatz-Typ</td>
         <td><select name="rag[aptyp]">
@@ -86,7 +111,7 @@
         </td>
     </tr>
     <tr>
-        <td>Gefahr</td>
+        <td>Gef&auml;hrdung</td>
         <td><select name="rag[gef]">
             <?php 
                 if ($rag["gef"] == -1) $select = " selected "; else $select = "";
@@ -117,7 +142,7 @@
     <tr>
         <td>Sortierung nach<br />(in dieser Reihenfolge)</td><td>
     <?php
-        $sort = array("-1"=>"","1"=>"Geb&auml;ude","2"=>"Raum-Nr.","6"=>"Arbeitsplatztyp","8"=>"Gefahr");
+        $sort = array("-1"=>"","1"=>"Geb&auml;ude","2"=>"Raum-Nr.","6"=>"Arbeitsplatztyp","8"=>"Gef&auml;hrdung");
         for ($i=1; $i<5; $i++)
         { 
           echo "$i.&nbsp;&nbsp;<select name='rag[sort$i]'>\n";
@@ -133,7 +158,7 @@
 
         $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'] = 25;
+        if (!$rag['z']) $rag['z'] = 9999;
         foreach ($azeil as $key=>$val)
         {
             if ($key == $rag['z']) $select = "selected"; else $select = "";