Menu
▾
▴
[jboss-cvs] jboss-portal/core/src/main/org/jboss/portal/core/portlet/cms/admin ...
|
From: Martin H. <mho...@no...> - 2005-07-22 19:54:27
|
User: mholzner
Date: 05/07/22 15:53:13
Modified: core/src/main/org/jboss/portal/core/portlet/cms/admin
AdminCMSPortlet.java
Log:
removed Item and moved the Item functionality to WindowContext (a page region contains a list of WindowContext items)
Revision Changes Path
1.18 +117 -109 jboss-portal/core/src/main/org/jboss/portal/core/portlet/cms/admin/AdminCMSPortlet.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AdminCMSPortlet.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/portlet/cms/admin/AdminCMSPortlet.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- AdminCMSPortlet.java 23 May 2005 22:42:05 -0000 1.17
+++ AdminCMSPortlet.java 22 Jul 2005 19:53:13 -0000 1.18
@@ -20,14 +20,22 @@
import org.jboss.portal.core.portlet.cms.WebDAVUtil;
import org.jboss.portal.core.portlet.cms.admin.security.AdminCMSSecurityConstants;
import org.jboss.portal.core.security.jaas.IdentityPropagationLoginModule;
-import org.jboss.portlet.*;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
+import org.jboss.portlet.JBossPortlet;
+import org.jboss.portlet.JBossRenderRequest;
+import org.jboss.portlet.JBossRenderResponse;
import javax.portlet.PortletRequest;
import javax.portlet.PortletSecurityException;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.util.*;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
/**
* Handles admin requests to deal with content.
@@ -88,7 +96,7 @@
// System.setProperty("javax.net.ssl.trustStore", c_truststore);
// System.setProperty("javax.net.ssl.trustStorePassword", "changeit");
String userName = req.getRemoteUser();
- if(userName == null)
+ if (userName == null)
{
throw new PortletSecurityException("Not logged in.");
}
@@ -102,7 +110,7 @@
HttpURL rootUrl = null;
try
{
- if(wdURL.startsWith("https"))
+ if (wdURL.startsWith("https"))
{
rootUrl = new HttpsURL(wdURL);
}
@@ -115,7 +123,7 @@
// wdResource = new WebdavResource(rootUrl, WebdavResource.NOACTION, 0, true);
job.perform(wdResource);
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
@@ -139,20 +147,20 @@
protected void doView(final JBossRenderRequest rReq, final JBossRenderResponse rRes) throws javax.portlet.PortletException, IOException, javax.portlet.UnavailableException
{
String op = rReq.getParameter("op");
- if(op == null)
+ if (op == null)
{
op = AdminCMSConstants.OP_MAIN;
}
- else if(AdminCMSConstants.PERM_FAIL.equals(op))
+ else if (AdminCMSConstants.PERM_FAIL.equals(op))
{
forbidden(rReq, rRes);
}
// all directory admins need access to this page.
- if(AdminCMSConstants.OP_MAIN.equals(op)) // main list page.
+ if (AdminCMSConstants.OP_MAIN.equals(op)) // main list page.
{
boolean bAuth = rReq.hasPermission(AdminCMSSecurityConstants.GLOBALREAD);
- if(bAuth)
+ if (bAuth)
{
perform(new Job()
{
@@ -161,11 +169,11 @@
try
{
String sPath = rReq.getParameter("path");
- if(sPath != null)
+ if (sPath != null)
{
wdUtil.setCurrentPath(wdResource, sPath);
}
- if(!wdResource.isCollection())
+ if (!wdResource.isCollection())
{
wdUtil.setCurrentPath(wdResource, sRootPath);
}
@@ -178,7 +186,7 @@
javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(AdminCMSConstants.CMS_JSP_PATH + "/list.jsp");
prd.include(rReq, rRes);
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
@@ -190,7 +198,7 @@
forbidden(rReq, rRes);
}
}
- else if(AdminCMSConstants.OP_CONFIRMDELETE.equals(op))
+ else if (AdminCMSConstants.OP_CONFIRMDELETE.equals(op))
{
perform(new Job()
{
@@ -200,7 +208,7 @@
{
String sPath = rReq.getParameter("path");
String[] subAuth = new String[]{wdUtil.getSecuredRoot(sPath, sRootPath)};
- if(rReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
+ if (rReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
{
rRes.setContentType("text/html");
rReq.setAttribute("deletepath", sPath);
@@ -212,14 +220,14 @@
forbidden(rReq, rRes);
}
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
}
}, rReq);
}
- else if(AdminCMSConstants.OP_CONFIRM_CREATE_COLLECTION.equals(op))
+ else if (AdminCMSConstants.OP_CONFIRM_CREATE_COLLECTION.equals(op))
{
perform(new Job()
{
@@ -229,7 +237,7 @@
{
String sPath = rReq.getParameter("path");
String[] subAuth = new String[]{wdUtil.getSecuredRoot(sPath, sRootPath)};
- if(rReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
+ if (rReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
{
rRes.setContentType("text/html");
rReq.setAttribute("createpath", sPath);
@@ -241,14 +249,14 @@
forbidden(rReq, rRes);
}
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
}
}, rReq);
}
- else if(AdminCMSConstants.OP_CONFIRMCOPY.equals(op))
+ else if (AdminCMSConstants.OP_CONFIRMCOPY.equals(op))
{
perform(new Job()
{
@@ -259,18 +267,18 @@
String sPath = rReq.getParameter("path");
String sNavPath = rReq.getParameter("navpath");
String[] subAuth = new String[]{wdUtil.getSecuredRoot(sPath, sRootPath)};
- if(rReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
+ if (rReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
{
- if(sPath != null)
+ if (sPath != null)
{
- if(sNavPath == null)
+ if (sNavPath == null)
{
wdUtil.setCurrentPath(wdResource, sRootPath);
rReq.setAttribute("currpath", sRootPath);
}
else
{
- if(!wdUtil.fetchParentPath(sRootPath + "/").equals(sNavPath)) // don't move above file root
+ if (!wdUtil.fetchParentPath(sRootPath + "/").equals(sNavPath)) // don't move above file root
{
wdUtil.setCurrentPath(wdResource, wdUtil.cleanDoubleSlashes(sNavPath));
rReq.setAttribute("currpath", sNavPath);
@@ -295,14 +303,14 @@
forbidden(rReq, rRes);
}
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
}
}, rReq);
}
- else if(AdminCMSConstants.OP_CONFIRMMOVE.equals(op))
+ else if (AdminCMSConstants.OP_CONFIRMMOVE.equals(op))
{
perform(new Job()
{
@@ -312,19 +320,19 @@
{
String sPath = rReq.getParameter("path");
String sNavPath = rReq.getParameter("navpath");
- if(sPath != null)
+ if (sPath != null)
{
String[] subAuth = new String[]{wdUtil.getSecuredRoot(sPath, sRootPath)};
- if(rReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
+ if (rReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
{
- if(sNavPath == null)
+ if (sNavPath == null)
{
wdUtil.setCurrentPath(wdResource, sRootPath);
rReq.setAttribute("currpath", sRootPath);
}
else
{
- if(!wdUtil.fetchParentPath(sRootPath + "/").equals(sNavPath)) // don't move above file root
+ if (!wdUtil.fetchParentPath(sRootPath + "/").equals(sNavPath)) // don't move above file root
{
wdUtil.setCurrentPath(wdResource, wdUtil.cleanDoubleSlashes(sNavPath));
rReq.setAttribute("currpath", sNavPath);
@@ -349,14 +357,14 @@
prd.include(rReq, rRes);
}
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
}
}, rReq);
}
- else if(AdminCMSConstants.OP_EDIT.equals(op))
+ else if (AdminCMSConstants.OP_EDIT.equals(op))
{
perform(new Job()
{
@@ -368,7 +376,7 @@
String sLivePath = rReq.getParameter("livepath");
String sVersion = rReq.getParameter("version");
String sSecurityPath = null;
- if(sLivePath == null)
+ if (sLivePath == null)
{
sSecurityPath = sPath;
}
@@ -378,16 +386,16 @@
}
String[] subAuth = new String[]{wdUtil.getSecuredRoot(sSecurityPath, sRootPath)};
- if(rReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
+ if (rReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
{
- if(sPath != null)
+ if (sPath != null)
{
String sContent = wdResource.getMethodDataAsString(sPath);
rReq.setAttribute("content", sContent);
}
rRes.setContentType("text/html");
- if(sLivePath != null)
+ if (sLivePath != null)
{
rReq.setAttribute("path", sLivePath);
}
@@ -395,7 +403,7 @@
{
rReq.setAttribute("path", sPath);
}
- if(sVersion != null)
+ if (sVersion != null)
{
rReq.setAttribute("version", sVersion);
}
@@ -409,7 +417,7 @@
forbidden(rReq, rRes);
}
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
@@ -421,7 +429,7 @@
javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(AdminCMSConstants.CMS_JSP_PATH + "/edit.jsp");
prd.include(rReq, rRes);
}
- else if(AdminCMSConstants.OP_CREATENEWTEXT.equals(op))
+ else if (AdminCMSConstants.OP_CREATENEWTEXT.equals(op))
{
perform(new Job()
{
@@ -432,11 +440,11 @@
String sPath = rReq.getParameter("path");
String sNavPath = rReq.getParameter("navpath");
String[] subAuth = new String[]{wdUtil.getSecuredRoot(sPath, sRootPath)};
- if(rReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
+ if (rReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
{
- if(sPath != null)
+ if (sPath != null)
{
- if(sNavPath == null)
+ if (sNavPath == null)
{
wdUtil.setCurrentPath(wdResource, sRootPath);
rReq.setAttribute("path", sPath);
@@ -444,7 +452,7 @@
}
else
{
- if(!wdUtil.fetchParentPath(sRootPath + "/").equals(wdUtil.cleanDoubleSlashes(sNavPath))) // don't move above file root
+ if (!wdUtil.fetchParentPath(sRootPath + "/").equals(wdUtil.cleanDoubleSlashes(sNavPath))) // don't move above file root
{
wdUtil.setCurrentPath(wdResource, sNavPath);
rReq.setAttribute("currpath", sNavPath);
@@ -475,7 +483,7 @@
forbidden(rReq, rRes);
}
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
@@ -489,11 +497,11 @@
javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(AdminCMSConstants.CMS_JSP_PATH + "/create.jsp");
prd.include(rReq, rRes);
}
- else if(AdminCMSConstants.OP_VIEWFILE.equals(op))
+ else if (AdminCMSConstants.OP_VIEWFILE.equals(op))
{
String sPath = rReq.getParameter("path");
String[] subAuth = new String[]{wdUtil.getSecuredRoot(sPath, sRootPath)};
- if(rReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
+ if (rReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
{
perform(new Job()
{
@@ -515,7 +523,7 @@
Enumeration ePropertyValues = wdResource.reportMethod(new HttpURL(rReq.getParameter("path")), DepthSupport.DEPTH_INFINITY);
rReq.setAttribute("versions", ePropertyValues);
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
@@ -532,7 +540,7 @@
forbidden(rReq, rRes);
}
}
- else if(AdminCMSConstants.OP_UPLOADCONFIRM.equals(op)) // upload screen for new content
+ else if (AdminCMSConstants.OP_UPLOADCONFIRM.equals(op)) // upload screen for new content
{
perform(new Job()
{
@@ -542,9 +550,9 @@
{
String sPath = rReq.getParameter("path");
String sNavPath = rReq.getParameter("navpath");
- if(sPath != null)
+ if (sPath != null)
{
- if(sNavPath == null)
+ if (sNavPath == null)
{
wdUtil.setCurrentPath(wdResource, sRootPath);
rReq.setAttribute("path", sPath);
@@ -553,7 +561,7 @@
else
{
sNavPath = wdUtil.cleanDoubleSlashes(sNavPath);
- if(!wdUtil.fetchParentPath(sRootPath + "/").equals(wdUtil.cleanDoubleSlashes(sNavPath))) // don't move above file root
+ if (!wdUtil.fetchParentPath(sRootPath + "/").equals(wdUtil.cleanDoubleSlashes(sNavPath))) // don't move above file root
{
wdUtil.setCurrentPath(wdResource, sNavPath);
rReq.setAttribute("currpath", sNavPath);
@@ -581,14 +589,14 @@
javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(AdminCMSConstants.CMS_JSP_PATH + "/upload.jsp");
prd.include(rReq, rRes);
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
}
}, rReq);
}
- else if(AdminCMSConstants.OP_EDIT_BINARY.equals(op))
+ else if (AdminCMSConstants.OP_EDIT_BINARY.equals(op))
{
perform(new Job()
{
@@ -597,7 +605,7 @@
try
{
String sPath = rReq.getParameter("path");
- if(sPath != null)
+ if (sPath != null)
{
rRes.setContentType("text/html");
rReq.setAttribute("path", sPath);
@@ -605,7 +613,7 @@
javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(AdminCMSConstants.CMS_JSP_PATH + "/editbinary.jsp");
prd.include(rReq, rRes);
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
@@ -646,7 +654,7 @@
try
{
String op = aReq.getParameter("op");
- if(AdminCMSConstants.OP_CHANGE_DIR.equals(op))
+ if (AdminCMSConstants.OP_CHANGE_DIR.equals(op))
{
perform(new Job()
{
@@ -654,9 +662,9 @@
{
String sPath = aReq.getParameter("path");
String[] subAuth = new String[]{wdUtil.getSecuredRoot(sPath, sRootPath)};
- if(aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
+ if (aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
{
- if(sPath != null)
+ if (sPath != null)
{
aRes.setRenderParameter("op", AdminCMSConstants.OP_MAIN);
aRes.setRenderParameter("path", sPath);
@@ -669,25 +677,25 @@
}
}, aReq);
}
- else if(AdminCMSConstants.OP_DISPLAY_PARENT_DIR.equals(op))
+ else if (AdminCMSConstants.OP_DISPLAY_PARENT_DIR.equals(op))
{
perform(new Job()
{
public void perform(WebdavResource wdResource)
{
String sPath = aReq.getParameter("path");
- if(sPath != null)
+ if (sPath != null)
{
try
{
- if(!(sRootPath + "/").equalsIgnoreCase(sPath) &&
+ if (!(sRootPath + "/").equalsIgnoreCase(sPath) &&
!(sRootPath + "//").equalsIgnoreCase(sPath)) // don't move above root /files.
{
aRes.setRenderParameter("op", AdminCMSConstants.OP_MAIN);
aRes.setRenderParameter("path", wdUtil.fetchParentPath(sPath));
}
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
@@ -695,7 +703,7 @@
}
}, aReq);
}
- else if(AdminCMSConstants.OP_CREATE_COLLECTION.equals(op))
+ else if (AdminCMSConstants.OP_CREATE_COLLECTION.equals(op))
{
perform(new Job()
{
@@ -703,16 +711,16 @@
{
String sCreatePath = aReq.getParameter("createpath");
String sNewCollection = aReq.getParameter("newcollection");
- if(sCreatePath != null && sNewCollection != null)
+ if (sCreatePath != null && sNewCollection != null)
{
String[] subAuth = new String[]{wdUtil.getSecuredRoot(sCreatePath, sRootPath)};
- if(aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
+ if (aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
{
try
{
String sNewFullPath = wdUtil.cleanDoubleSlashes(sCreatePath + "/" + sNewCollection);
boolean isCreated = wdResource.mkcolMethod(sNewFullPath);
- if(isCreated)
+ if (isCreated)
{
aRes.setRenderParameter("op", AdminCMSConstants.OP_MAIN);
aRes.setRenderParameter("path", sNewFullPath);
@@ -722,7 +730,7 @@
// TODO: create coll failed.
}
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
@@ -735,7 +743,7 @@
}
}, aReq);
}
- else if(AdminCMSConstants.OP_DELETE.equals(op))
+ else if (AdminCMSConstants.OP_DELETE.equals(op))
{
perform(new Job()
{
@@ -743,10 +751,10 @@
{
String sSubmit = aReq.getParameter("submit");
String sDeletePath = aReq.getParameter("deletepath");
- if(sDeletePath != null && "DELETE".equals(sSubmit))
+ if (sDeletePath != null && "DELETE".equals(sSubmit))
{
String[] subAuth = new String[]{wdUtil.getSecuredRoot(sDeletePath, sRootPath)};
- if(aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
+ if (aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
{
try
{
@@ -755,7 +763,7 @@
aRes.setRenderParameter("op", AdminCMSConstants.OP_MAIN);
aRes.setRenderParameter("path", sNewPath);
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
@@ -773,7 +781,7 @@
}
}, aReq);
}
- else if(AdminCMSConstants.OP_COPY.equals(op))
+ else if (AdminCMSConstants.OP_COPY.equals(op))
{
perform(new Job()
{
@@ -781,11 +789,11 @@
{
String sCopyToPath = aReq.getParameter("copytopath");
String sCopyFromPath = aReq.getParameter("copyoldpath");
- if(sCopyFromPath != null && sCopyToPath != null)
+ if (sCopyFromPath != null && sCopyToPath != null)
{
String[] subAuth = new String[]{wdUtil.getSecuredRoot(sCopyToPath, sRootPath)};
String[] subAuth2 = new String[]{wdUtil.getSecuredRoot(sCopyFromPath, sRootPath)};
- if(aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY) && aReq.hasPermission(subAuth2, AdminCMSSecurityConstants.ADMINDIRECTORY))
+ if (aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY) && aReq.hasPermission(subAuth2, AdminCMSSecurityConstants.ADMINDIRECTORY))
{
try
{
@@ -795,7 +803,7 @@
aRes.setRenderParameter("op", AdminCMSConstants.OP_MAIN);
aRes.setRenderParameter("path", sCopyToPath);
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
@@ -808,7 +816,7 @@
}
}, aReq);
}
- else if(AdminCMSConstants.OP_MOVE.equals(op))
+ else if (AdminCMSConstants.OP_MOVE.equals(op))
{
perform(new Job()
{
@@ -816,11 +824,11 @@
{
String sMoveToPath = aReq.getParameter("movetopath");
String sMoveFromPath = aReq.getParameter("moveoldpath");
- if(sMoveFromPath != null && sMoveToPath != null)
+ if (sMoveFromPath != null && sMoveToPath != null)
{
String[] subAuth = new String[]{wdUtil.getSecuredRoot(sMoveToPath, sRootPath)};
String[] subAuth2 = new String[]{wdUtil.getSecuredRoot(sMoveFromPath, sRootPath)};
- if(aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY) && aReq.hasPermission(subAuth2, AdminCMSSecurityConstants.ADMINDIRECTORY))
+ if (aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY) && aReq.hasPermission(subAuth2, AdminCMSSecurityConstants.ADMINDIRECTORY))
{
try
{
@@ -830,7 +838,7 @@
aRes.setRenderParameter("op", AdminCMSConstants.OP_MAIN);
aRes.setRenderParameter("path", sMoveToPath);
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
@@ -843,7 +851,7 @@
}
}, aReq);
}
- else if(AdminCMSConstants.OP_SAVENEWTEXT.equals(op)) // Creates
+ else if (AdminCMSConstants.OP_SAVENEWTEXT.equals(op)) // Creates
{
perform(new Job()
{
@@ -854,10 +862,10 @@
String sPath = aReq.getParameter("path");
String sFileName = aReq.getParameter("filename");
String sDirectory = aReq.getParameter("savetopath");
- if(sPath != null && sFileName != null && sDirectory != null)
+ if (sPath != null && sFileName != null && sDirectory != null)
{
String[] subAuth = new String[]{wdUtil.getSecuredRoot(sDirectory, sRootPath)};
- if(aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
+ if (aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
{
String sContent = aReq.getParameter("elm1");
String sNewFilePath = wdUtil.cleanDoubleSlashes(sDirectory + "/" + sFileName);
@@ -871,14 +879,14 @@
}
}
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
}
}, aReq);
}
- else if(AdminCMSConstants.OP_SAVETEXT.equals(op)) // Updates
+ else if (AdminCMSConstants.OP_SAVETEXT.equals(op)) // Updates
{
perform(new Job()
{
@@ -887,10 +895,10 @@
try
{
String sPath = aReq.getParameter("path");
- if(sPath != null)
+ if (sPath != null)
{
String[] subAuth = new String[]{wdUtil.getSecuredRoot(sPath, sRootPath)};
- if(aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
+ if (aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
{
String sContent = aReq.getParameter("elm1");
wdUtil.setCurrentPath(wdResource, sPath);
@@ -905,14 +913,14 @@
}
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
}
}, aReq);
}
- else if(AdminCMSConstants.OP_UPLOADCONTENT.equals(op)) // upload of new content
+ else if (AdminCMSConstants.OP_UPLOADCONTENT.equals(op)) // upload of new content
{
perform(new Job()
{
@@ -925,18 +933,18 @@
String sPath = "";
List fileItems = upload.parseRequest(aReq); // TODO: mod interface to allow multiple uploads.
Iterator itr = fileItems.iterator();
- while(itr.hasNext())
+ while (itr.hasNext())
{
- FileItem item = (FileItem) itr.next();
+ FileItem item = (FileItem)itr.next();
// check if the current item is a form field or an uploaded file
- if(!item.isFormField())
+ if (!item.isFormField())
{
InputStream is = item.getInputStream();
String sFilename = item.getName();
int backslashIndex = sFilename.lastIndexOf("\\");
- if(backslashIndex > -1) // windows
+ if (backslashIndex > -1) // getWindows
{
sFilename = sFilename.substring(backslashIndex + 1);
}
@@ -953,11 +961,11 @@
else
{
String fieldName = item.getFieldName();
- if("uploadtopath".equals(fieldName))
+ if ("uploadtopath".equals(fieldName))
{
sPath = item.getString();
String[] subAuth = new String[]{wdUtil.getSecuredRoot(sPath, sRootPath)};
- if(!aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
+ if (!aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
{
aRes.setRenderParameter("op", AdminCMSConstants.PERM_FAIL);
return;
@@ -967,14 +975,14 @@
}
aRes.setRenderParameter("op", AdminCMSConstants.OP_VIEWFILE);
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
}
}, aReq);
}
- else if(AdminCMSConstants.OP_UPLOADBINARY.equals(op)) // on edit of binary
+ else if (AdminCMSConstants.OP_UPLOADBINARY.equals(op)) // on edit of binary
{
perform(new Job()
{
@@ -989,10 +997,10 @@
{
List fileItems = upload.parseRequest(aReq);
Iterator itr = fileItems.iterator();
- while(itr.hasNext())
+ while (itr.hasNext())
{
- FileItem item = (FileItem) itr.next();
- if(!item.isFormField())
+ FileItem item = (FileItem)itr.next();
+ if (!item.isFormField())
{
File uploadFile = new File(item.getName());
wdResource.putMethod(sPath, uploadFile);
@@ -1000,11 +1008,11 @@
else
{
String fieldName = item.getFieldName();
- if("uploadtopath".equals(fieldName))
+ if ("uploadtopath".equals(fieldName))
{
sPath = item.getString();
String[] subAuth = new String[]{wdUtil.getSecuredRoot(sPath, sRootPath)};
- if(!aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
+ if (!aReq.hasPermission(subAuth, AdminCMSSecurityConstants.ADMINDIRECTORY))
{
aRes.setRenderParameter("op", AdminCMSConstants.PERM_FAIL);
return;
@@ -1013,14 +1021,14 @@
}
}
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
aRes.setRenderParameter("path", sPath);
aRes.setRenderParameter("op", AdminCMSConstants.OP_VIEWFILE);
}
- catch(Exception e)
+ catch (Exception e)
{
e.printStackTrace();
}
@@ -1028,7 +1036,7 @@
}, aReq);
}
}
- catch(Exception e) // global catch for login failure
+ catch (Exception e) // global catch for login failure
{
System.out.println("processAction() - GLOBAL CATCH: " + e.getMessage());
}
@@ -1045,10 +1053,10 @@
public void render(JBossRenderRequest request, JBossRenderResponse response) throws javax.portlet.PortletException, IOException
{
response.setTitle("Admin CMS");
- if(javax.portlet.WindowState.NORMAL.equals(request.getWindowState()))
+ if (javax.portlet.WindowState.NORMAL.equals(request.getWindowState()))
{
boolean bAuth = request.hasPermission(AdminCMSSecurityConstants.GLOBALREAD);
- if(bAuth)
+ if (bAuth)
{
response.setContentType("text/html");
request.setAttribute("rootpath", "/webdav" + sRootDir);
@@ -1078,7 +1086,7 @@
sbUrl.append(rReq.getScheme());
sbUrl.append("://");
sbUrl.append(rReq.getServerName());
- if(rReq.getScheme().equals("http") && rReq.getServerPort() != 80 ||
+ if (rReq.getScheme().equals("http") && rReq.getServerPort() != 80 ||
rReq.getScheme().equals("https") && rReq.getServerPort() != 443)
{
sbUrl.append(':');
@@ -1087,7 +1095,7 @@
//sbUrl.append(rReq.getContextPath());
sbUrl.append("/portal");
sbCSSURL.append(sbUrl.toString());
- if(appendRoot)
+ if (appendRoot)
{
sbUrl.append(sRootDir);
}
@@ -1108,7 +1116,7 @@
sbUrl.append(rReq.getScheme());
sbUrl.append("://");
sbUrl.append(rReq.getServerName());
- if(rReq.getScheme().equals("http") && rReq.getServerPort() != 80 ||
+ if (rReq.getScheme().equals("http") && rReq.getServerPort() != 80 ||
rReq.getScheme().equals("https") && rReq.getServerPort() != 443)
{
sbUrl.append(':');
|