ktlili 2004/12/14 14:28:21 CET
Modified files:
JForumWebApp/WEB-INF/config/languages de_DE.properties
en_US.properties
fr_FR.properties
nl_NL.properties
pt_BR.properties
ru_RU.properties
zh_CN.properties
JForumWebApp/templates/default post_form.htm
src/net/jforum/view/forum PrivateMessageAction.java
Log:
* Optimize find user
Revision Changes Path
1.5 +6 -1
jforum/JForumWebApp/WEB-INF/config/languages/de_DE.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jforum/JForumWebApp/WEB-INF/config/languages/de_DE.properties.diff?r1=1.4&r2=1.5&f=h
1.5 +4 -1
jforum/JForumWebApp/WEB-INF/config/languages/en_US.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jforum/JForumWebApp/WEB-INF/config/languages/en_US.properties.diff?r1=1.4&r2=1.5&f=h
1.6 +4 -1
jforum/JForumWebApp/WEB-INF/config/languages/fr_FR.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jforum/JForumWebApp/WEB-INF/config/languages/fr_FR.properties.diff?r1=1.5&r2=1.6&f=h
1.5 +4 -1
jforum/JForumWebApp/WEB-INF/config/languages/nl_NL.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jforum/JForumWebApp/WEB-INF/config/languages/nl_NL.properties.diff?r1=1.4&r2=1.5&f=h
1.5 +4 -1
jforum/JForumWebApp/WEB-INF/config/languages/pt_BR.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jforum/JForumWebApp/WEB-INF/config/languages/pt_BR.properties.diff?r1=1.4&r2=1.5&f=h
1.5 +4 -1
jforum/JForumWebApp/WEB-INF/config/languages/ru_RU.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jforum/JForumWebApp/WEB-INF/config/languages/ru_RU.properties.diff?r1=1.4&r2=1.5&f=h
1.5 +3 -0
jforum/JForumWebApp/WEB-INF/config/languages/zh_CN.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jforum/JForumWebApp/WEB-INF/config/languages/zh_CN.properties.diff?r1=1.4&r2=1.5&f=h
1.3 +32 -6 jforum/JForumWebApp/templates/default/post_form.htm
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jforum/JForumWebApp/templates/default/post_form.htm.diff?r1=1.2&r2=1.3&f=h
1.3 +121 -74
jforum/src/net/jforum/view/forum/PrivateMessageAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jforum/src/net/jforum/view/forum/PrivateMessageAction.java.diff?r1=1.2&r2=1.3&f=h
Index: de_DE.properties
===================================================================
RCS file:
/home/cvs/repository/jforum/JForumWebApp/WEB-INF/config/languages/de_DE.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- de_DE.properties 6 Dec 2004 16:54:41 -0000 1.4
+++ de_DE.properties 14 Dec 2004 13:28:19 -0000 1.5
@@ -1,11 +1,16 @@
#
-# Version: $Id: de_DE.properties,v 1.4 2004/12/06 16:54:41 ktlili Exp $
+# Version: $Id: de_DE.properties,v 1.5 2004/12/14 13:28:19 ktlili Exp $
#
# Java Resource Bundle
# Modified by Zaval JRC Editor (C) Zaval CE Group
# http://www.zaval.org/products/jrc-editor/
#
+#General
+result = Ergebnis
+help.show = Hilfe
+help.hide = Hilfe maskieren
+
# Admin Config
AdminConfig.Title= Konfigurationen
Administrator= Administrator
Index: en_US.properties
===================================================================
RCS file:
/home/cvs/repository/jforum/JForumWebApp/WEB-INF/config/languages/en_US.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- en_US.properties 6 Dec 2004 16:54:41 -0000 1.4
+++ en_US.properties 14 Dec 2004 13:28:19 -0000 1.5
@@ -1,5 +1,5 @@
#
-# Version: $Id: en_US.properties,v 1.4 2004/12/06 16:54:41 ktlili Exp $
+# Version: $Id: en_US.properties,v 1.5 2004/12/14 13:28:19 ktlili Exp $
#
# General error messages
CannotDeleteGroup = Cannot delete the group with ID <i>"{0}"</i>. Please
check for users inside this group before deleting it.
@@ -37,6 +37,9 @@
Lock = Lock
Unlock = Unlock
ok = OK
+result = Results
+help.show = Help
+help.hide = Hide Help
# Group Listing
Groups.List.Edit = Click to edit
Index: fr_FR.properties
===================================================================
RCS file:
/home/cvs/repository/jforum/JForumWebApp/WEB-INF/config/languages/fr_FR.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fr_FR.properties 9 Dec 2004 14:06:31 -0000 1.5
+++ fr_FR.properties 14 Dec 2004 13:28:19 -0000 1.6
@@ -1,5 +1,5 @@
#
-# Version: $Id: fr_FR.properties,v 1.5 2004/12/09 14:06:31 ktlili Exp $
+# Version: $Id: fr_FR.properties,v 1.6 2004/12/14 13:28:19 ktlili Exp $
#
# General error messages
CannotDeleteGroup = Impossible de d�truire le groupe avec l'ID <i>"{0}"</i>.
V�rifier la pr�sence d'utilisateurs dans ce groupe avant de le d�truire.
@@ -14,6 +14,9 @@
Manager = Manager
closeWindow = fermer la fen�tre
or = ou
+result = Resultats
+help.show = Aide
+help.hide = Masquer Aide
Message.replyPrefix = Re:
Index: nl_NL.properties
===================================================================
RCS file:
/home/cvs/repository/jforum/JForumWebApp/WEB-INF/config/languages/nl_NL.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nl_NL.properties 6 Dec 2004 16:54:41 -0000 1.4
+++ nl_NL.properties 14 Dec 2004 13:28:19 -0000 1.5
@@ -1,5 +1,5 @@
#
-# Version: $Id: nl_NL.properties,v 1.4 2004/12/06 16:54:41 ktlili Exp $
+# Version: $Id: nl_NL.properties,v 1.5 2004/12/14 13:28:19 ktlili Exp $
#
# General error messages
CannotDeleteGroup = Je kunt de groep met ID <i>"{0}"</i> niet verwijderen.
Controleer eerst of er geen gebruikers meer zijn in een groep voor je de groep
verwijdert.
@@ -39,6 +39,9 @@
Lock = Op Slot
Unlock = Van Slot
ok = Accepteer
+result = Results
+help.show = Show help
+help.hide = Hide help
# Group Listing
Groups.List.Edit = Aanpassen
Index: pt_BR.properties
===================================================================
RCS file:
/home/cvs/repository/jforum/JForumWebApp/WEB-INF/config/languages/pt_BR.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pt_BR.properties 6 Dec 2004 16:54:41 -0000 1.4
+++ pt_BR.properties 14 Dec 2004 13:28:19 -0000 1.5
@@ -1,5 +1,5 @@
#
-# Version: $Id: pt_BR.properties,v 1.4 2004/12/06 16:54:41 ktlili Exp $
+# Version: $Id: pt_BR.properties,v 1.5 2004/12/14 13:28:19 ktlili Exp $
#
# General error messages
CannotDeleteGroup = N�o � poss�vel remover o grupo de ID <i>"{0}"</i>. por
favor verifique por usu�rios associados ao grupo
@@ -40,6 +40,9 @@
Lock = Travar
Unlock = Destravar
ok = OK
+result = Results
+help.show = Show help
+help.hide = Hide help
# Group Listing
Groups.List.Edit = Clique para editar
Index: ru_RU.properties
===================================================================
RCS file:
/home/cvs/repository/jforum/JForumWebApp/WEB-INF/config/languages/ru_RU.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ru_RU.properties 6 Dec 2004 16:54:41 -0000 1.4
+++ ru_RU.properties 14 Dec 2004 13:28:19 -0000 1.5
@@ -6,7 +6,7 @@
# "native2ascii.exe -reverse ru_RU.properties <unescaped file>"
# Don't forget to compile it again before use.
#
-# Version: $Id: ru_RU.properties,v 1.4 2004/12/06 16:54:41 ktlili Exp $
+# Version: $Id: ru_RU.properties,v 1.5 2004/12/14 13:28:19 ktlili Exp $
#
# Translation made by: Alexander Sgibnev, [EMAIL PROTECTED]
#
@@ -50,6 +50,9 @@
Lock = \u0417\u0430\u043a\u0440\u044b\u0442\u044c
Unlock = \u041e\u0442\u043a\u0440\u044b\u0442\u044c
ok = OK
+result = Results
+help.show = Show help
+help.hide = Hide help
# Group Listing
Groups.List.Edit =
\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
Index: zh_CN.properties
===================================================================
RCS file:
/home/cvs/repository/jforum/JForumWebApp/WEB-INF/config/languages/zh_CN.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zh_CN.properties 6 Dec 2004 16:54:41 -0000 1.4
+++ zh_CN.properties 14 Dec 2004 13:28:19 -0000 1.5
@@ -39,6 +39,9 @@
Lock = \u9501\u5b9a
Unlock = \u89e3\u9501
ok = \u786e\u5b9a
+result = Results
+help.show = Show help
+help.hide = Hide help
# Group Listing
Groups.List.Edit = \u7f16\u8f91
Index: post_form.htm
===================================================================
RCS file:
/home/cvs/repository/jforum/JForumWebApp/templates/default/post_form.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- post_form.htm 13 Dec 2004 18:41:37 -0000 1.2
+++ post_form.htm 14 Dec 2004 13:28:20 -0000 1.3
@@ -203,6 +203,7 @@
</script>
<#assign preview = preview?exists && preview/>
+<#assign help = help?exists && help/>
<#assign isNewPost = isNewPost?exists && isNewPost/>
<#assign htmlChecked = "checked"/>
@@ -271,6 +272,9 @@
<br clear="all" />
</#if>
+
+
+
<table cellspacing="2" cellpadding="2" width="100%"
align="center" border="0">
<tr>
<td align="left">
@@ -296,36 +300,58 @@
</th>
</tr>
+
<#if !forum?exists>
+ <tr>
+ <td class="row1"
width="22%"><span
class="gen"><b>${I18n.getMessage("PrivateMessage.user")}</b></span></td>
+ <td class="row2" width="78%">
+ <span
class="gensmall">${I18n.getMessage("PrivateMessage.searchTip")}</span>
+ </td>
+ </tr>
<tr>
- <td class="row1"
width="22%"><span
class="gen"><b>${I18n.getMessage("PrivateMessage.user")}</b></span></td>
+ <td class="row1"
width="22%"><span class="gen"><b></b></span></td>
<td class="row2" width="78%">
<#if pmRecipient?exists>
<#assign
toUsername = toUsername/>
<#assign
toUserId = toUserId/>
<#assign
toUserEmail = toUserEmail/>
- <#elseif
preview>
+ <#elseif
preview>
<#assign
toUsername = pm.toUser.username/>
<#assign
toUserId = pm.toUser.id/>
<#assign
toUserEmail = pm.toUser.email?default("")/>
- <#elseif
quote?default("") == "true" || pmReply?default(false)>
+ <#elseif
quote?default("") == "true" || pmReply?default(false)>
<#assign
toUsername = pm.fromUser.username/>
<#assign
toUserId = pm.fromUser.id/>
<#assign
toUserEmail = pm.fromUser.email?default("")/>
- <#else>
+ <#else>
<#assign
toUsername = ""/>
<#assign
toUserId = ""/>
<#assign
toUserEmail = ""/>
</#if>
<input class="post"
size="25" name="toUsername" value="${toUsername}"/>
- <input type="button"
value="${I18n.getMessage("PrivateMessage.findUser")}" name="findUser"
class="liteoption"
onClick="javascript:OpenJahiaWindow('${JForumContext.encodeURL("/pm/findUser${extension}")}','_findUser',250,400);"/>
+ <input type="submit"
value="${I18n.getMessage("PrivateMessage.findUser")}" name="findUser"
class="liteoption"/>
<input type="hidden"
name="toUserId" value="${toUserId}" />
<input type="hidden"
name="toUserEmail" value="${toUserEmail}"/>
</td>
</tr>
</#if>
+
+ <#if showResult>
+ <tr>
+ <td class="row1" width="22%"><span
class="gen"><b>${I18n.getMessage("result")}</b></span></td>
+ <td class="row2" width="78%">
+ <select name="selectedUsername">
+ <#list namesList as
user>
+ <option
value="${user.id}#${user.email?default("")}">${user.username}</option>
+ </#list>
+ </select>
+ <input type="submit"
name="userSelected" value="${I18n.getMessage("PrivateMessage.select")}"
class="liteoption"/>
+ </td>
+ </tr>
+ </#if>
+
<tr>
<td class="row1" width="22%"><span
class="gen"><b>${I18n.getMessage("PostForm.subject")}</b></span></td>
<#if post?exists>
@@ -533,7 +559,7 @@
</td>
</tr>
</table>
- </form>
+ </form>
</td>
</tr>
</table>
Index: PrivateMessageAction.java
===================================================================
RCS file:
/home/cvs/repository/jforum/src/net/jforum/view/forum/PrivateMessageAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PrivateMessageAction.java 13 Dec 2004 18:41:38 -0000 1.2
+++ PrivateMessageAction.java 14 Dec 2004 13:28:20 -0000 1.3
@@ -62,7 +62,7 @@
/**
[EMAIL PROTECTED] Rafael Steil
- [EMAIL PROTECTED] $Id: PrivateMessageAction.java,v 1.2 2004/12/13
18:41:38 ktlili Exp $
+ [EMAIL PROTECTED] $Id: PrivateMessageAction.java,v 1.3 2004/12/14
13:28:20 ktlili Exp $
*/
public class PrivateMessageAction extends Command {
private String templateName;
@@ -125,14 +125,14 @@
return;
}
- User user =
DataAccessDriver.getInstance().newUserModel().selectById(
- SessionFacade.getUserSession().getUserId());
-
+ User user =
DataAccessDriver.getInstance().newUserModel().selectById(SessionFacade.getUserSession().getUserId());
JForum.getContext().put("user", user);
JForum.getContext().put("moduleName", "pm");
JForum.getContext().put("action", "sendSave");
JForum.getContext().put("moduleAction", "post_form.htm");
JForum.getContext().put("htmlAllowed", true);
+ //JForum.getContext().put("username", username);
+ JForum.getContext().put("showResult", false);
}
@@ -178,89 +178,126 @@
return;
}
- String sId = JForum.getRequest().getParameter("toUserId");
- String toUsername =
JForum.getRequest().getParameter("toUsername");
- String userEmail =
JForum.getRequest().getParameter("toUserEmail");
-
- int toUserId = -1;
- if (sId == null || sId.equals("")) {
- List l =
DataAccessDriver.getInstance().newUserModel().findByName(toUsername, true);
-
- if (l.size() > 0) {
- User u = (User) l.get(0);
- toUserId = u.getId();
- userEmail = u.getEmail();
- }
- }
- else {
- toUserId = Integer.parseInt(sId);
- }
+ boolean findUser =
(JForum.getRequest().getParameter("findUser") != null);
+ boolean userSelected =
(JForum.getRequest().getParameter("userSelected") != null);
- // We failed to get the user id?
- if (toUserId == -1) {
- JForum.getContext().put("moduleAction", "message.htm");
- JForum.getContext().put("message",
I18n.getMessage("PrivateMessage.userIdNotFound"));
- return;
- }
+ if (!findUser) {
+ String toUsername = "";
+ String userEmail = "";
+ int toUserId = -1;
+ //Selected user
+ if (userSelected) {
+ String s[] =
JForum.getRequest().getParameter("selectedUsername").split("#");
+ toUserId = Integer.parseInt(s[0]);
+ toUsername =
DataAccessDriver.getInstance().newUserModel().selectById(toUserId).getUsername();
+ if (!toUsername.equalsIgnoreCase("Anonymous")) {
+ userEmail = s[1];
+ }
+ User user1 =
DataAccessDriver.getInstance().newUserModel().selectById(toUserId);
+ JForum.getContext().put("pmRecipient",
user1);
+ JForum.getContext().put("toUsername",
toUsername);
+ JForum.getContext().put("toUserId", "" +
toUserId);
+ JForum.getContext().put("toUserEmail",
userEmail);
- PrivateMessage pm = new PrivateMessage();
- pm.setPost(PostCommon.fillPostFromRequest());
+ }
+ //Destination user
+ else {
+ String sId =
JForum.getRequest().getParameter("toUserId");
+ toUsername =
JForum.getRequest().getParameter("toUsername");
+ userEmail =
JForum.getRequest().getParameter("toUserEmail");
+
+ if (sId == null || sId.equals("")) {
+ List l =
DataAccessDriver.getInstance().newUserModel().findByName(
+ toUsername, true);
+
+ if (l.size() > 0) {
+ User u = (User) l.get(0);
+ toUserId = u.getId();
+ userEmail = u.getEmail();
+ }
+ }
+ else {
+ toUserId = Integer.parseInt(sId);
+ }
- User fromUser = new User();
- fromUser.setId(SessionFacade.getUserSession().getUserId());
- pm.setFromUser(fromUser);
+ // We failed to get the user id?
+ if (toUserId == -1) {
+ JForum.getContext().put("moduleAction",
"message.htm");
+
JForum.getContext().put("message",I18n.getMessage("PrivateMessage.userIdNotFound"));
+ return;
+ }
+ }
- User toUser = new User();
- toUser.setId(toUserId);
- toUser.setUsername(toUsername);
- toUser.setEmail(userEmail);
- pm.setToUser(toUser);
-
- boolean preview = (JForum.getRequest().getParameter("preview")
!= null);
- if (!preview) {
-
DataAccessDriver.getInstance().newPrivateMessageModel().send(pm);
+ PrivateMessage pm = new PrivateMessage();
+ pm.setPost(PostCommon.fillPostFromRequest());
- JForum.getContext().put("moduleAction", "message.htm");
- JForumContext jfc = new
JForumContext(JForum.getRequest().getHttpServletRequest(),
JForum.getRequest().getHttpServletResponse(),
net.jforum.util.preferences.SystemGlobals.getValue(net.jforum.util.preferences.ConfigKeys.SERVLET_EXTENSION));
- String redirect = JForum.getRequest().getContextPath()
+ "/pm/inbox" + SystemGlobals.getValue(ConfigKeys.SERVLET_EXTENSION);
- redirect = jfc.encodeURL(redirect);
- JForum.getContext().put("message",
I18n.getMessage("PrivateMessage.messageSent", new String[]{redirect}));
-
- // If the target user if in the forum, then increments
its
- // private messate count
- String sid = SessionFacade.isUserInSession(toUserId);
- if (sid != null) {
- UserSession us =
SessionFacade.getUserSession(sid);
- us.setPrivateMessages(us.getPrivateMessages() +
1);
- }
+ User fromUser = new User();
+
fromUser.setId(SessionFacade.getUserSession().getUserId());
+ pm.setFromUser(fromUser);
+
+ User toUser = new User();
+ toUser.setId(toUserId);
+ toUser.setUsername(toUsername);
+ toUser.setEmail(userEmail);
+ pm.setToUser(toUser);
+
+ /*
+ * -- process preview and find user part ---
+ */
+ boolean preview =
(JForum.getRequest().getParameter("preview") != null);
+
+
+ if (!preview && !userSelected) {
+
DataAccessDriver.getInstance().newPrivateMessageModel().send(pm);
+
+ JForum.getContext().put("moduleAction",
"message.htm");
+ JForumContext jfc = new
JForumContext(JForum.getRequest().getHttpServletRequest(),
JForum.getRequest().getHttpServletResponse(),
net.jforum.util.preferences.SystemGlobals.getValue(net.jforum.util.preferences.ConfigKeys.SERVLET_EXTENSION));
+ String redirect =
JForum.getRequest().getContextPath() + "/pm/inbox" +
SystemGlobals.getValue(ConfigKeys.SERVLET_EXTENSION);
+ redirect = jfc.encodeURL(redirect);
+ JForum.getContext().put("message",
I18n.getMessage("PrivateMessage.messageSent", new String[]{redirect}));
+
+ // If the target user if in the forum, then
increments its
+ // private messate count
+ String sid =
SessionFacade.isUserInSession(toUserId);
+ if (sid != null) {
+ UserSession us =
SessionFacade.getUserSession(sid);
+
us.setPrivateMessages(us.getPrivateMessages() + 1);
+ }
- if (userEmail != null && userEmail.trim().length() > 0)
{
- if
(SystemGlobals.getBoolValue(ConfigKeys.MAIL_NOTIFY_ANSWERS)) {
- try {
-
QueuedExecutor.getInstance().execute(new EmailSenderTask(new
PrivateMessageSpammer(toUser)));
- System.out.println("LOUDA: [try
to send to user for averting him for a new private message]");
+ if (userEmail != null &&
userEmail.trim().length() > 0) {
+ if
(SystemGlobals.getBoolValue(ConfigKeys.MAIL_NOTIFY_ANSWERS)) {
+ try {
+
QueuedExecutor.getInstance().execute(new EmailSenderTask(new
PrivateMessageSpammer(toUser)));
+ }
+ catch (Exception e) {
+ System.out.println(e);
+ }
}
- catch (Exception e) {
- System.out.println(e);
- }
- }
- else {
- System.out.println("LOUDA: No mail
notification answer");
+
}
+
}
else {
- System.out.println("LOUDA:
[false username]");
+ //process preview
+ if (preview) {
+ JForum.getContext().put("preview",
true);
+ }
+
+ Post postPreview = new Post(pm.getPost());
+ JForum.getContext().put("postPreview",
PostCommon.preparePostForDisplay(postPreview));
+ JForum.getContext().put("post", pm.getPost());
+ JForum.getContext().put("pm", pm);
+ this.send();
+
}
}
else {
- JForum.getContext().put("preview", true);
- JForum.getContext().put("post", pm.getPost());
-
- Post postPreview = new Post(pm.getPost());
- JForum.getContext().put("postPreview",
PostCommon.preparePostForDisplay(postPreview));
- JForum.getContext().put("pm", pm);
this.send();
+ //process finUSer
+ if (findUser) {
+ findUser();
+ }
}
}
@@ -272,7 +309,7 @@
*/
public void findUser() throws Exception {
boolean showResult = false;
- String username = JForum.getRequest().getParameter("username");
+ String username =
JForum.getRequest().getParameter("toUsername");
if (username != null && !username.equals("")) {
List namesList =
DataAccessDriver.getInstance().newUserModel().findByName(username, false);
@@ -282,7 +319,17 @@
JForum.getContext().put("username", username);
JForum.getContext().put("showResult", showResult);
- this.setTemplateName("default/pm_finduser.htm");
+
+ //rwrite the message
+ PrivateMessage pm = new PrivateMessage();
+ pm.setPost(PostCommon.fillPostFromRequest());
+ User fromUser = new User();
+ fromUser.setId(SessionFacade.getUserSession().getUserId());
+ pm.setFromUser(fromUser);
+ JForum.getContext().put("post", pm.getPost());
+ JForum.getContext().put("pm", pm);
+
+ //this.setTemplateName("default/pm_finduser.htm");
}
