--- a/fhiiqm/info_flist.php	Tue Mar 26 15:41:01 2013 +0100
+++ b/fhiiqm/info_flist.php	Thu Apr 18 14:30:58 2013 +0200
@@ -149,7 +149,8 @@
         tab_column(11,"gilt bis",$sort,$dir,0,$fnum,$filter,$start,$zeil);
 //        echo "<th>Sprache</th>";
         tab_column(12,"Status",$sort,$dir,12,$fnum,$filter,$start,$zeil);
-        echo "<th>Dokument</th>";
+        tab_column(13,"Dokument, Schlagwort",$sort,$dir,13,$fnum,$filter,$start,$zeil);
+//        echo "<th>Dokument</th>";
         echo "<th>zu ID</th>";
         echo "<th>&nbsp;</th>";
         echo "<th>&nbsp;</th></tr>\n";
@@ -213,6 +214,31 @@
             else  echo "<td>&nbsp;</td>";       
 //            echo "<td class=\"left\">$row->lang</td>";
             echo "<td class=\"left\">$row->freigabe</td>";
+            $docsw = explode("; ", $row->doc);
+            if (isset($docsw) && is_array($docsw))
+            {
+                echo "<td>";
+                foreach ($docsw as $val)
+                {
+                    $file = substr($val,0,strpos($val,'|'));
+                    $sw   = substr($val,strpos($val,'|')+1);
+                    if ($fnum == 5 && $filter > '!') // Filterbegriff in Schlagwort hervorheben
+                    { 
+                        $sw = str_replace(lcfirst($filter),"<b>".lcfirst($filter)."</b>",$sw);
+                        $sw = str_replace(ucfirst($filter),"<b>".ucfirst($filter)."</b>",$sw);
+                    } 
+                    if ($sw) $sw =  " &rarr; <em>$sw</em>"; else $sw = "";
+                    if (file_exists("infos/$file"))
+                    {
+                        $doc = substr($file,strpos($file,"_")+1);
+                        echo "<a href='infos/$file'>$doc</a>$sw<br />";
+                    }    
+                    else 
+                        echo "$file$sw<br />";   
+                }
+                echo "</td>";
+            }       
+/*
             if (file_exists("infos/".$row->doc))
             {
                 $doc = substr($row->doc,strpos($row->doc,"_")+1); 
@@ -220,9 +246,12 @@
             }
             else    
                 echo "<td class=\"left\">$row->doc</td>";
+*/
             echo "<td class=\"left\">$row->infrel</td>";
             $getp = "&s=$sort&d=$dir&f=$fnum&b=$filter&st=$start&z=$zeil";
-            if (substr($row->ityp_ID,0,1) == 7 || substr($row->ityp_ID,0,1) == 8) $ref = "/fhiiqm/info_betrst_ed.php?i=$row->info_ID&t=$row->ityp_ID$getp"; else $ref="/fhiiqm/info_ed.php?i=$row->info_ID$getp";
+            if (substr($row->ityp_ID,0,1) == 7 || substr($row->ityp_ID,0,1) == 8) $ref = "/fhiiqm/info_betrst_ed.php?i=$row->info_ID&t=$row->ityp_ID$getp";
+            elseif ($row->ityp_ID == 6) $ref="/fhiiqm/info_ed3.php?i=$row->info_ID$getp";
+            else $ref="/fhiiqm/info_ed.php?i=$row->info_ID$getp";
             echo "<td><a href='$ref'><img src=\"/fhiiqm/img/edit.gif\" alt='edit' title='edit' border='0'/></a></td>";
             echo "<td><a href='$ref&dp=1'><img src=\"/fhiiqm/img/duplicate.gif\" alt='duplizieren' title='duplizieren' border='0'/></a></td></tr>\n";
         }