diff --git a/OGoContentStore/sql/generate-folderinfo-sql-for-users.sh b/OGoContentStore/sql/generate-folderinfo-sql-for-users.sh index 8780fbcb9..5190b2fa3 100755 --- a/OGoContentStore/sql/generate-folderinfo-sql-for-users.sh +++ b/OGoContentStore/sql/generate-folderinfo-sql-for-users.sh @@ -5,7 +5,7 @@ DB_USER="sogo" DB_PASS="sogo" -DB_HOST="127.0.0.1" +DB_HOST="192.168.0.4" DB_PORT="5432" DB_NAME="sogo" TIMEZONE="Canada/Eastern" diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index 4c28bcea7..341d8f5e9 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -193,14 +193,14 @@ function openMessageWindowsForSelection(action) { win = openMessageWindow(window.messageId, window.messageURL + "/" + action /* url */); else { - var messageList = $("messageList"); - var rows = messageList.getSelectedRowsId(); - var idset = ""; - for (var i = 0; i < rows.length; i++) - win = openMessageWindow(rows[i].substr(4) /* msguid */, - ApplicationBaseURL + currentMailbox - + "/" + rows[i].substr(4) - + "/" + action /* url */); + var messageList = $("messageList"); + var rows = messageList.getSelectedRowsId(); + var idset = ""; + for (var i = 0; i < rows.length; i++) + win = openMessageWindow(rows[i].substr(4) /* msguid */, + ApplicationBaseURL + currentMailbox + + "/" + rows[i].substr(4) + + "/" + action /* url */); } return false; @@ -699,12 +699,19 @@ function deleteSelectedMails() { /* message menu entries */ function onMenuOpenMessage(event) { - var node = getParentMenu(event.target).menuTarget.parentNode; - var msgId = node.getAttribute('id').substr(4); + return openMessageWindowsForSelection('popupview'); +} - return openMessageWindow(msgId, - ApplicationBaseURL + currentMailbox - + "/" + msgId + "/view"); +function onMenuReplyToSender(event) { + return openMessageWindowsForSelection('reply'); +} + +function onMenuReplyToAll(event) { + return openMessageWindowsForSelection('replyall'); +} + +function onMenuForwardMessage(event) { + return openMessageWindowsForSelection('forward'); } /* contacts */