webinterface.git

@@ -42,6 +42,12 @@ function change_mailaccount($id, $arr)

   if (isset($arr['account']))

   {

     list($local, $domain) = explode('@', $arr['account'], 2);

+    if ($domain == config('masterdomain'))

+    {

+      $values['domain'] = "NULL";

+    }

+    else

+    {

       $domain = new Domain( (string) $domain);

       if ($domain->id == NULL)

         array_push($conditions, "domain=NULL");

@@ -50,6 +56,7 @@ function change_mailaccount($id, $arr)

         $domain->ensure_userdomain();

         array_push($conditions, "domain={$domain->id}");

       }

+    }

     array_push($conditions, "local='".mysql_real_escape_string($local)."'");

   }

   if (isset($arr['mailbox']))