Add FTPS to MasterFtpServer

1 files changed, 6 insertions, 5 deletions

diff --git a/src/main/java/org/openslx/imagemaster/server/FtpCredentialsScheduler.java b/src/main/java/org/openslx/imagemaster/server/FtpCredentialsScheduler.java
index c5fad4f..ba88f33 100644
--- a/src/main/java/org/openslx/imagemaster/server/FtpCredentialsScheduler.java
+++ b/src/main/java/org/openslx/imagemaster/server/FtpCredentialsScheduler.java
@@ -7,6 +7,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 import org.apache.log4j.Logger;
+import org.openslx.imagemaster.App;
 import org.openslx.imagemaster.Globals;
 import org.openslx.imagemaster.thrift.iface.FtpCredentials;
 import org.openslx.imagemaster.util.Util;
@@ -21,7 +22,7 @@ public class FtpCredentialsScheduler extends TimerTask
 	public void run()
 	{
 		// check all folders
-		for ( Map.Entry<String, FtpCredentials> entry : Globals.ftpServer.users.entrySet() ) {
+		for ( Map.Entry<String, FtpCredentials> entry : App.ftpServer.users.entrySet() ) {
 			String sessionId = entry.getKey();
 			String username = entry.getValue().username;
 			File dir = new File( Globals.getPropertyString( Globals.PropString.FTPBASEDIR ) + "/" + username );
@@ -32,18 +33,18 @@ public class FtpCredentialsScheduler extends TimerTask
 				if ( ( new Date().getTime() - list[0].lastModified() ) >= timeout ) {
 					log.info( username + "'s files are too old. Deleting him and his folder." );
 					Util.deleteFolder( dir );
-					Globals.ftpServer.removeUser( sessionId );
+					App.ftpServer.removeUser( sessionId );
 				}
 			} else if ( list.length > 1 ) {
 				log.info( username + " uploaded too many files. Deleting his account and his folder." );
 				Util.deleteFolder( dir );
-				Globals.ftpServer.removeUser( sessionId );
+				App.ftpServer.removeUser( sessionId );
 			} else {
 				// check the creation time of the user
-				if ( ( new Date().getTime() - Globals.ftpServer.timeouts.get( username ).getTime() ) >= timeout ) {
+				if ( ( new Date().getTime() - App.ftpServer.timeouts.get( username ).getTime() ) >= timeout ) {
 					// remove user and his folder
 					Util.deleteFolder( dir );
-					Globals.ftpServer.removeUser( sessionId );
+					App.ftpServer.removeUser( sessionId );
 					log.info( username + " did nothing for too long. Deleting him and his folder" );
 				}
 			}