Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1454 → Rev 1455

/branches/v3/impl/conf/app.properties
17,6 → 17,8
user.session.timeout.minutes=60
site.url=@site.url@
 
 
 
#USAR APENAS ESTES DOIS EMAILS NAO DA PARA MAIS
admin.email=@admin.email.1@
admin.email.2=@admin.email.2@
704,8 → 706,8
system.redirections.policy.index.welcome=@system.redirections.policy.index.welcome@
system.redirections.policy.authentication.action=@system.redirections.policy.authentication.action@
system.redirections.policy.authentication.logout.action=@system.redirections.policy.authentication.logout.action@
system.mail.standard.certificated.home.page=@system.mail.standard.certificated.home.page@
 
 
###AQUI PODEMOS USAR OU TRA INTRANET OU OUTRO PORTAL PUBLICO
system.intranet.url=@system.intranet.url@
system.public.url=@system.public.url@
/branches/v3/impl/src/java/pt/estgp/estgweb/Globals.java
139,6 → 139,9
public static final String EMAIL_SERVER_PASSWORD = ConfigProperties.getProperty("email.password");
 
 
 
 
 
public static final String ADMIN_EMAIL = ConfigProperties.getProperty("admin.email");
public static final String ADMIN_EMAIL_2 = ConfigProperties.getProperty("admin.email.2");
 
442,6 → 445,7
 
public static final String ROLE_INVITED = "invited";
 
public static final String SYSTEM_EMAIL_CERTIFICATED_HOME_PAGE = ConfigProperties.getProperty("system.mail.standard.certificated.home.page");
public static final String SYSTEM_THEME = ConfigProperties.getProperty("system.theme");
public static final String AUTHENTICATE_SERVICE = ConfigProperties.getProperty("authentication.policy.service");
public static final String AUTHENTICATE_SERVICE_USERNAME_KEY = ConfigProperties.getProperty("authentication.policy.username.msg.key");
/branches/v3/impl/src/java/pt/estgp/estgweb/services/questionarios/QuestionariosService.java
241,13 → 241,18
// contador++;
// }
 
String suffix = Globals.SYSTEM_EMAIL_CERTIFICATED_HOME_PAGE;
if(suffix.startsWith("/"))
suffix = suffix.substring(1);
String url = Globals.SITE_URL.endsWith("/") ? Globals.SITE_URL + suffix : Globals.SITE_URL + "/" + suffix;
 
EmailPersonalizedCertificated e = sendEmailService.getMessageEmailAdulteredFromEmailIppCertificated(emailFrom,
personFrom,
subject,
msg,
userSession.getUser(),
usersToConsume,
Globals.SITE_URL + "/user/homePae.do");
url);
 
e.setHtml(true);
EMAILJobPersonalizedCertificated emailJob = new EMAILJobPersonalizedCertificated(e);
/branches/v3/impl/build.properties
40,6 → 40,7
authentication.policy.service=Authenticate
authentication.policy.username.msg.key=username
authentication.policy.password.msg.key=password
system.mail.standard.certificated.home.page=/user/home.do
 
#mode.pae.enabled=true
#system.theme=ipp
/branches/v3/impl/build.xml
491,7 → 491,9
<replacefilter token="@system.redirections.policy.index.welcome@" value="${system.redirections.policy.index.welcome}"/>
<replacefilter token="@system.redirections.policy.authentication.action@" value="${system.redirections.policy.authentication.action}"/>
<replacefilter token="@system.redirections.policy.authentication.logout.action@" value="${system.redirections.policy.authentication.logout.action}"/>
<replacefilter token="@system.mail.standard.certificated.home.page@" value="${system.mail.standard.certificated.home.page}"/>
 
 
<replacefilter token="@system.intranet.url@" value="${system.intranet.url}"/>
<replacefilter token="@system.public.url@" value="${system.public.url}"/>