--- 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];