Implement Request #7424

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index a945122..dadb528 100644 (file)
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -2,6 +2,9 @@
 v5.0-cvs
 --------
 
+[mms] Encrypted bodytext now appears when replying/forwarding a message
+      (Request #1345).
+[mms] When deleting/emptying a folder, display message count (Request #7424).
 [mms] No longer need HTTP_Request - use Horde_Http_Client instead.
 [mms] Use Horde_Imap_Client as the IMAP library in IMP.
 [mms] DIMP and MIMP have been moved into IMP.

diff --git a/imp/folders.php b/imp/folders.php
index d70f9b0..1f783de 100644 (file)
--- a/imp/folders.php
+++ b/imp/folders.php
@@ -244,14 +244,17 @@ case 'folders_empty_mailbox_confirm':
         $loop = array();
         $rowct = 0;
         foreach ($folder_list as $val) {
-            if (!empty($conf['server']['fixed_folders']) &&
+            if (($actionID == 'delete_folder_confirm') &&
+                !empty($conf['server']['fixed_folders']) &&
                 in_array(IMP::folderPref($val, false), $conf['server']['fixed_folders'])) {
                 $notification->push(sprintf(_("The folder \"%s\" may not be deleted."), IMP::displayFolder($val)), 'horde.error');
                 continue;
             }
+            $elt_info = $imaptree->getElementInfo($val);
             $data = array(
                 'class' => (++$rowct % 2) ? 'item0' : 'item1',
                 'name' => htmlspecialchars(IMP::displayFolder($val)),
+                'msgs' => $elt_info['messages'],
                 'val' => htmlspecialchars($val)
             );
             $loop[] = $data;

diff --git a/imp/templates/folders/folders_confirm.html b/imp/templates/folders/folders_confirm.html
index 40f01c6..fa20ee8 100644 (file)
--- a/imp/templates/folders/folders_confirm.html
+++ b/imp/templates/folders/folders_confirm.html
@@ -15,7 +15,7 @@
 
 <loop:folders>
 <div class="<tag:folders.class />">
- &nbsp;<label><input type="checkbox" class="checkbox" name="folder_list[]" value="<tag:folders.val />" checked="checked" /> <tag:folders.name /></label>
+ &nbsp;<label><input type="checkbox" class="checkbox" name="folder_list[]" value="<tag:folders.val />" checked="checked" /> <tag:folders.name /> (<tag:folders.msgs /> <gettext>messages</gettext>)</label>
 </div>
 </loop:folders>