2 files changed, 30 insertions, 1 deletions

diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java
index ab23e238..143df335 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java
@@ -127,6 +127,7 @@ public class PdfAsHelper {
 	private static final String PRE_PROCESSOR_MAP = "PREPROCMAP";
 	private static final String OVERWRITE_MAP = "OVERWRITEMAP";
 	private static final String KEYID = "KEYID";
+	private static final String SESSION_ACCESS = "SESSION_ACCESS";
 
 	private static final String POSITIONING_URL = "/assets/js/pdf.js/web/viewer.html";
 
@@ -1229,7 +1230,7 @@ public class PdfAsHelper {
 	}
 
 	public static void regenerateSession(HttpServletRequest request) {
-		request.getSession(false).invalidate();
+		request.getSession(true).invalidate();
 		request.getSession(true);
 	}
 
@@ -1539,6 +1540,25 @@ public class PdfAsHelper {
 		}
 		return false;
 	}
+	
+	public static boolean isSessionAccessCounter(HttpServletRequest request) {
+		HttpSession session = request.getSession();
+		Object obj = session.getAttribute(SESSION_ACCESS);
+		if (obj == null) {
+			Integer value = 0;
+			session.setAttribute(SESSION_ACCESS, value);
+			obj = value;
+		} 
+		
+		if (obj instanceof Integer) {
+			Integer count = (Integer) obj;
+			count++;
+			session.setAttribute(SESSION_ACCESS, count);
+			return (count < WebConfiguration.getAccessCount());
+		} else {
+			return false;
+		}
+	}
 
 	public static String getVersion() {
 		return PdfAsFactory.getVersion();
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsParameterExtractor.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsParameterExtractor.java
index 53335ba6..f701ca63 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsParameterExtractor.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsParameterExtractor.java
@@ -75,6 +75,7 @@ public class PdfAsParameterExtractor {
 	public static final String PARAM_OVERWRITE_PREFIX = "ov:";
 	public static final String PARAM_QRCODE_CONTENT = "qrcontent";
 	public static final String PARAM_USER_POSITIONING = "upos";
+	public static final String PARAM_BASE64 = "base64";
 	
 	public static boolean isUserPositioning(HttpServletRequest request) {
 		String paramerterValue = (String)request.getAttribute(PARAM_USER_POSITIONING);
@@ -84,6 +85,14 @@ public class PdfAsParameterExtractor {
 		return false;
 	}
 	
+	public static boolean isBase64(HttpServletRequest request) {
+		String paramerterValue = (String)request.getAttribute(PARAM_BASE64);
+		if(paramerterValue != null) {
+			return Boolean.parseBoolean(paramerterValue);
+		} 
+		return false;
+	}
+	
 	public static String getConnector(HttpServletRequest request) {
 		String connector = (String)request.getAttribute(PARAM_CONNECTOR);
 		if(connector != null) {