You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/11/30 06:47:27 UTC
openmeetings git commit: [OPENMEETINGS-1769] save chatlog is added,
empty message check is improved
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x bc3e5aa35 -> 1b44243e4
[OPENMEETINGS-1769] save chatlog is added, empty message check is improved
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/1b44243e
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/1b44243e
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/1b44243e
Branch: refs/heads/4.0.x
Commit: 1b44243e4f069502061f11181035b3dd339536b6
Parents: bc3e5aa
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Nov 30 13:47:18 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Nov 30 13:47:18 2017 +0700
----------------------------------------------------------------------
.../web/common/FormSaveRefreshPanel.html | 4 +-
.../openmeetings/web/user/chat/ChatForm.java | 76 ++++++--
.../openmeetings/web/user/chat/ChatToolbar.html | 2 +-
.../openmeetings/web/user/chat/ChatToolbar.java | 182 +++++++++++++++----
.../openmeetings/web/user/chat/chat-base.js | 5 +-
.../src/main/webapp/css/general.css | 6 +-
.../src/main/webapp/css/images/disk.png | Bin 620 -> 0 bytes
7 files changed, 216 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1b44243e/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html
index 38aa767..78bc0e0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html
@@ -21,9 +21,7 @@
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div class="formSaveBar ui-widget-header">
- <div class="formSaveButton">
- <input type="submit" value="" wicket:id="ajax-save-button" wicket:message="title:144" />
- </div>
+ <div class="formSaveButton" wicket:id="ajax-save-button" wicket:message="title:144"></div>
<div class="formRefreshButton">
<input type="submit" value="" wicket:id="ajax-refresh-button" wicket:message="title:lbl.refresh" />
</div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1b44243e/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java
index a8401c5..fe1d033 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java
@@ -30,6 +30,8 @@ import static org.apache.openmeetings.web.room.RoomPanel.isModerator;
import java.util.Arrays;
import java.util.Date;
+import java.util.function.BooleanSupplier;
+import java.util.function.Predicate;
import org.apache.openmeetings.core.remote.MobileService;
import org.apache.openmeetings.core.util.WebSocketHelper;
@@ -40,7 +42,11 @@ import org.apache.openmeetings.db.entity.basic.ChatMessage;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.common.MainPanel;
+import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.attributes.IAjaxCallListener;
+import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.HiddenField;
import org.apache.wicket.model.Model;
@@ -62,44 +68,58 @@ public class ChatForm extends Form<Void> {
final ChatToolbar toolbar = new ChatToolbar("toolbarContainer", this);
final WysiwygEditor chatMessage = new WysiwygEditor("chatMessage", Model.of(""), toolbar);
add(toolbar
- , activeTab
+ , activeTab.add(new AjaxFormSubmitBehavior(this, "change") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target) {
+ toolbar.update(target);
+ }
+ })
, chatMessage.setOutputMarkupId(true)
, new AjaxButton("send") {
private static final long serialVersionUID = 1L;
@Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new IAjaxCallListener() {
+ @Override
+ public CharSequence getPrecondition(Component component) {
+ return "return Chat.validate();";
+ }
+ });
+ }
+
+ @Override
protected void onSubmit(AjaxRequestTarget target) {
final String txt = chatMessage.getDefaultModelObjectAsString();
if (Strings.isEmpty(txt)) {
return;
}
ChatDao dao = getBean(ChatDao.class);
- ChatMessage m = new ChatMessage();
+ final ChatMessage m = new ChatMessage();
m.setMessage(txt);
m.setSent(new Date());
m.setFromUser(getBean(UserDao.class).get(getUserId()));
- try {
- String scope = getScope();
- if (scope != null) {
- if (ID_ALL.equals(scope)) {
- //we done
- } else if (scope.startsWith(ID_ROOM_PREFIX)) {
- Room r = getBean(RoomDao.class).get(Long.parseLong(scope.substring(ID_ROOM_PREFIX.length())));
+ if (!process(
+ () -> true
+ , r -> {
if (isUserInRoom(r.getId(), getUserId())) {
m.setToRoom(r);
} else {
log.error("It seems like we are being hacked!!!!");
- return;
+ return false;
}
m.setNeedModeration(r.isChatModerated() && !isModerator(m.getFromUser().getId(), r.getId()));
- } else if (scope.startsWith(ID_USER_PREFIX)) {
- User u = getBean(UserDao.class).get(Long.parseLong(scope.substring(ID_USER_PREFIX.length())));
+ return true;
+ }, u -> {
m.setToUser(u);
- }
- }
- } catch (Exception e) {
- //no-op
- }
+ return true;
+ }))
+ {
+ return;
+ };
dao.update(m);
JSONObject msg = Chat.getMessage(Arrays.asList(m));
if (m.getToRoom() != null) {
@@ -125,4 +145,26 @@ public class ChatForm extends Form<Void> {
public String getScope() {
return activeTab.getModelObject();
}
+
+ boolean process(BooleanSupplier processAll, Predicate<Room> processRoom, Predicate<User> processUser) {
+ try {
+ final String scope = getScope();
+ if (Strings.isEmpty(scope) || ID_ALL.equals(scope)) {
+ return processAll.getAsBoolean();
+ } else if (scope.startsWith(ID_ROOM_PREFIX)) {
+ Room r = getBean(RoomDao.class).get(Long.parseLong(scope.substring(ID_ROOM_PREFIX.length())));
+ if (r != null) {
+ return processRoom.test(r);
+ }
+ } else if (scope.startsWith(ID_USER_PREFIX)) {
+ User u = getBean(UserDao.class).get(Long.parseLong(scope.substring(ID_USER_PREFIX.length())));
+ if (u != null) {
+ return processUser.test(u);
+ }
+ }
+ } catch (Exception e) {
+ //no-op
+ }
+ return false;
+ }
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1b44243e/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
index f605384..b31bce3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
@@ -71,7 +71,7 @@
</div>
</div>
<a class="chat-btn chat-tool-icon btn btn-default save" wicket:message="title:197" wicket:id="save"></a>
- <a class="chat-btn chat-tool-icon btn btn-default delete" wicket:message="title:442" wicket:id="ajax-cancel-button"></a>
+ <a class="chat-btn chat-tool-icon btn btn-default delete" wicket:message="title:442" wicket:id="delete"></a>
<a class="chat-btn chat-tool-icon btn btn-default audio" wicket:message="data-sound-enabled:sound.mute,data-sound-muted:sound.enable"> </a>
</div>
</wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1b44243e/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
index be6a789..9cb74f5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
@@ -18,25 +18,36 @@
*/
package org.apache.openmeetings.web.user.chat;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.openmeetings.core.util.WebSocketHelper.ID_ALL;
-import static org.apache.openmeetings.core.util.WebSocketHelper.ID_ROOM_PREFIX;
-import static org.apache.openmeetings.core.util.WebSocketHelper.ID_USER_PREFIX;
import static org.apache.openmeetings.db.util.AuthLevelUtil.hasAdminLevel;
import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.openmeetings.web.app.WebSession.getDateFormat;
import static org.apache.openmeetings.web.app.WebSession.getRights;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import static org.apache.openmeetings.web.common.BasePanel.EVT_CLICK;
+import static org.apache.openmeetings.web.room.RoomPanel.isModerator;
+import static org.apache.wicket.util.time.Duration.NONE;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
import org.apache.openmeetings.db.dao.basic.ChatDao;
-import org.apache.openmeetings.db.dao.room.RoomDao;
-import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.basic.ChatMessage;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.extensions.ajax.AjaxDownloadBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.resource.ResourceStreamResource;
+import org.apache.wicket.util.resource.IResourceStream;
+import org.apache.wicket.util.resource.StringResourceStream;
import com.googlecode.wicket.jquery.core.IJQueryWidget.JQueryWidget;
import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.toolbar.IWysiwygToolbar;
@@ -47,8 +58,83 @@ import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.toolbar.IWysiwygToolbar;
*/
public class ChatToolbar extends Panel implements IWysiwygToolbar {
private static final long serialVersionUID = 1L;
- private final WebMarkupContainer toolbar;
+ private static final String CHAT_FNAME_TMPL = "chatlog_%s.txt";
+ private final WebMarkupContainer toolbar = new WebMarkupContainer("toolbar");
+ private final WebMarkupContainer save = new WebMarkupContainer("save");
private final ChatForm chatForm;
+ private ConfirmableAjaxBorder delBtn;
+ private final AjaxDownloadBehavior download = new AjaxDownloadBehavior(new ResourceStreamResource() {
+ private static final long serialVersionUID = 1L;
+ private static final char delimiter = ',';
+ private static final char quoteCharacter = '"';
+ private final String quoteReplacement = new StringBuilder().append(quoteCharacter).append(quoteCharacter).toString();
+
+ {
+ setCacheDuration(NONE);
+ }
+
+ @Override
+ protected ResourceResponse newResourceResponse(Attributes attributes) {
+ ResourceResponse rr = super.newResourceResponse(attributes);
+ final boolean admin = hasAdminLevel(getRights());
+ if (!chatForm.process(
+ () -> admin
+ , r -> admin || isModerator(getUserId(), r.getId())
+ , u -> true))
+ {
+ rr.setError(HttpServletResponse.SC_FORBIDDEN);
+ }
+ return rr;
+ }
+
+ private String getName(User u) {
+ return String.format("%s %s", u.getFirstname(), u.getLastname());
+ }
+
+ private StringBuilder appendQuoted(StringBuilder sb, String value) {
+ return sb.append(quoteCharacter).append(value == null ? "" : value.replace(String.valueOf(quoteCharacter), quoteReplacement)).append(quoteCharacter);
+ }
+
+ private void export(List<ChatMessage> list, StringBuilder sb) {
+ String lineDelim = "";
+ for (ChatMessage msg : list) {
+ sb.append(lineDelim);
+ appendQuoted(sb, getName(msg.getFromUser())).append(delimiter);
+ appendQuoted(sb, getDateFormat().format(msg.getSent())).append(delimiter);
+ appendQuoted(sb, msg.getMessage());
+ lineDelim = "\r\n";
+ }
+ }
+
+ @Override
+ protected IResourceStream getResourceStream(Attributes attributes) {
+ final ChatDao dao = getBean(ChatDao.class);
+ final boolean admin = hasAdminLevel(getRights());
+ final StringBuilder sb = new StringBuilder();
+ chatForm.process(
+ () -> {
+ if (admin) {
+ setFileName(String.format(CHAT_FNAME_TMPL, "global"));
+ export(dao.getGlobal(0, Integer.MAX_VALUE), sb);
+ }
+ return true;
+ }
+ , r -> {
+ if (admin || isModerator(getUserId(), r.getId())) {
+ setFileName(String.format(CHAT_FNAME_TMPL, "room_" + r.getId()));
+ export(dao.getRoom(r.getId(), 0, Integer.MAX_VALUE, true), sb);
+ }
+ return true;
+ }, u -> {
+ setFileName(String.format(CHAT_FNAME_TMPL, "user_" + u.getId()));
+ export(dao.getUser(u.getId(), 0, Integer.MAX_VALUE), sb);
+ return true;
+ });
+ StringResourceStream srs = new StringResourceStream(sb, "text/csv");
+ srs.setCharset(UTF_8);
+ return srs;
+ }
+ });
/**
* Constructor
@@ -71,7 +157,6 @@ public class ChatToolbar extends Panel implements IWysiwygToolbar {
public ChatToolbar(String id, ChatForm form, IModel<String> model) {
super(id, model);
this.chatForm = form;
- add(toolbar = new WebMarkupContainer("toolbar"));
}
@Override
@@ -82,41 +167,68 @@ public class ChatToolbar extends Panel implements IWysiwygToolbar {
@Override
protected void onInitialize() {
super.onInitialize();
- ConfirmableAjaxBorder delBtn = new ConfirmableAjaxBorder("ajax-cancel-button", getString("80"), getString("832"), chatForm) {
+ add(toolbar);
+ add(download);
+ delBtn = new ConfirmableAjaxBorder("delete", getString("80"), getString("832"), chatForm) {
private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target) {
- ChatDao dao = getBean(ChatDao.class);
- String scope = chatForm.getScope();
- boolean clean = false;
- try {
- if (scope == null || ID_ALL.equals(scope)) {
- scope = ID_ALL;
- dao.deleteGlobal();
- clean = true;
- } else if (scope.startsWith(ID_ROOM_PREFIX)) {
- Room r = getBean(RoomDao.class).get(Long.parseLong(scope.substring(ID_ROOM_PREFIX.length())));
- if (r != null) {
- dao.deleteRoom(r.getId());
- clean = true;
- }
- } else if (scope.startsWith(ID_USER_PREFIX)) {
- User u = getBean(UserDao.class).get(Long.parseLong(scope.substring(ID_USER_PREFIX.length())));
- if (u != null) {
- dao.deleteUser(u.getId());
- clean = true;
+ final ChatDao dao = getBean(ChatDao.class);
+ final String scope = chatForm.getScope();
+ final boolean admin = hasAdminLevel(getRights());
+ chatForm.process(
+ () -> {
+ if (admin) {
+ dao.deleteGlobal();
+ clean(target, ID_ALL);
}
+ return true;
}
- } catch (Exception e) {
- //no-op
- }
- if (clean) {
- target.appendJavaScript("$('#" + scope + "').html('')");
- }
+ , r -> {
+ if (admin || isModerator(getUserId(), r.getId())) {
+ dao.deleteRoom(r.getId());
+ clean(target, scope);
+ }
+ return true;
+ }, u -> {
+ dao.deleteUser(u.getId());
+ clean(target, scope);
+ return true;
+ });
}
};
- toolbar.add(delBtn.setVisible(hasAdminLevel(getRights())));
- toolbar.add(new WebMarkupContainer("save").setVisible(hasAdminLevel(getRights())));
+ toolbar.add(delBtn.setVisible(hasAdminLevel(getRights())).setOutputMarkupId(true)
+ .setOutputMarkupPlaceholderTag(true));
+ toolbar.add(save.setVisible(hasAdminLevel(getRights())).setOutputMarkupId(true)
+ .setOutputMarkupPlaceholderTag(true).add(new AjaxEventBehavior(EVT_CLICK) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onEvent(AjaxRequestTarget target) {
+ download.initiate(target);
+ }
+ }));
+ }
+
+ private void clean(AjaxRequestTarget target, String scope) {
+ target.appendJavaScript("$('#" + scope + "').html('')");
+ }
+
+ void update(AjaxRequestTarget target) {
+ final boolean admin = hasAdminLevel(getRights());
+ chatForm.process(
+ () -> {
+ target.add(save.setVisible(admin), delBtn.setVisible(admin));
+ return true;
+ }
+ , r -> {
+ final boolean moder = admin || isModerator(getUserId(), r.getId());
+ target.add(save.setVisible(moder), delBtn.setVisible(moder));
+ return true;
+ }, u -> {
+ target.add(save.setVisible(true), delBtn.setVisible(true));
+ return true;
+ });
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1b44243e/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
index 334af38..1007e64 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
@@ -103,7 +103,7 @@ var Chat = function() {
initToolbar();
tabs = $("#chatTabs").tabs({
activate: function(event, ui) {
- $('#activeChatTab').val(ui.newPanel[0].id);
+ $('#activeChatTab').val(ui.newPanel[0].id).trigger('change');
}
});
// close icon: removing the tab on click
@@ -371,6 +371,9 @@ var Chat = function() {
, setRoomMode: _setRoomMode
, setHeight: _setHeight
, clean: _clean
+ , validate: function() {
+ return !!editor && editor.text().trim().length > 0;
+ }
};
}();
$(function() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1b44243e/openmeetings-web/src/main/webapp/css/general.css
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/css/general.css b/openmeetings-web/src/main/webapp/css/general.css
index 6a2b604..1d4f227 100644
--- a/openmeetings-web/src/main/webapp/css/general.css
+++ b/openmeetings-web/src/main/webapp/css/general.css
@@ -578,8 +578,10 @@ div.formSaveBar {
margin-top: 2px;
vertical-align: super;
}
-div.formSaveButton input {
- background: url(images/disk.png) no-repeat;
+div.formSaveButton {
+ background-image: url(images/file_save_as.png);
+ background-repeat: no-repeat;
+ background-size: 18px 18px;
float: left;
cursor: pointer;
width: 18px;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1b44243e/openmeetings-web/src/main/webapp/css/images/disk.png
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/css/images/disk.png b/openmeetings-web/src/main/webapp/css/images/disk.png
deleted file mode 100644
index 99d532e..0000000
Binary files a/openmeetings-web/src/main/webapp/css/images/disk.png and /dev/null differ