* Domain removal is working again

* Fixed old references to 'response.error'

admin/views.py

@@ -116,7 +116,7 @@ def deldomain(request):
     error = None
     if request.user.id != 1:
         mb = Mailbox.objects.get(user__id=request.user.id)
-        if str(dom.id) in selection:
+        if str(mb.domain.id) in selection:
             error = _("You can't delete your own domain")
     if error is None:
         if request.GET.has_key("keepdir") and request.GET["keepdir"] == "true":
@@ -129,7 +129,7 @@ def deldomain(request):
         msg = ungettext("Domain deleted", "Domains deleted", len(selection))
         messages.info(request, msg, fail_silently=True)
         return ajax_response(request)
-    return ajax_response(request, status="ko", error=error)
+    return ajax_response(request, status="ko", respmsg=error)
 
 @login_required
 @permission_required("admin.view_domaliases")

extensions/webmail/static/js/webmail.js

@@ -234,7 +234,7 @@ function simple_request(url, params) {
           infobox.hide(1);
         }
       } else {
-        infobox.error(response.error);
+        infobox.error(response.respmsg);
       }
     }
   }).get(params);

static/js/confirmation.js

@@ -73,10 +73,13 @@ var Confirmation = new Class({
 		if (res.status == "ok") {
 		    window.location.reload();
 		} else {
-		    infobox.error(res.error);
+		    infobox.error(res.respmsg);
 		    infobox.hide(2);
 		}
-	    }
+	    },
+            onFailure: function(xhr) {
+                $(parent.document.body).set("html", xhr.responseText);
+            }
         }).send(params);
     },