Merge pull request #27 from nicolasmoreau/dev

CNIL conformity
VAMDC · Aug 10, 2015 · 8815f4b · 8815f4b
2 parents 601ae0e + df4cc02
commit 8815f4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/portal.ejb/src/main/java/org/vamdc/portal/cookie/DisclaimerCookie.java b/portal.ejb/src/main/java/org/vamdc/portal/cookie/DisclaimerCookie.java
@@ -23,7 +23,7 @@ public Boolean getValue(){
 	}
 
 	public void setValue(Boolean value){
-		// 5 years expire date
-		cookieHelper.setCookie(this.name, value.toString(), 5 * 365 * 24 * 60 * 60 );
+		// 1 year expire date
+		cookieHelper.setCookie(this.name, value.toString(),  365 * 24 * 60 * 60 );
 	}
 }
diff --git a/portal.war/src/main/webapp/xhtml/disclaimer/disclaimerValidation.xhtml b/portal.war/src/main/webapp/xhtml/disclaimer/disclaimerValidation.xhtml
@@ -8,7 +8,7 @@
 	xmlns:rich="http://richfaces.org/rich">
 
 		<p class="disclaimer">
-			You must accept the following disclaimer to use our services : 
+			You must accept the following disclaimer to use our services ( this will install a cookie on your web browser ) : 
 		</p>
 
 		<h:form class="disclaimer">