Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1369 → Rev 1371

/branches/v3/impl/src/java/pt/estgp/estgweb/services/users/UserRoleConfigService.java
154,6 → 154,7
private static final String INIT_ROLES = "user.role.all=Todos\n" +
"user.role.admin=Administrador\n" +
"user.role.student=Estudante\n" +
"user.role.comissao.avaliacao.desempenho.docente=Comissão de Avaliação de Desempenho Docente\n" +
"user.role.erasmusStudent=Estudante de Erasmus\n" +
"user.role.teacher=Professor\n" +
"user.role.teacher.eg=Professor da Área de Engenharia\n" +
/branches/v3/impl/src/java/pt/estgp/estgweb/web/FTPFileProxy.java
102,7 → 102,7
{
//FALHOU PODE A PASS DO USER NAO DAR POR NAO ESTAR NO FTP
//TEM DE VERIFICAR SE PODE USAR DEFAULTS QUANDO AUTENTICACAO FALHA
if(userSession.getUsername() != null &&
if(userSession != null && userSession.getUsername() != null &&
ConfigProperties
.getBooleanProperty(
server + ".use.default.credentials.to.read.if.user.fail.when.authenticated"))
121,7 → 121,7
 
return ftpServer.getClient();
}
else if(userSession.getUsername() != null &&
else if(userSession != null && userSession.getUsername() != null &&
!ConfigProperties
.getBooleanProperty(
server + ".use.default.credentials.to.read.if.user.fail.when.authenticated"))
169,6 → 169,7
if(path != null)
{
String serverUrl = pt.estgp.estgweb.utils.ConfigProperties.getProperty("server." + server);
String startPath = pt.estgp.estgweb.utils.ConfigProperties.getProperty("server." + server + ".start.path");
String remoteName = path.substring(path.lastIndexOf("/")+1);
String remoteDirectory = path.substring(0,path.lastIndexOf("/"));
FtpServer ftpServer = FtpServer.getNewServer(serverUrl,username,password);
182,6 → 183,15
return;
}
 
if(startPath.length() > 0)
{
if(remoteDirectory.startsWith("/"))
remoteDirectory = startPath + remoteDirectory;
else
remoteDirectory = startPath + "/" + remoteDirectory;
}
 
 
client.changeWorkingDirectory(remoteDirectory);