diff --git a/NEWS b/NEWS index 50b8a77fc..9fb3b9862 100644 --- a/NEWS +++ b/NEWS @@ -4,14 +4,15 @@ New features - new system default SOGoEncryptionKey to be used to encrypt the passwords of remote Web calendars when SOGoTrustProxyAuthentication is enabled + - activated the menu option "Mark Folder Read" in the Webmail (#1473) Enhancements - - Added logging of the X-Forwarded-For HTTP header (#2229) + - added logging of the X-Forwarded-For HTTP header (#2229) Bug fixes - - Don't use the cache for password lookups from login page (#2169) + - don't use the cache for password lookups from login page (#2169) - fixed issue with exceptions in repeating events - - Avoid data truncation issue in OpenChange with mysql backend + - avoid data truncation issue in OpenChange with mysql backend run sql-update-2.0.4b_to_2.0.5-mysql.sh to update existing tables 2.0.4b (2013-02-04) diff --git a/UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings index 7ba9903a5..825436cf4 100644 --- a/UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "Abrir em uma Nova Janela"; "Copy Folder Location" = "Copiar o Local da Pasta"; "Subscribe..." = "Inscrever-se..."; -"Mark Folder Read..." = "Marcar Pasta como Lido..."; +"Mark Folder Read" = "Marcar Pasta como Lido..."; "New Folder..." = "Nova Pasta..."; "Compact This Folder" = "Compactar Esta Pasta"; "Search Messages..." = "Procurar Mensagens..."; diff --git a/UI/MailerUI/Catalan.lproj/Localizable.strings b/UI/MailerUI/Catalan.lproj/Localizable.strings index 1543d6d5b..401299ece 100644 --- a/UI/MailerUI/Catalan.lproj/Localizable.strings +++ b/UI/MailerUI/Catalan.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "Obrir missatge en una finestra nova"; "Copy Folder Location" = "Copiar adreça de la carpeta"; "Subscribe..." = "Subscriure..."; -"Mark Folder Read..." = "Marcar carpeta com a llegida..."; +"Mark Folder Read" = "Marcar carpeta com a llegida..."; "New Folder..." = "Crear carpeta..."; "Compact This Folder" = "Compactar aquesta carpeta"; "Search Messages..." = "Cercar missatges..."; diff --git a/UI/MailerUI/Czech.lproj/Localizable.strings b/UI/MailerUI/Czech.lproj/Localizable.strings index 79886fb13..7e55a6dd9 100644 --- a/UI/MailerUI/Czech.lproj/Localizable.strings +++ b/UI/MailerUI/Czech.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "Otevřít v novém mailovém okně"; "Copy Folder Location" = "Kopírovat adresu složky"; "Subscribe..." = "Odebírat..."; -"Mark Folder Read..." = "Označit složku jako přečtenou..."; +"Mark Folder Read" = "Označit složku jako přečtenou..."; "New Folder..." = "Nová složka..."; "Compact This Folder" = "Provést údržbu složky"; "Search Messages..." = "Vyhledat zprávy..."; diff --git a/UI/MailerUI/Danish.lproj/Localizable.strings b/UI/MailerUI/Danish.lproj/Localizable.strings index e9dd97f78..8e5592395 100644 --- a/UI/MailerUI/Danish.lproj/Localizable.strings +++ b/UI/MailerUI/Danish.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "Åben i nyt vindue"; "Copy Folder Location" = "Kopier mappens lokation"; "Subscribe..." = "Abonnér ..."; -"Mark Folder Read..." = "Mark mappe som Læst ..."; +"Mark Folder Read" = "Mark mappe som Læst ..."; "New Folder..." = "Ny mappe ..."; "Compact This Folder" = "Komprimér denne mappe"; "Search Messages..." = "Søg beskeder ..."; diff --git a/UI/MailerUI/Dutch.lproj/Localizable.strings b/UI/MailerUI/Dutch.lproj/Localizable.strings index 6ec3c1358..9b18ae348 100644 --- a/UI/MailerUI/Dutch.lproj/Localizable.strings +++ b/UI/MailerUI/Dutch.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "In nieuw e-mailvenster openen"; "Copy Folder Location" = "Kopieer maplocatie"; "Subscribe..." = "Abonneren..."; -"Mark Folder Read..." = "Map als gelezen markeren"; +"Mark Folder Read" = "Map als gelezen markeren"; "New Folder..." = "Nieuwe map..."; "Compact This Folder" = "Comprimeer deze map"; "Search Messages..." = "Zoeken..."; diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings index 418bd6a49..92d7f6f5f 100644 --- a/UI/MailerUI/English.lproj/Localizable.strings +++ b/UI/MailerUI/English.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "Open in New Mail Window"; "Copy Folder Location" = "Copy Folder Location"; "Subscribe..." = "Subscribe..."; -"Mark Folder Read..." = "Mark Folder Read..."; +"Mark Folder Read" = "Mark Folder Read"; "New Folder..." = "New Folder..."; "Compact This Folder" = "Compact This Folder"; "Search Messages..." = "Search Messages..."; diff --git a/UI/MailerUI/Finnish.lproj/Localizable.strings b/UI/MailerUI/Finnish.lproj/Localizable.strings index dd10107c8..e5de5d9d9 100644 --- a/UI/MailerUI/Finnish.lproj/Localizable.strings +++ b/UI/MailerUI/Finnish.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "Avaa uudessa viesti-ikkunassa"; "Copy Folder Location" = "Kopioi kansion sijainti"; "Subscribe..." = "Liity..."; -"Mark Folder Read..." = "Merkitse kansio luetuksi..."; +"Mark Folder Read" = "Merkitse kansio luetuksi..."; "New Folder..." = "Uusi kansio..."; "Compact This Folder" = "Pakkaa tämä kansio"; "Search Messages..." = "Etsi viestejä..."; diff --git a/UI/MailerUI/French.lproj/Localizable.strings b/UI/MailerUI/French.lproj/Localizable.strings index 98a47adbf..abe35598f 100644 --- a/UI/MailerUI/French.lproj/Localizable.strings +++ b/UI/MailerUI/French.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "Ouvrir dans une nouvelle fenétre"; "Copy Folder Location" = "Copier l'adresse du dossier"; "Subscribe..." = "S'abonner..."; -"Mark Folder Read..." = "Marquer le dossier comme lu"; +"Mark Folder Read" = "Marquer le dossier comme lu"; "New Folder..." = "Nouveau dossier..."; "Compact This Folder" = "Compacter ce dossier"; "Search Messages..." = "Rechercher dans les messages..."; diff --git a/UI/MailerUI/German.lproj/Localizable.strings b/UI/MailerUI/German.lproj/Localizable.strings index a5bed3ef0..c5bbc1a4a 100644 --- a/UI/MailerUI/German.lproj/Localizable.strings +++ b/UI/MailerUI/German.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "In neuem Fenster öffnen"; "Copy Folder Location" = "Ordneradresse kopieren"; "Subscribe..." = "Abonnieren..."; -"Mark Folder Read..." = "Ordner als gelesen markieren"; +"Mark Folder Read" = "Ordner als gelesen markieren"; "New Folder..." = "Neuer Ordner..."; "Compact This Folder" = "Komprimieren"; "Search Messages..." = "Suchen..."; diff --git a/UI/MailerUI/Hungarian.lproj/Localizable.strings b/UI/MailerUI/Hungarian.lproj/Localizable.strings index 50234cbd5..0211ad020 100644 --- a/UI/MailerUI/Hungarian.lproj/Localizable.strings +++ b/UI/MailerUI/Hungarian.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "Megnyitás új üzenet ablakban"; "Copy Folder Location" = "Mappa helyének másolása"; "Subscribe..." = "Feliratkozás..."; -"Mark Folder Read..." = "Mappa megjelölése olvasottként..."; +"Mark Folder Read" = "Mappa megjelölése olvasottként..."; "New Folder..." = "Új mappa..."; "Compact This Folder" = "Mappa tömörítése"; "Search Messages..." = "Üzenetek keresése..."; diff --git a/UI/MailerUI/Icelandic.lproj/Localizable.strings b/UI/MailerUI/Icelandic.lproj/Localizable.strings index a6f949997..f8a6cf239 100644 --- a/UI/MailerUI/Icelandic.lproj/Localizable.strings +++ b/UI/MailerUI/Icelandic.lproj/Localizable.strings @@ -186,7 +186,7 @@ "Open in New Mail Window" = "Opna í nýjum glugga fyrir póst"; "Copy Folder Location" = "Afrita staðsetningu möppu"; "Subscribe..." = "Fá áskrift..."; -"Mark Folder Read..." = "Merkja möppu sem lesna..."; +"Mark Folder Read" = "Merkja möppu sem lesna..."; "New Folder..." = "Ný mappa..."; "Compact This Folder" = "Þjappa þessari möppu"; "Search Messages..." = "Leita í Skilaboðum..."; diff --git a/UI/MailerUI/Italian.lproj/Localizable.strings b/UI/MailerUI/Italian.lproj/Localizable.strings index 138c23a80..5d5b84071 100644 --- a/UI/MailerUI/Italian.lproj/Localizable.strings +++ b/UI/MailerUI/Italian.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "Apri in una nuova finestra"; "Copy Folder Location" = "Copia cartella"; "Subscribe..." = "Sottoscrivi..."; -"Mark Folder Read..." = "Contrassegna cartella come già letta..."; +"Mark Folder Read" = "Contrassegna cartella come già letta..."; "New Folder..." = "Nuova cartella..."; "Compact This Folder" = "Compatta cartella"; "Search Messages..." = "Cerca messaggi..."; diff --git a/UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings b/UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings index 4b4aa2ada..8d38c34fa 100644 --- a/UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings +++ b/UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "Åpne i nytt vindu"; "Copy Folder Location" = "Kopiere mappens lokasjon"; "Subscribe..." = "Abonnere..."; -"Mark Folder Read..." = "Merk mappe som lest..."; +"Mark Folder Read" = "Merk mappe som lest..."; "New Folder..." = "Ny mappe..."; "Compact This Folder" = "Komprimer mappen"; "Search Messages..." = "Søk meldinger..."; diff --git a/UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings b/UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings index 78ed3e9ec..27bb80b5b 100644 --- a/UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings +++ b/UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings @@ -186,7 +186,7 @@ "Open in New Mail Window" = "Åpne i nytt vindu"; "Copy Folder Location" = "Kopiere mappens lokasjon"; "Subscribe..." = "Abonnere..."; -"Mark Folder Read..." = "Merk mappe som lest..."; +"Mark Folder Read" = "Merk mappe som lest..."; "New Folder..." = "Ny mappe..."; "Compact This Folder" = "Komprimer mappen"; "Search Messages..." = "Søk meldinger..."; diff --git a/UI/MailerUI/Polish.lproj/Localizable.strings b/UI/MailerUI/Polish.lproj/Localizable.strings index 532e9db38..ea67784b8 100644 --- a/UI/MailerUI/Polish.lproj/Localizable.strings +++ b/UI/MailerUI/Polish.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "Otwórz w nowym oknie"; "Copy Folder Location" = "Kopiuj położenie foldera"; "Subscribe..." = "Subskrybuj"; -"Mark Folder Read..." = "Oznacz folder jako przeczytany"; +"Mark Folder Read" = "Oznacz folder jako przeczytany"; "New Folder..." = "Nowy folder"; "Compact This Folder" = "Kompaktuj ten folder"; "Search Messages..." = "Szukaj wiadomości"; diff --git a/UI/MailerUI/Russian.lproj/Localizable.strings b/UI/MailerUI/Russian.lproj/Localizable.strings index b09c4ec0b..52629d204 100644 --- a/UI/MailerUI/Russian.lproj/Localizable.strings +++ b/UI/MailerUI/Russian.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "Открыть в новом окне"; "Copy Folder Location" = "Скопировать адрес папки"; "Subscribe..." = "Подписаться..."; -"Mark Folder Read..." = "Отметить все письма в папке как прочтенные..."; +"Mark Folder Read" = "Отметить все письма в папке как прочтенные..."; "New Folder..." = "Создать папку..."; "Compact This Folder" = "Сжать эту папку"; "Search Messages..." = "Поиск в сообщениях..."; diff --git a/UI/MailerUI/Slovak.lproj/Localizable.strings b/UI/MailerUI/Slovak.lproj/Localizable.strings index e6baeee7b..44fc1bbd4 100644 --- a/UI/MailerUI/Slovak.lproj/Localizable.strings +++ b/UI/MailerUI/Slovak.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "Otvoriť v novom okne"; "Copy Folder Location" = "Kopírovať adresu priečinka"; "Subscribe..." = "Potvrď odber..."; -"Mark Folder Read..." = "Označ priečinok ako prečítaný..."; +"Mark Folder Read" = "Označ priečinok ako prečítaný..."; "New Folder..." = "Nový adresár"; "Compact This Folder" = "Vykonaj údržbu tohoto priečinku"; "Search Messages..." = "Hľadať správy"; diff --git a/UI/MailerUI/SpanishArgentina.lproj/Localizable.strings b/UI/MailerUI/SpanishArgentina.lproj/Localizable.strings index 5166a2a7e..9455bced7 100644 --- a/UI/MailerUI/SpanishArgentina.lproj/Localizable.strings +++ b/UI/MailerUI/SpanishArgentina.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "Abrir mensaje en nueva ventana"; "Copy Folder Location" = "Copiar dirección de la carpeta"; "Subscribe..." = "Suscribir..."; -"Mark Folder Read..." = "Marcar carpeta como leída..."; +"Mark Folder Read" = "Marcar carpeta como leída..."; "New Folder..." = "Crear carpeta..."; "Compact This Folder" = "Compactar esta carpeta"; "Search Messages..." = "Buscar mensajes..."; diff --git a/UI/MailerUI/SpanishSpain.lproj/Localizable.strings b/UI/MailerUI/SpanishSpain.lproj/Localizable.strings index a07103840..0df416d9c 100644 --- a/UI/MailerUI/SpanishSpain.lproj/Localizable.strings +++ b/UI/MailerUI/SpanishSpain.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "Abrir mensaje en nueva ventana"; "Copy Folder Location" = "Copiar dirección de la carpeta"; "Subscribe..." = "Suscribir..."; -"Mark Folder Read..." = "Marcar carpeta como leída..."; +"Mark Folder Read" = "Marcar carpeta como leída..."; "New Folder..." = "Crear carpeta..."; "Compact This Folder" = "Compactar esta carpeta"; "Search Messages..." = "Buscar mensajes..."; diff --git a/UI/MailerUI/Swedish.lproj/Localizable.strings b/UI/MailerUI/Swedish.lproj/Localizable.strings index d78d968ef..3ac0c88cd 100644 --- a/UI/MailerUI/Swedish.lproj/Localizable.strings +++ b/UI/MailerUI/Swedish.lproj/Localizable.strings @@ -186,7 +186,7 @@ "Open in New Mail Window" = "Öppna i nytt fönster"; "Copy Folder Location" = "Kopiera mappens sökväg"; "Subscribe..." = "Prenumrera..."; -"Mark Folder Read..." = "Märk mapp som läst..."; +"Mark Folder Read" = "Märk mapp som läst..."; "New Folder..." = "Ny mapp..."; "Compact This Folder" = "Komprimera mapp"; "Search Messages..." = "Sök meddelanden..."; diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m index 729c24b5a..41d4afc5e 100644 --- a/UI/MailerUI/UIxMailFolderActions.m +++ b/UI/MailerUI/UIxMailFolderActions.m @@ -256,6 +256,17 @@ return response; } +- (id) markFolderReadAction +{ + id response; + + response = [[self clientObject] addFlagsToAllMessages: @"seen"]; + if (!response) + response = [self responseWith204]; + + return response; +} + - (WOResponse *) exportFolderAction { WOResponse *response; diff --git a/UI/MailerUI/Ukrainian.lproj/Localizable.strings b/UI/MailerUI/Ukrainian.lproj/Localizable.strings index 86bf825cf..8a7f7b729 100644 --- a/UI/MailerUI/Ukrainian.lproj/Localizable.strings +++ b/UI/MailerUI/Ukrainian.lproj/Localizable.strings @@ -189,7 +189,7 @@ "Open in New Mail Window" = "Відкрити в новому вікні"; "Copy Folder Location" = "Копіювати адресу теки"; "Subscribe..." = "Підписатись..."; -"Mark Folder Read..." = "Відзначити всі листи в теці прочитаними"; +"Mark Folder Read" = "Відзначити всі листи в теці прочитаними"; "New Folder..." = "Створити теку..."; "Compact This Folder" = "Стиснути цю теку"; "Search Messages..." = "Пошук повідомлень..."; diff --git a/UI/MailerUI/Welsh.lproj/Localizable.strings b/UI/MailerUI/Welsh.lproj/Localizable.strings index f30090f6a..61ad37797 100644 --- a/UI/MailerUI/Welsh.lproj/Localizable.strings +++ b/UI/MailerUI/Welsh.lproj/Localizable.strings @@ -186,7 +186,7 @@ "Open in New Mail Window" = "Agor mewn ffenestr Neges Newydd"; "Copy Folder Location" = "Copio Lleoliad Ffolder"; "Subscribe..." = "Tanysgrifio..."; -"Mark Folder Read..." = "Marcio Ffolder Darllenwyd..."; +"Mark Folder Read" = "Marcio Ffolder Darllenwyd..."; "New Folder..." = "Ffolder Newydd..."; "Compact This Folder" = "Cywasgu'r ffolder hwn"; "Search Messages..." = "Chwilio negeseuon..."; diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist index 49941d90b..60d726ba0 100644 --- a/UI/MailerUI/product.plist +++ b/UI/MailerUI/product.plist @@ -132,6 +132,11 @@ actionClass = "UIxMailFolderActions"; actionName = "saveMessages"; }; + markRead = { + protectedBy = "View"; + actionClass = "UIxMailFolderActions"; + actionName = "markFolderRead"; + }; exportFolder = { protectedBy = "View"; actionClass = "UIxMailFolderActions"; diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox index c0438bb64..858156769 100644 --- a/UI/Templates/MailerUI/UIxMailMainFrame.wox +++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox @@ -54,7 +54,7 @@
    • -
    • +
    • @@ -70,7 +70,7 @@
    • -
    • +
    • @@ -87,7 +87,7 @@
    • -
    • +
    • diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index 3b0b381d0..99f646504 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -912,7 +912,7 @@ function refreshUnseenCounts() { } function getUnseenCountForFolder(mailbox) { - var url = ApplicationBaseURL + encodeURI(mailbox) + '/unseenCount'; + var url = URLForFolderID(mailbox) + '/unseenCount'; triggerAjaxRequest(url, unseenCountCallback, mailbox); } @@ -2353,17 +2353,37 @@ function onMenuRenameFolderConfirm() { } function onMenuDeleteFolder(event) { - showConfirmDialog(_("Confirmation"), - _("Do you really want to move this folder into the trash ?"), - onMenuDeleteFolderConfirm); -} - -function onMenuDeleteFolderConfirm() { var folderID = document.menuTarget.getAttribute("dataname"); var urlstr = URLForFolderID(folderID) + "/delete"; var errorLabel = _("The folder could not be deleted."); - triggerAjaxRequest(urlstr, folderOperationCallback, errorLabel); - disposeDialog(); + showConfirmDialog(_("Confirmation"), + _("Do you really want to move this folder into the trash ?"), + function(event) { + triggerAjaxRequest(urlstr, folderOperationCallback, errorLabel); + disposeDialog(); + }); +} + +function onMenuMarkFolderRead(event) { + var folderID = document.menuTarget.getAttribute("dataname"); + var urlstr = URLForFolderID(folderID) + "/markRead"; + + // Delete the associated data sources + deleteCachedMailbox(folderID); + + if (folderID == Mailer.currentMailbox) { + // Reset the data source so the message headers are reloaded in the callback function + Mailer.dataTable.dataSource.destroy(); + } + else { + // Reset the unseen count of the mailbox + var node = mailboxTree.getMailboxNode(folderID); + if (node) { + updateUnseenCount(node, 0, false); + } + } + + triggerAjaxRequest(urlstr, folderRefreshCallback, { "mailbox": folderID, "refresh": true }); } function onMenuExpungeFolder(event) { @@ -2767,22 +2787,19 @@ function onMenuAccountDelegation(event) { function getMenus() { var menus = { accountIconMenu: [ null, null, onMenuCreateFolder, null, null, onMenuAccountDelegation ], - inboxIconMenu: [ null, null, null, "-", null, + inboxIconMenu: [ null, null, null, "-", onMenuMarkFolderRead, onMenuCreateFolder, onMenuExpungeFolder, onMenuArchiveFolder, "-", null, onMenuSharing ], - trashIconMenu: [ null, null, null, "-", null, + trashIconMenu: [ null, null, null, "-", onMenuMarkFolderRead, onMenuCreateFolder, onMenuExpungeFolder, onMenuArchiveFolder, onMenuEmptyTrash, "-", null, onMenuSharing ], - mailboxIconMenu: [ null, null, null, "-", null, - onMenuCreateFolder, - onMenuRenameFolder, - onMenuExpungeFolder, - onMenuArchiveFolder, - onMenuDeleteFolder, - "folderTypeMenu", + mailboxIconMenu: [ null, null, null, "-", onMenuMarkFolderRead, + onMenuCreateFolder, onMenuRenameFolder, + onMenuExpungeFolder, onMenuArchiveFolder, + onMenuDeleteFolder, "folderTypeMenu", "-", null, onMenuSharing ], addressMenu: [ newContactFromEmail, newEmailTo ],