[Yanel-commits] rev 22675 - public/yanel/trunk/src/core/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2007-02-15 11:24:45 +0100 (Thu, 15 Feb 2007)
New Revision: 22675

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
toolbar master switch implemented

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-02-15 10:24:16 UTC (rev 22674)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-02-15 10:24:45 UTC (rev 22675)
@@ -93,6 +93,7 @@
     private static final String METHOD_DELETE = "DELETE";
 
     private String sslPort = null;
+    private String toolbarMasterSwitch = "off";
     
     public static final String DEFAULT_ENCODING = "UTF-8";
 
@@ -115,6 +116,7 @@
             sitetree = (Sitetree) yanel.getBeanFactory().getBean("nav-sitetree");
 
             sslPort = config.getInitParameter("ssl-port");
+            toolbarMasterSwitch = config.getInitParameter("toolbar-master-switch");
             
         } catch (Exception e) {
             log.error(e);
@@ -188,10 +190,8 @@
                 log.error("DEBUG: Turn off toolbar!");
                 session.setAttribute(TOOLBAR_KEY, "off");
             } else {
-                log.error("DEBUG: No such toolbar value: " + yanelToolbar);
+                log.warn("No such toolbar value: " + yanelToolbar);
             }
-        } else {
-            log.error("DEBUG: No toolbar parameter!");
         }
 
         String yanelWebDAV = request.getParameter("yanel.webdav");
@@ -203,9 +203,15 @@
 
         String toolbar = (String) session.getAttribute(TOOLBAR_KEY);
         if (toolbar != null && toolbar.equals("on")) {
-            log.error("DEBUG: Embed toolbar ...");
-            getContent(request, response);
+            if (toolbarMasterSwitch.equals("on")) {
+                log.error("DEBUG: Embed toolbar ...");
+                getContent(request, response);
+            } else {
+                log.error("DEBUG: Toolbar has been disabled. Please check web.xml!");
+                getContent(request, response);
+            }
         } else {
+            log.error("DEBUG: Do not add toolbar!");
             getContent(request, response);
         }
     }