Merge branch 'master' into spezial_includes

default-conf/var_www_includes/config_IAX.php

@@ -9,4 +9,8 @@ $IAXserver="voip.eventphone.de";
 //Asterisk output dir
 $AsteriskOutputDir="/var/spool/asterisk/outgoing";
 
+// enable DEBUG messages
+//$DebugDECT = 1;
+dd
+
 ?>

www-ssl/admin/userSaveNormal.php

@@ -33,7 +33,6 @@ if (IsSet($_GET["action"]))
 					"`Aktiv`= '". $_POST["eAktiv"]. "', ".
 					"`Tshirt` = '". $_POST["eTshirt"]. "', ".
 					"`Hometown` = '". $_POST["Hometown"]. "', ".
-					"`Menu` = '". $_POST["eMenu"]. "' ".
 					"WHERE `UID` = '". $_POST["enterUID"]. 
 					"' LIMIT 1;";
 				echo "User-";