Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 922 → Rev 923

/impl/src/java/pt/estgp/estgweb/services/ftpservices/FtpService.java
63,7 → 63,7
//E A POP3PASS DAVA PROBLEMAS SE O USER ALGUMA VEZ A TINHA INICIADO
String passwordCode = (String) ((UserSessionImpl)userSession).get(FTP_PASSWORD);
 
System.out.println("SAVEDCODE"+passwordCode);
//System.out.println("SAVEDCODE"+passwordCode);
 
if(password != null && password.trim().length() > 0)
{
73,7 → 73,7
{
logger.info("using saved password");
password = DesUtils.getInstance().decrypt(passwordCode);
System.out.println("SAVEDPASS:" + password);
//System.out.println("SAVEDPASS:" + password);
}
else if(userSession.getUser().getPop3password() != null && userSession.getUser().getPop3password().length() > 0)
{
/impl/src/java/pt/estgp/estgweb/domain/UserImpl.java
1,7 → 1,5
package pt.estgp.estgweb.domain;
 
import jomm.utils.DesUtils;
 
/**
* @author Jorge Machado
* @date 2/Mar/2008
108,8 → 106,8
return false;
}
 
public String getPop3PassDecrypted()
/*public String getPop3PassDecrypted()
{
return DesUtils.getInstance().decrypt(getPop3password());
}
}*/
}
/impl/src/java/pt/estgp/estgweb/web/LayoutController.java
1,5 → 1,6
package pt.estgp.estgweb.web;
 
import jomm.utils.DesUtils;
import jomm.web.ftp.IFile;
import jomm.web.ftp.impl.FtpFile;
import jomm.web.utils.NavPlace;
10,8 → 11,9
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import pt.estgp.estgweb.domain.UserImpl;
import pt.estgp.estgweb.domain.UserSession;
import pt.estgp.estgweb.domain.UserSessionImpl;
import pt.estgp.estgweb.services.ftpservices.FtpService;
import pt.estgp.estgweb.utils.ConfigProperties;
import pt.estgp.estgweb.web.controllers.ApplicationDispatchController;
import pt.estgp.estgweb.web.exceptions.NotAuthorizedException;
149,7 → 151,9
{
logger.warn("Will access using user and pass authnenticated to connect FTP " + serverStr);
user= username;
pass= ((UserImpl)userSession.getUser()).getPop3PassDecrypted();
String passwordCode = (String) ((UserSessionImpl)userSession).get(FtpService.FTP_PASSWORD);
pass= DesUtils.getInstance().decrypt(passwordCode);
//pass= ((UserImpl)userSession.getUser()).getPop3PassDecrypted();
}
FtpServer ftpServer = FtpServer.getNewServer(server, user, pass);
FTPClient client = ftpServer.getClient();