Changeset 27127

Timestamp:

2013-03-26T13:08:13+13:00 (11 years ago)

Author:

sjm84

Message:

The debug information will no longer be inserted if the user is not an admin

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

@@ -199 +199 @@
         {
             Document currentDoc = this.converter.getDOM(currentFile);
-            if (currentDoc == null) {
-                // Can happen if an editor creates an auto-save temporary file 
-                // (such as #header.xsl#) that is not well formed XML
-                continue;
+            if (currentDoc == null)
+            {
+                // Can happen if an editor creates an auto-save temporary file 
+                // (such as #header.xsl#) that is not well formed XML
+                continue;
             }
 
@@ -634 +635 @@
             root.appendChild(filepath);
 
-            if ((output.equals("xml")) || output.equals("json")) {
-                // in the case of "json", calling method responsible for converting to JSON-string
-                return theXML.getDocumentElement();
-            }
-        }
-
+            if ((output.equals("xml")) || output.equals("json"))
+            {
+                // in the case of "json", calling method responsible for converting to JSON-string
+                return theXML.getDocumentElement();
+            }
+        }
 
         Element cgi_param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
@@ -656 +657 @@
             inlineTemplate = (String) params.get(GSParams.INLINE_TEMPLATE);
 
-            if (params.get(GSParams.DEBUG) != null && (((String) params.get(GSParams.DEBUG)).equals("on") || ((String) params.get(GSParams.DEBUG)).equals("1")))
-            {
-                _debug = true;
+            if (params.get(GSParams.DEBUG) != null && (((String) params.get(GSParams.DEBUG)).equals("on") || ((String) params.get(GSParams.DEBUG)).equals("1") || ((String) params.get(GSParams.DEBUG)).equals("true")))
+            {
+                String[] groups = new UserContext(request).getGroups();
+
+                boolean found = false;
+                for (String g : groups)
+                {
+                    if (g.equals("administrator"))
+                    {
+                        found = true;
+                    }
+                }
+                if (found)
+                {
+                    _debug = true;
+                }
             }
         }
@@ -981 +995 @@
         }
 
-        
         // The transformer will now work out the resulting doctype from any set in the (merged) stylesheets and
         // will set this in the output document it creates. So don't pass in any docWithDocType to the transformer