Fix some issues with the ftp connection and the ftp user management

Remove some not needed imports from various files

2 files changed, 3 insertions, 3 deletions

diff --git a/src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java b/src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java
index a9a7fc4..2e480dc 100644
--- a/src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java
+++ b/src/main/java/org/openslx/imagemaster/ftp/ImageProcessor.java
@@ -122,8 +122,8 @@ public class ImageProcessor
 			throw new ImageDataException(ImageDataError.INVALID_DATA, "UUID not valid.");
 		} else if (imageData.imageName.length() < 5 || imageData.imageName.length() > 50) {
 			throw new ImageDataException(ImageDataError.INVALID_DATA, "ImageName not valid. (Length must be 5 to 50)");
-		} else if (DbUser.getUserIdByName( imageData.imageOwner ) != 0) {
-			throw new ImageDataException(ImageDataError.INVALID_DATA, "ImageOwner not valid.");
+		} else if (!DbUser.exists( imageData.imageOwner )) {
+			throw new ImageDataException(ImageDataError.INVALID_DATA, "ImageOwner not known.");
 		} else if ( imageData.fileSize <= 0 ) {
 			throw new ImageDataException(ImageDataError.INVALID_DATA, "Filesize needs to be greater than 0.");
 		}		
diff --git a/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java b/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java
index dff45b5..c24b318 100644
--- a/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java
+++ b/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java
@@ -211,7 +211,7 @@ public class MasterFtpServer implements Runnable
 			authorities.add( new WritePermission() );
 		} else if (mode == Mode.DOWNLOADING) {
 			// the downloading satellite may access the whole dir, but this is restricted in MasterFtplet
-			dir = Globals.getPropertyString( Globals.PropString.FTPBASEDIR );
+			dir = Globals.getPropertyString( Globals.PropString.IMAGEDIR );
 			// downloading satellite is only allowed to read
 			file = fileName;
 		}