Fix some issues with FtpCredentialsScheduler

Add some options to config file

2 files changed, 12 insertions, 10 deletions

diff --git a/src/main/java/org/openslx/imagemaster/db/ImageProcessor.java b/src/main/java/org/openslx/imagemaster/db/ImageProcessor.java
index 8c8bd8c..de545ae 100644
--- a/src/main/java/org/openslx/imagemaster/db/ImageProcessor.java
+++ b/src/main/java/org/openslx/imagemaster/db/ImageProcessor.java
@@ -28,8 +28,8 @@ public class ImageProcessor {
 				+ "'");
 
 		// move image to right location
-		String oldFileName = Globals.properties.getProperty("ftp_base_dir") + "/" + username + "/" + filename;
-		String newFileName = Globals.properties.getProperty("image_dir") + "/" + images.get(username).uuid;
+		String oldFileName = Globals.getPropertyString( Globals.PropString.FTPBASEDIR ) + "/" + username + "/" + filename;
+		String newFileName = Globals.getPropertyString( Globals.PropString.IMAGEDIR ) + "/" + images.get(username).uuid;
 		
 		File imageFile = new File(oldFileName);
 		
@@ -42,7 +42,7 @@ public class ImageProcessor {
 		
 		log.info("Moved file from " + oldFileName + " to " + newFileName );
 		
-		File tempUserDir = new File (Globals.properties.getProperty("ftp_base_dir") + "/" + username);
+		File tempUserDir = new File (Globals.getPropertyString( Globals.PropString.FTPBASEDIR ) + "/" + username);
 		tempUserDir.delete();
 		
 		// update database
@@ -54,7 +54,7 @@ public class ImageProcessor {
 	}
 
 	/**
-	 * Try to add imageData to db
+	 * Try to add imageData to database.
 	 * 
 	 * @param imageData
 	 *            the data for the image to add
diff --git a/src/main/java/org/openslx/imagemaster/db/LdapUser.java b/src/main/java/org/openslx/imagemaster/db/LdapUser.java
index 1124696..0a18565 100644
--- a/src/main/java/org/openslx/imagemaster/db/LdapUser.java
+++ b/src/main/java/org/openslx/imagemaster/db/LdapUser.java
@@ -15,6 +15,8 @@ import org.apache.directory.ldap.client.api.LdapConnectionConfig;
 import org.apache.directory.ldap.client.api.LdapNetworkConnection;
 import org.apache.log4j.Logger;
 import org.openslx.imagemaster.Globals;
+import org.openslx.imagemaster.Globals.PropBool;
+import org.openslx.imagemaster.Globals.PropString;
 import org.openslx.imagemaster.session.User;
 import org.openslx.imagemaster.thrift.iface.AuthenticationError;
 import org.openslx.imagemaster.thrift.iface.AuthenticationException;
@@ -73,16 +75,16 @@ public class LdapUser extends User
 		
 		LdapConnectionConfig ldapConfig = new LdapConnectionConfig();
 		ldapConfig.setTrustManagers(new MyTrustManager());
-		ldapConfig.setLdapPort(Integer.valueOf(Globals.properties.getProperty(Globals.ldapPort)));
-		ldapConfig.setLdapHost(Globals.properties.getProperty(Globals.ldapHost));
-		ldapConfig.setUseSsl(Boolean.valueOf(Globals.properties.getProperty(Globals.ldapSsl)));
+		ldapConfig.setLdapPort(Globals.getPropertyInt( Globals.PropInt.LDAPPORT ));
+		ldapConfig.setLdapHost(Globals.getPropertyString( Globals.PropString.LDAPHOST ));
+		ldapConfig.setUseSsl(Globals.getPropertyBool( PropBool.LDAPSSL ));
 		
 		LdapNetworkConnection connection = new LdapNetworkConnection( ldapConfig );
 		
 		// bind connection
 		try {
 			if ( connection.connect() ) {
-				String name = Globals.properties.getProperty(Globals.ldapBindQuery).replace("%", username);
+				String name = Globals.getPropertyString( PropString.LDAPBINDQUERY ).replace("%", username);
 				connection.bind(name, password);
 			}
 		} catch (LdapException e1) {
@@ -112,8 +114,8 @@ public class LdapUser extends User
 		
 		// make search query
 		try {
-			EntryCursor cursor = connection.search(Globals.properties.getProperty(Globals.ldapSearchBaseDn),
-					Globals.properties.getProperty(Globals.ldapSearchFilter).replace("%", username), SearchScope.SUBTREE);
+			EntryCursor cursor = connection.search(Globals.getPropertyString( Globals.PropString.LDAPSEARCHBASEDN ),
+					Globals.getPropertyString( Globals.PropString.LDAPSEARCHFILTER ).replace("%", username), SearchScope.SUBTREE);
 			// only use the first result
 			cursor.next();
 			Entry entry = cursor.get();