# HG changeset patch
# User robcast
# Date 1364294776 -3600
# Node ID 4c7ee297e8604814309927db98fb512d6b1ba6fb
# Parent  00662a0439fcf4bcc0642d27f660560c7915be94
quick fix to make authentication work again in oldskin and greyskin.
needs copying of /oldskin and /greyskin folders into /authenticated.

diff -r 00662a0439fc -r 4c7ee297e860 servlet2/src/main/java/digilib/servlet/DocumentBean.java
--- a/servlet2/src/main/java/digilib/servlet/DocumentBean.java	Tue Mar 26 11:35:43 2013 +0100
+++ b/servlet2/src/main/java/digilib/servlet/DocumentBean.java	Tue Mar 26 11:46:16 2013 +0100
@@ -2,6 +2,7 @@
 
 /*
  * #%L
+ * 
  * DocumentBean -- Access control bean for JSP
  *
  * Digital Image Library servlet components
@@ -165,6 +166,13 @@
 			// shortcut if no authentication
 			return true;
 		}
+		// quick fix: add auth-url-path to base.url
+        if (isAuthRequired(request)) {
+            String baseUrl = request.getAsString("base.url");
+            if (!baseUrl.endsWith(authURLPath)) {
+                request.setValue("base.url", baseUrl + "/" + authURLPath);
+            }
+        }
 		// check if we are already authenticated
 		if (((HttpServletRequest) request.getServletRequest()).getRemoteUser() == null) {
 			logger.debug("unauthenticated so far");
@@ -172,7 +180,7 @@
 			if (isAuthRequired(request)) {
 				logger.debug("auth required, redirect");
 				// we are not yet authenticated -> redirect
-				response.sendRedirect(authURLPath
+				response.sendRedirect(request.getAsString("base.url")
 						+ ((HttpServletRequest) request.getServletRequest())
 								.getServletPath()
 						+ "?"
diff -r 00662a0439fc -r 4c7ee297e860 servlet2/src/main/java/digilib/servlet/Scaler.java
--- a/servlet2/src/main/java/digilib/servlet/Scaler.java	Tue Mar 26 11:35:43 2013 +0100
+++ b/servlet2/src/main/java/digilib/servlet/Scaler.java	Tue Mar 26 11:46:16 2013 +0100
@@ -59,7 +59,7 @@
     private static final long serialVersionUID = -5439198888139362735L;
 
     /** digilib servlet version (for all components) */
-    public static final String version = "2.1b3 noasync";
+    public static final String version = "2.1b4 noasync";
 
     /** servlet error codes */
     public static enum Error {UNKNOWN, AUTH, FILE, IMAGE};
@@ -98,7 +98,7 @@
     protected DigilibServletConfiguration dlConfig;
 
     /** use authorization database */
-    protected boolean useAuthorization = true;
+    protected boolean useAuthorization = false;
 
     /** AuthOps instance */
     protected AuthOps authOp;
diff -r 00662a0439fc -r 4c7ee297e860 servlet3/src/main/java/digilib/servlet/DocumentBean.java
--- a/servlet3/src/main/java/digilib/servlet/DocumentBean.java	Tue Mar 26 11:35:43 2013 +0100
+++ b/servlet3/src/main/java/digilib/servlet/DocumentBean.java	Tue Mar 26 11:46:16 2013 +0100
@@ -6,7 +6,7 @@
  * DocumentBean -- Access control bean for JSP
  *
  * Digital Image Library servlet components
- *
+ * 
  * %%
  * Copyright (C) 2001 - 2013 MPIWG Berlin
  * %%
@@ -166,6 +166,13 @@
 			// shortcut if no authentication
 			return true;
 		}
+		// quick fix: add auth-url-path to base.url
+        if (isAuthRequired(request)) {
+            String baseUrl = request.getAsString("base.url");
+            if (!baseUrl.endsWith(authURLPath)) {
+                request.setValue("base.url", baseUrl + "/" + authURLPath);
+            }
+        }
 		// check if we are already authenticated
 		if (((HttpServletRequest) request.getServletRequest()).getRemoteUser() == null) {
 			logger.debug("unauthenticated so far");
@@ -173,7 +180,7 @@
 			if (isAuthRequired(request)) {
 				logger.debug("auth required, redirect");
 				// we are not yet authenticated -> redirect
-				response.sendRedirect(authURLPath
+				response.sendRedirect(request.getAsString("base.url")
 						+ ((HttpServletRequest) request.getServletRequest())
 								.getServletPath()
 						+ "?"
diff -r 00662a0439fc -r 4c7ee297e860 servlet3/src/main/java/digilib/servlet/Scaler.java
--- a/servlet3/src/main/java/digilib/servlet/Scaler.java	Tue Mar 26 11:35:43 2013 +0100
+++ b/servlet3/src/main/java/digilib/servlet/Scaler.java	Tue Mar 26 11:46:16 2013 +0100
@@ -57,7 +57,7 @@
     private static final long serialVersionUID = 5289386646192471549L;
 
     /** digilib servlet version (for all components) */
-    public static final String version = "2.1b3 async";
+    public static final String version = "2.1b4 async";
 
     /** servlet error codes */
     public static enum Error {