--- a/pkg/controllers/wpimports.go	Tue Feb 12 10:50:03 2019 +0100
+++ b/pkg/controllers/wpimports.go	Tue Feb 12 11:09:55 2019 +0100
@@ -14,21 +14,16 @@
 package controllers
 
 import (
-	"bufio"
 	"fmt"
-	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
-	"os"
-	"path/filepath"
 	"strconv"
 	"time"
 
 	"gemma.intevation.de/gemma/pkg/auth"
 	"gemma.intevation.de/gemma/pkg/common"
-	"gemma.intevation.de/gemma/pkg/config"
 	"gemma.intevation.de/gemma/pkg/imports"
+	"gemma.intevation.de/gemma/pkg/misc"
 )
 
 const (
@@ -36,42 +31,6 @@
 	waterwayProfilesName    = "wp"
 )
 
-func storeWaterwayProfiles(req *http.Request) (string, error) {
-
-	// Check for direct upload.
-	f, _, err := req.FormFile(waterwayProfilesName)
-	if err != nil {
-		return "", err
-	}
-	defer f.Close()
-
-	dir, err := ioutil.TempDir(config.TmpDir(), waterwayProfilesName)
-	if err != nil {
-		return "", err
-	}
-
-	o, err := os.Create(filepath.Join(dir, "wp.csv"))
-	if err != nil {
-		os.RemoveAll(dir)
-		return "", err
-	}
-
-	out := bufio.NewWriter(o)
-
-	if _, err = io.Copy(out, io.LimitReader(f, maxWaterwayProfilesSize)); err != nil {
-		o.Close()
-		os.RemoveAll(dir)
-		return "", err
-	}
-
-	if err = out.Flush(); err != nil {
-		o.Close()
-		os.RemoveAll(dir)
-		return "", err
-	}
-
-	return dir, nil
-}
 func importWaterwayProfiles(rw http.ResponseWriter, req *http.Request) {
 
 	url := req.FormValue("url")
@@ -86,7 +45,11 @@
 		return
 	}
 
-	dir, err := storeWaterwayProfiles(req)
+	dir, err := misc.StoreUploadedFile(
+		req,
+		waterwayProfilesName,
+		"wp.csv",
+		maxWaterwayProfilesSize)
 	if err != nil {
 		log.Printf("error: %v\n", err)
 		http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError)