Author: ktlili
Date: Mon Aug 20 15:41:27 2007
New Revision: 48
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D48&repname=3D=
jforum_portlet
Log:
- commit several jforum fix
Modified:
trunk/build.properties
trunk/src/net/jforum/JForum.java
trunk/src/net/jforum/JForumExecutionContext.java
trunk/src/net/jforum/SessionFacade.java
trunk/src/net/jforum/entities/User.java
trunk/src/net/jforum/sso/RemoteUserSSO.java
trunk/src/net/jforum/util/search/simple/MessageIndexerTask.java
trunk/src/net/jforum/util/search/simple/SimpleSearchManager.java
trunk/src/net/jforum/view/forum/BookmarkAction.java
trunk/src/net/jforum/view/forum/SearchAction.java
trunk/src/org/jahia/portlet/jforum/HttpServletRequestWrapper.java
trunk/src/org/jahia/portlet/jforum/HttpServletResponseWrapper.java
trunk/src/org/jahia/portlet/jforum/JForumPortletBridge.java
trunk/templates/default/bookmark_list.htm
trunk/templates/default/js/utils.js
trunk/templates/default/post_show.htm
Modified: trunk/build.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/build.propertie=
s&rev=3D48&repname=3Djforum_portlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/build.properties (original)
+++ trunk/build.properties Mon Aug 20 15:41:27 2007
@@ -1,7 +1,7 @@
# Application server deployment directory. Please use forward slashes "/".
# deploy.dir =3D C:
# deploy.dir =3D C:/jahia/jahia4.1.2/tomcat/webapps/jahia/WEB-INF/var/new=
_webapps/myjahiasite
-deploy.dir =3D C:/jahia/jahia5.0.0_CVS/tomcat/webapps/jahia/WEB-INF/var/ne=
w_webapps/
+deploy.dir =3D C:/jahia/jahia5.1.0_CVS_r17654/tomcat/webapps/jahia/WEB-INF=
/var/new_webapps/
# deploy.dir =3D C:/jahia/jahia5.0.0_CVS_nigthly/tomcat/webapps/jahia/WEB-=
INF/var/new_webapps/
# deploy.dir =3D C:/jahia/jahia-SP-5.0.2_CVS_r16438/tomcat/webapps/jahia/W=
EB-INF/var/new_webapps/
# deploy.dir =3D C:/uPortal/new_portlet/
Modified: trunk/src/net/jforum/JForum.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/net/jforum/=
JForum.java&rev=3D48&repname=3Djforum_portlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/net/jforum/JForum.java (original)
+++ trunk/src/net/jforum/JForum.java Mon Aug 20 15:41:27 2007
@@ -183,7 +183,7 @@
context.put("request", req);
context.put("response", response);
=
- logger.debug("From JFrorum servlet: Action is: " +
request.getAction() =
+ " Module is: " + request.getModule());
+ logger.debug("From JForum servlet: Action is: " +
request.getAction() +=
" Module is: " + request.getModule());
=
if (moduleClass !=3D null) {
// Here we go, baby
Modified: trunk/src/net/jforum/JForumExecutionContext.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/net/jforum/=
JForumExecutionContext.java&rev=3D48&repname=3Djforum_portlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/net/jforum/JForumExecutionContext.java (original)
+++ trunk/src/net/jforum/JForumExecutionContext.java Mon Aug 20 15:41:27 20=
07
@@ -161,7 +161,10 @@
try {
c.setAutoCommit(!SystemGlobals.getBoolValue(ConfigKeys.DATABASE_USE_TR=
ANSACTIONS));
}
- catch (Exception e) {}
+ catch (Exception e) {
+ // fix: jahia
+ logger.error(e,e);
+ }
=
ex.setConnection(c);
set(ex);
@@ -217,7 +220,7 @@
* @return
*/
public static void setRedirect(String redirect) {
- logger.debug("Set REDIRECT");
+ logger.debug("Set REDIRECT to: "+redirect);
((JForumExecutionContext)userData.get()).redirectTo =3D
redirect;
}
=
Modified: trunk/src/net/jforum/SessionFacade.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/net/jforum/=
SessionFacade.java&rev=3D48&repname=3Djforum_portlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/net/jforum/SessionFacade.java (original)
+++ trunk/src/net/jforum/SessionFacade.java Mon Aug 20 15:41:27 2007
@@ -283,7 +283,7 @@
*/
public static UserSession getUserSession()
{
- return
getUserSession(JForumExecutionContext.getRequest().getSession().g=
etId());
+ return getUserSession(JForumExecutionContext.getRequest().getSessi=
on().getId());
}
=
/**
Modified: trunk/src/net/jforum/entities/User.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/net/jforum/=
entities/User.java&rev=3D48&repname=3Djforum_portlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/net/jforum/entities/User.java (original)
+++ trunk/src/net/jforum/entities/User.java Mon Aug 20 15:41:27 2007
@@ -278,7 +278,10 @@
* @return String value with the language chosen
*/
public String getLang() {
- return this.lang;
+ if(lang =3D=3D null){
+ lang =3D "";
+ }
+ return this.lang;
}
=
/**
@@ -614,7 +617,7 @@
/**
* Sets the occ.
* =
- * @param occ The occ to set
+ * @param occupation The occ to set
*/
public void setOccupation(String occupation) {
this.occupation =3D occupation;
Modified: trunk/src/net/jforum/sso/RemoteUserSSO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/net/jforum/=
sso/RemoteUserSSO.java&rev=3D48&repname=3Djforum_portlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/net/jforum/sso/RemoteUserSSO.java (original)
+++ trunk/src/net/jforum/sso/RemoteUserSSO.java Mon Aug 20 15:41:27 2007
@@ -54,38 +54,43 @@
* This class will try to validate an user by simple
* checking <code>request.getRemoteUser()</code> is not
* null.
+ *
* @author Rafael Steil
* @author Daniel Campagnoli
* @version $Id: RemoteUserSSO.java,v 1.5 2005/07/26 03:05:34 rafaelsteil =
Exp $
*/
-public class RemoteUserSSO implements SSO
-{
- /**
- * @see
net.jforum.sso.SSO#authenticateUser(net.jforum.ActionServletReque=
st)
- */
- public String authenticateUser(ActionServletRequest request)
- {
- return request.getRemoteUser();
- }
+public class RemoteUserSSO implements SSO {
+ public static final String JFORUM_USERNAME =3D "JFORUM_USERNAME";
+
+ /**
+ * @see net.jforum.sso.SSO#authenticateUser(net.jforum.ActionServletRe=
quest)
+ */
+ public String authenticateUser(ActionServletRequest request) {
+ String remoteUser =3D request.getRemoteUser();
+ if (remoteUser =3D=3D null) {
+ remoteUser =3D (String) request.getSession().getAttribute(JFOR=
UM_USERNAME);
+ }
+ return remoteUser;
+ }
=
=
- public boolean isSessionValid(UserSession userSession, HttpServletRequ=
est request)
- {
+ public boolean isSessionValid(UserSession userSession, HttpServletRequ=
est request) {
String remoteUser =3D request.getRemoteUser();
=
// user has since logged out
- if(remoteUser =3D=3D null && userSession.getUserId() !=3D SystemGl=
obals.getIntValue(ConfigKeys.ANONYMOUS_USER_ID)) {
+ if (remoteUser =3D=3D null && userSession.getUserId() !=3D SystemG=
lobals.getIntValue(ConfigKeys.ANONYMOUS_USER_ID)) {
return false;
=
- // user has since logged in
- } else if(remoteUser !=3D null && userSession.getUserId() =3D=3D S=
ystemGlobals.getIntValue(ConfigKeys.ANONYMOUS_USER_ID)) {
+ // user has since logged in
+ } else
+ if (remoteUser !=3D null && userSession.getUserId() =3D=3D SystemG=
lobals.getIntValue(ConfigKeys.ANONYMOUS_USER_ID)) {
return false;
=
- // user has changed user
- } else if(remoteUser !=3D null && !remoteUser.equals(userSession.g=
etUsername())) {
+ // user has changed user
+ } else if (remoteUser !=3D null && !remoteUser.equals(userSession.=
getUsername())) {
return false;
}
return false;
- }
+ }
=
}
Modified: trunk/src/net/jforum/util/search/simple/MessageIndexerTask.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/net/jforum/=
util/search/simple/MessageIndexerTask.java&rev=3D48&repname=3Djforum_portlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/net/jforum/util/search/simple/MessageIndexerTask.java (origin=
al)
+++ trunk/src/net/jforum/util/search/simple/MessageIndexerTask.java Mon Aug=
20 15:41:27 2007
@@ -76,7 +76,8 @@
try {
SearchIndexerDAO indexer =3D
DataAccessDriver.getInstance().newSearchIn=
dexerDAO();
indexer.setConnection(this.conn);
- indexer.insertSearchWords(this.post);
+
+ indexer.insertSearchWords(this.post);
}
catch (Exception e) {
logger.warn("Error while indexing a post: " + e);
Modified: trunk/src/net/jforum/util/search/simple/SimpleSearchManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/net/jforum/=
util/search/simple/SimpleSearchManager.java&rev=3D48&repname=3Djforum_portl=
et
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/net/jforum/util/search/simple/SimpleSearchManager.java (origi=
nal)
+++ trunk/src/net/jforum/util/search/simple/SimpleSearchManager.java Mon Au=
g 20 15:41:27 2007
@@ -65,14 +65,16 @@
/**
* @see net.jforum.util.search.SearchManager#init()
*/
- public void init() {}
+ public void init() {
+
+ }
=
/**
* @see
net.jforum.util.search.SearchManager#index(net.jforum.entities.Po=
st)
*/
public void index(Post post)
{
- if (SystemGlobals.getBoolValue(ConfigKeys.BACKGROUND_TASKS)) {
+ if (SystemGlobals.getBoolValue(ConfigKeys.BACKGROUND_TASKS)) {
try {
QueuedExecutor.getInstance().execute(new
MessageIndexerTask(post));
}
Modified: trunk/src/net/jforum/view/forum/BookmarkAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/net/jforum/=
view/forum/BookmarkAction.java&rev=3D48&repname=3Djforum_portlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/net/jforum/view/forum/BookmarkAction.java (original)
+++ trunk/src/net/jforum/view/forum/BookmarkAction.java Mon Aug 20 15:41:27=
2007
@@ -283,7 +283,7 @@
*/
public Template process(ActionServletRequest request,
HttpServletResponse=
response, SimpleHash context) throws Exception
{
- if (SessionFacade.getUserSession().getUserId() =3D=3D
SystemGlobals.getI=
ntValue(ConfigKeys.ANONYMOUS_USER_ID)
+ if (SessionFacade.getUserSession().getUserId() =3D=3D SystemGlobal=
s.getIntValue(ConfigKeys.ANONYMOUS_USER_ID)
&& !request.getAction().equals("list")) {
request.addParameter("action", "anonymousIsDenied");
}
Modified: trunk/src/net/jforum/view/forum/SearchAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/net/jforum/=
view/forum/SearchAction.java&rev=3D48&repname=3Djforum_portlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/net/jforum/view/forum/SearchAction.java (original)
+++ trunk/src/net/jforum/view/forum/SearchAction.java Mon Aug 20 15:41:27 2=
007
@@ -151,8 +151,8 @@
sd.setAuthor(author);
sd.setOrderByField(sortBy);
sd.setOrderBy(sortDir);
- =
- if (postTime !=3D null) {
+
+ if (postTime !=3D null) {
sd.setTime(new Date(Long.parseLong(postTime)));
=
}
=
@@ -185,7 +185,7 @@
}
=
List allTopics =3D this.onlyAllowedData(sm.search(sd));
- int totalTopics =3D allTopics.size();
+ int totalTopics =3D allTopics.size();
int sublistLimit =3D recordsPerPage + start > totalTopics ?
totalTopics =
: recordsPerPage + start;
=
this.setTemplateName(TemplateKeys.SEARCH_SEARCH);
@@ -215,7 +215,6 @@
private List onlyAllowedData(List topics) throws Exception
{
List l =3D new ArrayList();
- =
for (Iterator iter =3D topics.iterator(); iter.hasNext(); ) {
Topic t =3D (Topic)iter.next();
Forum f =3D ForumRepository.getForum(t.getForumId());
Modified: trunk/src/org/jahia/portlet/jforum/HttpServletRequestWrapper.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/org/jahia/p=
ortlet/jforum/HttpServletRequestWrapper.java&rev=3D48&repname=3Djforum_port=
let
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/org/jahia/portlet/jforum/HttpServletRequestWrapper.java (orig=
inal)
+++ trunk/src/org/jahia/portlet/jforum/HttpServletRequestWrapper.java Mon A=
ug 20 15:41:27 2007
@@ -402,7 +402,7 @@
* @todo Implement this javax.servlet.http.HttpServletRequest method
*/
public HttpSession getSession() {
- return new portlet.wrappers.HttpSessionWrapper(super.request.
+ return new HttpSessionWrapper(super.request.
getPortletSession());
}
=
Modified: trunk/src/org/jahia/portlet/jforum/HttpServletResponseWrapper.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/org/jahia/p=
ortlet/jforum/HttpServletResponseWrapper.java&rev=3D48&repname=3Djforum_por=
tlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/org/jahia/portlet/jforum/HttpServletResponseWrapper.java (ori=
ginal)
+++ trunk/src/org/jahia/portlet/jforum/HttpServletResponseWrapper.java Mon =
Aug 20 15:41:27 2007
@@ -36,10 +36,11 @@
this.pResponse =3D pResponse;
servletOutputStream =3D new ServletOutputStreamWrapper();
}
+ =
=
=
=
- /**
+ /**
* Sets a response header with the given name and date-value.
*
[EMAIL PROTECTED] name the name of the header to set
Modified: trunk/src/org/jahia/portlet/jforum/JForumPortletBridge.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/org/jahia/p=
ortlet/jforum/JForumPortletBridge.java&rev=3D48&repname=3Djforum_portlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/org/jahia/portlet/jforum/JForumPortletBridge.java (original)
+++ trunk/src/org/jahia/portlet/jforum/JForumPortletBridge.java Mon Aug 20 =
15:41:27 2007
@@ -4,6 +4,7 @@
import javax.servlet.*;
=
import net.jforum.*;
+import net.jforum.sso.RemoteUserSSO;
=
import java.util.*;
=
@@ -129,6 +130,10 @@
*/
public void render(RenderRequest request, RenderResponse response) {
logger.debug("Begin render method");
+
+ // deal with SSO
+ updateRemoteUser(request);
+
try {
// default values for reuqest wrapper
String defaultRequestUri;
@@ -201,6 +206,23 @@
=
}
=
+ private void updateRemoteUser(RenderRequest request) {
+ // set username in session (SSO purpose)
+ PortletSession session =3D request.getPortletSession();
+ String remoteUser =3D request.getRemoteUser();
+ String sessionRemoteUser =3D (String) session.getAttribute(RemoteU=
serSSO.JFORUM_USERNAME, PortletSession.APPLICATION_SCOPE);
+ if (remoteUser =3D=3D null) {
+ logger.debug("Guest user");
+ if (sessionRemoteUser !=3D null) {
+ logger.debug("update session remote user --> set to guest"=
);
+ session.removeAttribute(RemoteUserSSO.JFORUM_USERNAME, Por=
tletSession.APPLICATION_SCOPE);
+ }
+ } else {
+ logger.debug("update session remote user --> set to " + remote=
User);
+ session.setAttribute(RemoteUserSSO.JFORUM_USERNAME, remoteUser=
, PortletSession.APPLICATION_SCOPE);
+ }
+ }
+
private void unvalidateAll(RenderRequest request) {
// invalidate process action
invalidateProcessAction(request);
@@ -396,10 +418,7 @@
private void callServletServiceMethod(RenderRequest request, RenderRes=
ponse response, String defaultRequestUri, String defaultModule, String defa=
ultAction) {
// deal with file upload
synchFileUpload(request);
- Enumeration enume =3D request.getAttributeNames();
- while (enume.hasMoreElements()) {
- logger.debug("Found attr: " + enume.nextElement());
- }
+ //logRequestAttributes(request);
// build HttpServletRequest/response object
HttpServletRequestWrapper reqW =3D new HttpServletRequestWrapper(r=
equest, defaultRequestUri, defaultModule, defaultAction, HttpServletRequest=
Wrapper.HTTP_GET);
HttpServletResponseWrapper respW =3D new HttpServletResponseWrappe=
r(response);
@@ -435,6 +454,13 @@
}
}
=
+ private void logRequestAttributes(RenderRequest request) {
+ Enumeration enume =3D request.getAttributeNames();
+ while (enume.hasMoreElements()) {
+ logger.debug("Found attr: " + enume.nextElement());
+ }
+ }
+
=
/**
* Print result from session
Modified: trunk/templates/default/bookmark_list.htm
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/templates/defau=
lt/bookmark_list.htm&rev=3D48&repname=3Djforum_portlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/templates/default/bookmark_list.htm (original)
+++ trunk/templates/default/bookmark_list.htm Mon Aug 20 15:41:27 2007
@@ -52,8 +52,8 @@
</span>
</td>
<td class=3D"${color}"><span
class=3D"gen"><#if (b.description?defaul=
t("")?length > 0)>${b.description}</#if></span></td>
- <#if owner><td class=3D"${color}"><span
class=3D"gen"><!--<a href=3D"=
javascript:addBookmark(2, ${b.relationId});">--><a href=3D'${JForumContext.=
encodeURL("/bookmarks/insert/2/${b.relationId}")}'> ${I18n.getMessage("Edit=
")}</a></span></td></#if>
- <#if owner><td class=3D"${color}"><span
class=3D"gen"><!--<a href=3D"=
javascript:confirmDelete(${b.id})">--><a href=3D'${JForumContext.encodeURL(=
"/bookmarks/delete/${b.id}")}'> ${I18n.getMessage("Delete")}</a></span></td=
></#if>
+ <#if owner><td class=3D"${color}"><span
class=3D"gen"><a href=3D"java=
script:addBookmark(2, ${b.relationId});"> ${I18n.getMessage("Edit")}</a></s=
pan></td></#if>
+ <#if owner><td class=3D"${color}"><span
class=3D"gen"><a href=3D"java=
script:confirmDelete(${b.id})"> ${I18n.getMessage("Delete")}</a></span></td=
></#if>
</tr>
=
<#if color =3D=3D "row1">
Modified: trunk/templates/default/js/utils.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/templates/defau=
lt/js/utils.js&rev=3D48&repname=3Djforum_portlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/templates/default/js/utils.js (original)
+++ trunk/templates/default/js/utils.js Mon Aug 20 15:41:27 2007
@@ -22,9 +22,9 @@
{
//var w =3D window.open('${JForumContext.encodeURL("/bookmarks/insert/'
+=
relationType + '/' + relationId + '")}', 'bookmark_add', 'width=3D"700", h=
eight=3D"200", scrollbars=3D"no"');
// portlet fork: not encode url
- //var w =3D window.open('${contextPath}/bookmarks/insert/' + relationT=
ype + '/' + relationId + '${extension}', 'bookmark_add', 'width=3D"700", he=
ight=3D"200", scrollbars=3D"no"');
- //w.focus();
- document.location =3D '${JForumContext.encodeURL("/bookmarks/insert/' =
+ relationType + '/' + relationId + '")}';
+ var w =3D window.open('${contextPath}/bookmarks/insert/' + relationTyp=
e + '/' + relationId + '${extension}', 'bookmark_add', 'width=3D"700", heig=
ht=3D"200", scrollbars=3D"no"');
+ w.focus();
+ //document.location =3D '${JForumContext.encodeURL("/bookmarks/insert/=
' + relationType + '/' + relationId + '")}';
}
=
function supportAjax()
Modified: trunk/templates/default/post_show.htm
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/templates/defau=
lt/post_show.htm&rev=3D48&repname=3Djforum_portlet
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/templates/default/post_show.htm (original)
+++ trunk/templates/default/post_show.htm Mon Aug 20 15:41:27 2007
@@ -63,7 +63,7 @@
<td align=3D"right" valign=3D"middle">
<#if bookmarksEnabled>
- <!--<a
href=3D"javascript:addBookmark(2, ${topic.id});" class=3D"ge=
n">'--><a href=3D"${JForumContext.encodeURL('/bookmarks/insert/2/${topic.id=
}')}" class=3D"gen"><img src=3D"${contextPath}/templates/${templateName}/im=
ages/icon_bookmark.gif" align=3D"middle" alt=3D"XML" /> ${I18n.getMes=
sage("Bookmarks.addTo")}</a>
+ <a
href=3D"javascript:addBookmark(2, ${topic.id});" class=3D"gen">'=
<img src=3D"${contextPath}/templates/${templateName}/images/icon_bookmark.g=
if" align=3D"middle" alt=3D"XML" /> ${I18n.getMessage("Bookmarks.addT=
o")}</a>
</#if>
=
</td>
@@ -289,7 +289,8 @@
<input type=3D"hidden" name=3D"action"
value=3D"doModeration" />
<input type=3D"hidden" name=3D"module"
value=3D"moderation" />
<input type=3D"hidden"
name=3D"securityHash" value=3D"${securityHash}=
" />
- <input type=3D"hidden"
name=3D"returnUrl" value=3D"${JForumContext.en=
codeURL("/${moduleName}/${action}/${start}/${topic.id}")}" />
+ <!-- fix jahia: not encode return url-->
+ <input type=3D"hidden" name=3D"returnUrl" value=3D"${c=
ontextPath}/${moduleName}/${action}/${start}/${topic.id}${extension}" />
<input type=3D"hidden"
name=3D"forum_id" value=3D"${topic.forumId}" />
<input type=3D"hidden"
name=3D"topic_id" value=3D"${topic.id}" />
<input type=3D"hidden"
id=3D"moderationTodo" />
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
