From 23df4767da515e16a8a9d09946321e895d62f69b Mon Sep 17 00:00:00 2001
From: Martin Geno <geno+dev@fireorbit.de>
Date: Tue, 13 Dec 2016 12:49:17 +0100
Subject: [PATCH] host fix ID

---
 modul/host/apidatabase.go | 5 +++--
 modul/host/apidomain.go   | 4 ----
 modul/host/apimail.go     | 6 ++++--
 modul/host/apiweb.go      | 5 +++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modul/host/apidatabase.go b/modul/host/apidatabase.go
index 6ebc9ed..a7c7f30 100644
--- a/modul/host/apidatabase.go
+++ b/modul/host/apidatabase.go
@@ -22,11 +22,12 @@ func getDatabase(ctx context.Context, w http.ResponseWriter) (database Database,
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
+	database = Database{ID: id}
 
 	if login.Superadmin {
-		dbconnection.Where("id = ?", id).Find(&database)
+		dbconnection.Find(&database)
 	} else {
-		dbconnection.Where(map[string]int64{"id": id, "profil": profil.ID}).Find(&database)
+		dbconnection.Where(map[string]int64{"profil": profil.ID}).Find(&database)
 	}
 
 	if database.ID <= 0 {
diff --git a/modul/host/apidomain.go b/modul/host/apidomain.go
index 2d32b4c..20eb1d0 100644
--- a/modul/host/apidomain.go
+++ b/modul/host/apidomain.go
@@ -1,7 +1,6 @@
 package host
 
 import (
-	"fmt"
 	"net/http"
 	"strconv"
 	"strings"
@@ -36,9 +35,6 @@ func getDomain(ctx context.Context, w http.ResponseWriter) (domain Domain, retur
 		returnerr = &libapi.ErrorResult{Fields: []string{"domain"}, Message: "not found"}
 		w.WriteHeader(http.StatusNotFound)
 	}
-	if id != domain.ID {
-		fmt.Printf("want %d, get %d", id, domain.ID)
-	}
 	return
 }
 
diff --git a/modul/host/apimail.go b/modul/host/apimail.go
index 41c507f..f61dde4 100644
--- a/modul/host/apimail.go
+++ b/modul/host/apimail.go
@@ -23,10 +23,12 @@ func getMail(ctx context.Context, w http.ResponseWriter) (mail Mail, returnerr *
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
+	mail = Mail{ID: id}
+
 	if login.Superadmin {
-		dbconnection.Where(map[string]int64{"ID": id}).Preload("Forwards").Find(&mail)
+		dbconnection.Preload("Forwards").Find(&mail)
 	} else {
-		dbconnection.Where(map[string]int64{"ID": id, "domain.profil": profil.ID}).Preload("Forwards").Find(&mail)
+		dbconnection.Where(map[string]int64{"domain.profil": profil.ID}).Preload("Forwards").Find(&mail)
 	}
 	if mail.ID <= 0 {
 		returnerr = &libapi.ErrorResult{Fields: []string{"mail"}, Message: "not found"}
diff --git a/modul/host/apiweb.go b/modul/host/apiweb.go
index 75dab31..34d5d8f 100644
--- a/modul/host/apiweb.go
+++ b/modul/host/apiweb.go
@@ -36,10 +36,11 @@ func getWeb(ctx context.Context, w http.ResponseWriter) (web Web, returnerr *lib
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
+	web = Web{ID: id}
 	if login.Superadmin {
-		dbconnection.Where(map[string]int64{"ID": id}).Preload("HTTPAccess.Login").Preload("FTPAccess.Login").Find(&web)
+		dbconnection.Preload("HTTPAccess.Login").Preload("FTPAccess.Login").Find(&web)
 	} else {
-		dbconnection.Where(map[string]int64{"ID": id, "domain.profil": profil.ID}).Preload("HTTPAccess.Login").Preload("FTPAccess.Login").Find(&web)
+		dbconnection.Where(map[string]int64{"domain.profil": profil.ID}).Preload("HTTPAccess.Login").Preload("FTPAccess.Login").Find(&web)
 	}
 	if web.ID <= 0 {
 		returnerr = &libapi.ErrorResult{Fields: []string{"web"}, Message: "not found"}