From 586285d0d48b4ba8dab87219196c26e9b338e58c Mon Sep 17 00:00:00 2001
From: Steven Ngesera <muhngesteven@gmail.com>
Date: Sat, 5 Oct 2024 00:45:25 +0200
Subject: [PATCH 1/4] [ENH] Implement Expose IMAP capabilities for sharing
 folders

---
 modules/imap/functions.php       | 16 +++++++++++++---
 modules/imap/handler_modules.php |  1 +
 modules/imap/output_modules.php  |  3 ++-
 modules/imap/site.css            | 19 +++++++++++++++++++
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index 02ee8b9053..e5367a18b9 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -102,6 +102,12 @@ function prepare_imap_message_list($msgs, $mod, $type) {
     $mod->out('formatted_message_list', $res);
 }}
 
+if (!hm_exists('open_share_folder_modal')) {
+function open_share_folder_modal($folder, $id) {
+    
+}
+}
+
 /**
  * Build HTML for a list of IMAP folders
  * @subpackage imap/functions
@@ -111,7 +117,7 @@ function prepare_imap_message_list($msgs, $mod, $type) {
  * @return string
  */
 if (!hm_exists('format_imap_folder_section')) {
-function format_imap_folder_section($folders, $id, $output_mod, $with_input = false) {
+function format_imap_folder_section($folders, $id, $output_mod, $with_input = false, $can_share_folders = false) {
     $results = '<ul class="inner_list">';
     $manage = $output_mod->get('imap_folder_manage_link');
 
@@ -131,7 +137,7 @@ function format_imap_folder_section($folders, $id, $output_mod, $with_input = fa
                     $attrs .= ' class="folder-disabled"';
                 }
             } else {
-                $attrs = 'data-id="imap_'.$id.'_'.$output_mod->html_safe($folder_name).
+                $attrs = 'id="main-link" data-id="imap_'.$id.'_'.$output_mod->html_safe($folder_name).
                 '" href="?page=message_list&amp;list_path='.
                 urlencode('imap_'.$id.'_'.$output_mod->html_safe($folder_name)).'"';
             }
@@ -150,7 +156,11 @@ function format_imap_folder_section($folders, $id, $output_mod, $with_input = fa
         if ($with_input) {
             $results .= '<input type="checkbox" value="1" class="folder_subscription" id="'.$output_mod->html_safe($folder_name).'" name="'.$folder_name.'" '.($folder['subscribed']? 'checked="checked"': '').($folder['special']? ' disabled="disabled"': '').' />';
         }
-        $results .= '<span class="unread_count unread_imap_'.$id.'_'.$output_mod->html_safe($folder_name).'"></span></li>';
+        $results .= '<span class="unread_count unread_imap_'.$id.'_'.$output_mod->html_safe($folder_name).'"></span>';
+        if($can_share_folders) {
+            $results .= '<div class="dropdown"><a href="#" class="action-link" data-bs-toggle="dropdown" aria-expanded="false"><i class="icon bi bi-three-dots-vertical"></i></a><ul class="dropdown-menu dropdown-menu"><li><a href="#" class="dropdown-item"><i class="icon bi bi-share"></i> Share</a></ul></div>';
+        }
+        $results .= '</li>';
     }
     if ($manage) {
         $results .= '<li class="manage_folders_li"><i class="bi bi-gear-wide me-1"></i><a class="manage_folder_link" href="'.$manage.'">'.$output_mod->trans('Manage Folders').'</a></li>';
diff --git a/modules/imap/handler_modules.php b/modules/imap/handler_modules.php
index ca5b0f0489..afd299873b 100644
--- a/modules/imap/handler_modules.php
+++ b/modules/imap/handler_modules.php
@@ -755,6 +755,7 @@ public function process() {
             $with_subscription = isset($this->request->post['subscription_state']) && $this->request->post['subscription_state'];
             $cache = Hm_IMAP_List::get_cache($this->cache, $form['imap_server_id']);
             $imap = Hm_IMAP_List::connect($form['imap_server_id'], $cache);
+            $this->out('can_share_folders', stripos($imap->get_capability(), 'ACL') !== false);
             if (imap_authed($imap)) {
                 $quota_root = $imap->get_quota_root($folder ? $folder : 'INBOX');
                 if ($quota_root && isset($quota_root[0]['name'])) {
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index 273807b022..dfe04da0fc 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -777,8 +777,9 @@ protected function output() {
         $folder_data = $this->get('imap_expanded_folder_data', array());
         $with_input = $this->get('with_input', false);
         $folder = $this->get('folder', '');
+        $can_share_folders = $this->get('can_share_folders', false);
         if (!empty($folder_data)) {
-            $res .= format_imap_folder_section($folder_data, $this->get('imap_expanded_folder_id'), $this, $with_input);
+            $res .= format_imap_folder_section($folder_data, $this->get('imap_expanded_folder_id'), $this, $with_input, $can_share_folders);
             $quota = $this->get('quota');
             $quota_max = $this->get('quota_max');
             if (!$folder && $quota) {
diff --git a/modules/imap/site.css b/modules/imap/site.css
index 90d245c37d..95b3acf306 100644
--- a/modules/imap/site.css
+++ b/modules/imap/site.css
@@ -534,4 +534,23 @@
 
 .fade-in {
   animation-name: fadeIn;
+}
+li[class^="imap_"] .inner_list li[class^="imap_"] {
+    /* display: flex;
+    align-items: center; */
+    position: relative;
+    display: flex;
+    align-items: center;
+    border-radius: 4px;
+    margin: 2px 0;
+    transition: background-color .3s;
+}
+.inner_list li[class^="imap_"] #main-link {
+    flex-grow: 1;
+}
+.inner_list li[class^="imap_"] .action-link {
+    opacity: 0;
+}
+.inner_list li[class^="imap_"]:hover .action-link {
+    opacity: 1;
 }
\ No newline at end of file

From c252dd863b11faf8bf50cef2eca21eb91b51f091 Mon Sep 17 00:00:00 2001
From: Steven Ngesera <muhngesteven@gmail.com>
Date: Mon, 7 Oct 2024 01:56:16 +0200
Subject: [PATCH 2/4] Modal added

---
 modules/core/output_modules.php               | 71 ++++++++++++++++++-
 modules/core/site.js                          | 12 ++++
 modules/imap/functions.php                    |  2 +-
 modules/imap/site.js                          | 21 ++++++
 tests/phpunit/modules/core/output_modules.php |  2 +-
 5 files changed, 105 insertions(+), 3 deletions(-)

diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index 0354f9cd16..18643adf8a 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -1645,7 +1645,76 @@ class Hm_Output_content_section_end extends Hm_Output_Module {
      * Closes the main tag opened in Hm_Output_content_section_start
      */
     protected function output() {
-        return '</div></main>';
+        $share_folder_modal = '<div class="modal fade" id="shareFolderModal" tabindex="-1" aria-labelledby="shareFolderModalLabel" aria-hidden="true">';
+        $share_folder_modal .= '<div class="modal-dialog">';
+        $share_folder_modal .= '<div class="modal-content">';
+        $share_folder_modal .= '<div class="modal-header">';
+        $share_folder_modal .= '<h5 class="modal-title" id="shareFolderModalLabel">Edit Permissions</h5>';
+        $share_folder_modal .= '<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>';
+        $share_folder_modal .= '</div>';
+
+        $share_folder_modal .= '<div class="modal-body">';
+        $share_folder_modal .= '<form id="shareForm" action="" method="POST">';
+
+        $share_folder_modal .= '<input type="hidden" name="server_id" id="server_id" value="">';
+        $share_folder_modal .= '<input type="hidden" name="folder_uid" id="folder_uid" value="">';
+
+        $share_folder_modal .= '<div class="mb-3 row">';
+        $share_folder_modal .= '<div class="col-lg-4 col-md-4 col-sm-12">';
+        $share_folder_modal .= '<label class="form-label">Identifier</label>';
+        $share_folder_modal .= '</div>';
+        $share_folder_modal .= '<div class="col-lg-8 col-md-8 col-sm-12">';
+        $share_folder_modal .= '<div>';
+        $share_folder_modal .= '<input type="radio" name="identifier" value="user" id="identifierUser" checked>';
+        $share_folder_modal .= '<label for="identifierUser">User:</label>';
+        $share_folder_modal .= '<input type="text" class="form-control d-inline-block" id="email" name="email" required placeholder="Enter email">';
+        $share_folder_modal .= '</div>';
+        $share_folder_modal .= '<div>';
+        $share_folder_modal .= '<input type="radio" name="identifier" value="all" id="identifierAll">';
+        $share_folder_modal .= '<label for="identifierAll">All users (anyone)</label>';
+        $share_folder_modal .= '</div>';
+        $share_folder_modal .= '<div>';
+        $share_folder_modal .= '<input type="radio" name="identifier" value="guests" id="identifierGuests">';
+        $share_folder_modal .= '<label for="identifierGuests">Guests (anonymous)</label>';
+        $share_folder_modal .= '</div>';
+        $share_folder_modal .= '</div>';
+        $share_folder_modal .= '</div>';
+
+        $share_folder_modal .= '<div class="mb-3 row">';
+        $share_folder_modal .= '<div class="col-lg-4 col-md-4 col-sm-12">';
+        $share_folder_modal .= '<label class="form-label">Access Rights</label>';
+        $share_folder_modal .= '</div>';
+        $share_folder_modal .= '<div class="col-lg-8 col-md-8 col-sm-12">';
+        $share_folder_modal .= '<div>';
+        $share_folder_modal .= '<input type="checkbox" name="access_read" id="accessRead" checked>';
+        $share_folder_modal .= '<label for="accessRead">Read</label>';
+        $share_folder_modal .= '</div>';
+        $share_folder_modal .= '<div>';
+        $share_folder_modal .= '<input type="checkbox" name="access_write" id="accessWrite">';
+        $share_folder_modal .= '<label for="accessWrite">Write</label>';
+        $share_folder_modal .= '</div>';
+        $share_folder_modal .= '<div>';
+        $share_folder_modal .= '<input type="checkbox" name="access_delete" id="accessDelete">';
+        $share_folder_modal .= '<label for="accessDelete">Delete</label>';
+        $share_folder_modal .= '</div>';
+        $share_folder_modal .= '<div>';
+        $share_folder_modal .= '<input type="checkbox" name="access_other" id="accessOther">';
+        $share_folder_modal .= '<label for="accessOther">Other</label>';
+        $share_folder_modal .= '</div>';
+        $share_folder_modal .= '</div>';
+        $share_folder_modal .= '</div>';
+
+        $share_folder_modal .= '<div class="modal-footer">';
+        $share_folder_modal .= '<button type="submit" class="btn btn-primary">Save</button>';
+        $share_folder_modal .= '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>';
+        $share_folder_modal .= '</div>';
+
+        $share_folder_modal .= '</form>';
+        $share_folder_modal .= '</div>';
+        $share_folder_modal .= '</div>';
+        $share_folder_modal .= '</div>';
+        $share_folder_modal .= '</div>';
+        return '</div></main>'.$share_folder_modal;
     }
 }
 
diff --git a/modules/core/site.js b/modules/core/site.js
index c22f5700f4..e9bf2e852f 100644
--- a/modules/core/site.js
+++ b/modules/core/site.js
@@ -58,6 +58,18 @@ $.fn.fadeOutAndRemove = function(timeout = 600) {
     return this;
 };
 
+$.fn.modal = function(action) {
+    const modalElement = this[0];
+    if (modalElement) {
+        const modal = new bootstrap.Modal(modalElement);
+        if (action === 'show') {
+            modal.show();
+        } else if (action === 'hide') {
+            modal.hide();
+        }
+    }
+};
+
 /* swipe event handler */
 var swipe_event = function(el, callback, direction) {
     var start_x, start_y, dist_x, dist_y, threshold = 150, restraint = 100,
diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index e5367a18b9..d985ad880d 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -158,7 +158,7 @@ function format_imap_folder_section($folders, $id, $output_mod, $with_input = fa
         }
         $results .= '<span class="unread_count unread_imap_'.$id.'_'.$output_mod->html_safe($folder_name).'"></span>';
         if($can_share_folders) {
-            $results .= '<div class="dropdown"><a href="#" class="action-link" data-bs-toggle="dropdown" aria-expanded="false"><i class="icon bi bi-three-dots-vertical"></i></a><ul class="dropdown-menu dropdown-menu"><li><a href="#" class="dropdown-item"><i class="icon bi bi-share"></i> Share</a></ul></div>';
+            $results .= '<div class="dropdown"><a href="#" class="action-link" data-bs-toggle="dropdown" aria-expanded="false"><i class="icon bi bi-three-dots-vertical"></i></a><ul class="dropdown-menu dropdown-menu"><li data-id="'.$id.'" data-folder="'.$output_mod->html_safe($folder_name).'"><a href="#" class="dropdown-item share"><i class="icon bi bi-share"></i> Share</a></ul></div>';
         }
         $results .= '</li>';
     }
diff --git a/modules/imap/site.js b/modules/imap/site.js
index 4a16d00227..59e4d85246 100644
--- a/modules/imap/site.js
+++ b/modules/imap/site.js
@@ -1424,3 +1424,24 @@ $('.screen-email-like').on("click", function() {
     });
     add_email_in_contact_trusted(list_email); return false;
 });
+
+$(document).on('click', '[data-bs-dismiss="modal"]', function() {
+    $('#shareFolderModal').modal('hide');
+});
+
+$(document).on('click', 'a.dropdown-item.share', function(e) {
+    e.preventDefault();
+    console.log("Event", e)
+    const listItem = e.target.closest('li');
+    if(listItem) {
+        listItem.getAttribute('data-id');
+        const uid = listItem.getAttribute('data-id');
+        const folder = listItem.getAttribute('data-folder');
+        //must send a request to get the data using imap_getacl function
+
+        //then populate the modal with the data
+        $('#server_id').val(uid);
+        $('#folder_uid').val(folder);
+        $('#shareFolderModal').modal('show');
+    }
+});
diff --git a/tests/phpunit/modules/core/output_modules.php b/tests/phpunit/modules/core/output_modules.php
index a6853ca96c..904dc90bf1 100644
--- a/tests/phpunit/modules/core/output_modules.php
+++ b/tests/phpunit/modules/core/output_modules.php
@@ -1013,7 +1013,7 @@ public function test_content_section_start() {
     public function test_content_section_end() {
         $test = new Output_Test('content_section_end', 'core');
         $res = $test->run();
-        $this->assertEquals(array('</div></main>'), $res->output_response);
+        $this->assertEquals(array('</div></main><div class="modal fade" id="shareFolderModal" tabindex="-1" aria-labelledby="shareFolderModalLabel" aria-hidden="true"><div class="modal-dialog"><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="shareFolderModalLabel">Edit Permissions</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="modal-body"><form id="shareForm" action="" method="POST"><input type="hidden" name="server_id" id="server_id" value=""><input type="hidden" name="folder_uid" id="folder_uid" value=""><div class="mb-3 row"><div class="col-lg-4 col-md-4 col-sm-12"><label class="form-label">Identifier</label></div><div class="col-lg-8 col-md-8 col-sm-12"><div><input type="radio" name="identifier" value="user" id="identifierUser" checked><label for="identifierUser">User:</label><input type="text" class="form-control d-inline-block" id="email" name="email" required placeholder="Enter email"></div><div><input type="radio" name="identifier" value="all" id="identifierAll"><label for="identifierAll">All users (anyone)</label></div><div><input type="radio" name="identifier" value="guests" id="identifierGuests"><label for="identifierGuests">Guests (anonymous)</label></div></div></div><div class="mb-3 row"><div class="col-lg-4 col-md-4 col-sm-12"><label class="form-label">Access Rights</label></div><div class="col-lg-8 col-md-8 col-sm-12"><div><input type="checkbox" name="access_read" id="accessRead" checked><label for="accessRead">Read</label></div><div><input type="checkbox" name="access_write" id="accessWrite"><label for="accessWrite">Write</label></div><div><input type="checkbox" name="access_delete" id="accessDelete"><label for="accessDelete">Delete</label></div><div><input type="checkbox" name="access_other" id="accessOther"><label for="accessOther">Other</label></div></div></div><div class="modal-footer"><button type="submit" class="btn btn-primary">Save</button><button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button></div></form></div></div></div></div>'), $res->output_response);
     }
     /**
      * @preserveGlobalState disabled

From 359a2ce3b17ccfc6d36f7060c3e2b71fa7320c13 Mon Sep 17 00:00:00 2001
From: Steven Ngesera <muhngesteven@gmail.com>
Date: Thu, 10 Oct 2024 03:24:48 +0200
Subject: [PATCH 3/4] set_acl & get_acl implemented

---
 modules/core/functions.php                    |   1 +
 modules/core/output_modules.php               |  56 +++++++--
 modules/imap/functions.php                    |   2 +-
 modules/imap/handler_modules.php              |  77 +++++++++++++
 modules/imap/hm-imap.php                      | 109 ++++++++++++++++++
 modules/imap/output_modules.php               |   9 ++
 modules/imap/setup.php                        |  12 ++
 modules/imap/site.css                         |   6 +
 modules/imap/site.js                          |  73 +++++++++++-
 tests/phpunit/modules/core/functions.php      |   2 +-
 tests/phpunit/modules/core/output_modules.php |  11 +-
 11 files changed, 340 insertions(+), 18 deletions(-)

diff --git a/modules/core/functions.php b/modules/core/functions.php
index 9ade1c45e6..39b06fd0eb 100644
--- a/modules/core/functions.php
+++ b/modules/core/functions.php
@@ -443,6 +443,7 @@ function setup_base_page($name, $source=false, $use_layout=true) {
         add_output($name, 'folder_list_end', true, $source);
         add_output($name, 'content_section_start', true, $source);
         add_output($name, 'content_section_end', true, $source);
+        add_output($name, 'modals', true, $source);
         add_output($name, 'save_reminder', true, $source);
         add_output($name, 'content_end', false, $source, 'page_js', 'after');
     }
diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index 18643adf8a..b037c6371f 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -1644,9 +1644,22 @@ class Hm_Output_content_section_end extends Hm_Output_Module {
     /**
      * Closes the main tag opened in Hm_Output_content_section_start
      */
+    protected function output() {
+        return '</div></main>';
+    }
+}
+
+/**
+ * modals
+ * @subpackage core/output
+ */
+class Hm_Output_modals extends Hm_Output_Module {
+    /**
+     * Outputs modals
+     */
     protected function output() {
         $share_folder_modal = '<div class="modal fade" id="shareFolderModal" tabindex="-1" aria-labelledby="shareFolderModalLabel" aria-hidden="true">';
-        $share_folder_modal .= '<div class="modal-dialog">';
+        $share_folder_modal .= '<div class="modal-dialog modal-lg">';
         $share_folder_modal .= '<div class="modal-content">';
         $share_folder_modal .= '<div class="modal-header">';
         $share_folder_modal .= '<h5 class="modal-title" id="shareFolderModalLabel">Edit Permissions</h5>';
@@ -1654,16 +1667,37 @@ protected function output() {
         $share_folder_modal .= '</div>';
 
         $share_folder_modal .= '<div class="modal-body">';
-        $share_folder_modal .= '<form id="shareForm" action="" method="POST">';
+        $share_folder_modal .= '<div class="row">';
+
+        $share_folder_modal .= '<div class="col-lg-6 col-md-12">';
+
+        $share_folder_modal .= '<div id="loadingSpinner" class="text-center">';
+        $share_folder_modal .= '<div class="spinner-border text-primary" role="status">';
+        $share_folder_modal .= '<span class="visually-hidden">Loading...</span>';
+        $share_folder_modal .= '</div>';
+        $share_folder_modal .= '</div>';
 
+        $share_folder_modal .= '<table class="table table-striped" id="permissionTable" style="display:none;">';
+        $share_folder_modal .= '<thead>';
+        $share_folder_modal .= '<tr>';
+        $share_folder_modal .= '<th>Email</th>';
+        $share_folder_modal .= '<th>Permissions</th>';
+        $share_folder_modal .= '</tr>';
+        $share_folder_modal .= '</thead>';
+        $share_folder_modal .= '<tbody></tbody>';
+        $share_folder_modal .= '</table>';
+        
+        $share_folder_modal .= '</div>';
+        
+        $share_folder_modal .= '<div class="col-lg-6 col-md-12">';
+        $share_folder_modal .= '<form id="shareForm" action="" method="POST">';
         $share_folder_modal .= '<input type="hidden" name="server_id" id="server_id" value="">';
         $share_folder_modal .= '<input type="hidden" name="folder_uid" id="folder_uid" value="">';
+        $share_folder_modal .= '<input type="hidden" name="folder" id="folder" value="">';
 
         $share_folder_modal .= '<div class="mb-3 row">';
-        $share_folder_modal .= '<div class="col-lg-4 col-md-4 col-sm-12">';
+        $share_folder_modal .= '<div class="col-12">';
         $share_folder_modal .= '<label class="form-label">Identifier</label>';
-        $share_folder_modal .= '</div>';
-        $share_folder_modal .= '<div class="col-lg-8 col-md-8 col-sm-12">';
         $share_folder_modal .= '<div>';
         $share_folder_modal .= '<input type="radio" name="identifier" value="user" id="identifierUser" checked>';
         $share_folder_modal .= '<label for="identifierUser">User:</label>';
@@ -1681,10 +1715,8 @@ protected function output() {
         $share_folder_modal .= '</div>';
 
         $share_folder_modal .= '<div class="mb-3 row">';
-        $share_folder_modal .= '<div class="col-lg-4 col-md-4 col-sm-12">';
+        $share_folder_modal .= '<div class="col-12">';
         $share_folder_modal .= '<label class="form-label">Access Rights</label>';
-        $share_folder_modal .= '</div>';
-        $share_folder_modal .= '<div class="col-lg-8 col-md-8 col-sm-12">';
         $share_folder_modal .= '<div>';
         $share_folder_modal .= '<input type="checkbox" name="access_read" id="accessRead" checked>';
         $share_folder_modal .= '<label for="accessRead">Read</label>';
@@ -1708,13 +1740,17 @@ protected function output() {
         $share_folder_modal .= '<button type="submit" class="btn btn-primary">Save</button>';
         $share_folder_modal .= '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>';
         $share_folder_modal .= '</div>';
-
         $share_folder_modal .= '</form>';
+        $share_folder_modal .= '</div>';
+
         $share_folder_modal .= '</div>';
+        $share_folder_modal .= '</div>';
+
         $share_folder_modal .= '</div>';
         $share_folder_modal .= '</div>';
         $share_folder_modal .= '</div>';
-        return '</div></main>'.$share_folder_modal;
+
+        return $share_folder_modal;
     }
 }
 
diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index d985ad880d..0ae238daab 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -158,7 +158,7 @@ function format_imap_folder_section($folders, $id, $output_mod, $with_input = fa
         }
         $results .= '<span class="unread_count unread_imap_'.$id.'_'.$output_mod->html_safe($folder_name).'"></span>';
         if($can_share_folders) {
-            $results .= '<div class="dropdown"><a href="#" class="action-link" data-bs-toggle="dropdown" aria-expanded="false"><i class="icon bi bi-three-dots-vertical"></i></a><ul class="dropdown-menu dropdown-menu"><li data-id="'.$id.'" data-folder="'.$output_mod->html_safe($folder_name).'"><a href="#" class="dropdown-item share"><i class="icon bi bi-share"></i> Share</a></ul></div>';
+            $results .= '<div class="dropdown"><a href="#" class="action-link" data-bs-toggle="dropdown" aria-expanded="false"><i class="icon bi bi-three-dots-vertical"></i></a><ul class="dropdown-menu dropdown-menu"><li data-id="'.$id.'" data-folder-uid="'.$output_mod->html_safe($folder_name).'" data-folder="'.$output_mod->html_safe($folder['basename']).'"><a href="#" class="dropdown-item share"><i class="icon bi bi-share"></i> Share</a></ul></div>';
         }
         $results .= '</li>';
     }
diff --git a/modules/imap/handler_modules.php b/modules/imap/handler_modules.php
index afd299873b..e3ccb91243 100644
--- a/modules/imap/handler_modules.php
+++ b/modules/imap/handler_modules.php
@@ -1631,6 +1631,83 @@ public function process() {
         }
     }
 }
+/**
+ * Load IMAP servers permissions for shared folders
+ * @subpackage imap/handler
+ */
+class Hm_Handler_load_imap_folders_permissions extends Hm_Handler_Module {
+    /**
+     * Output IMAP server permissions array for shared folders
+     */
+    public function process() {
+        list($success, $form) = $this->process_form(array('imap_server_id','imap_folder_uid','imap_folder'));
+        
+        if ($success && !empty($form['imap_server_id']) && !empty($form['imap_folder'])  && !empty($form['imap_folder_uid'])) {
+            Hm_IMAP_List::init($this->user_config, $this->session);
+            $server = Hm_IMAP_List::dump($form['imap_server_id'], true);
+            $cache = Hm_IMAP_List::get_cache($this->cache, $form['imap_server_id']);
+            
+            $imap = Hm_IMAP_List::connect($form['imap_server_id'], $cache, $server['user'], $server['pass']);
+            $permissions = $imap->get_acl($form['imap_folder']);
+            $this->out('imap_folders_permissions', $permissions);
+        }
+    }
+}
+
+/**
+ * Load IMAP servers permissions for shared folders
+ * @subpackage imap/handler
+ */
+class Hm_Handler_set_acl_to_imap_folders extends Hm_Handler_Module {
+    /**
+     * Output IMAP server permissions array for shared folders
+     */
+    public function process() {
+        list($success, $form) = $this->process_form(array('imap_server_id','imap_folder','identifier','permissions'));
+        
+        if ($success && !empty($form['imap_server_id']) && !empty($form['identifier'])  && !empty($form['permissions'])) {
+
+            Hm_IMAP_List::init($this->user_config, $this->session);
+            $server = Hm_IMAP_List::dump($form['imap_server_id'], true);
+            $cache = Hm_IMAP_List::get_cache($this->cache, $form['imap_server_id']);
+            
+            $imap = Hm_IMAP_List::connect($form['imap_server_id'], $cache, $server['user'], $server['pass']);
+            $response = $imap->set_acl($form['imap_folder'], $form['identifier'], $form['permissions']);
+            exit(var_dump($response));
+        }
+    }
+
+    // Define the permission mapping
+    private function map_permissions($rights_string) {
+        $permissions = [];
+        
+        // Map each permission character to its description
+        $permission_map = [
+            'l' => 'Lookup',
+            'r' => 'Read',
+            'w' => 'Write',
+            's' => 'See',
+            't' => 'Take',
+            'i' => 'Insert',
+            'p' => 'Post',
+            'e' => 'Examine',
+            'k' => 'Administer',
+            'a' => 'All rights',
+            'd' => 'Delete',
+            'c' => 'Create',
+            'x' => 'Delete mailbox',
+        ];
+
+        // Check which permissions are present in the rights string
+        foreach (str_split($rights_string) as $char) {
+            if (array_key_exists($char, $permission_map)) {
+                $permissions[] = $permission_map[$char];
+            }
+        }
+
+        return $permissions; // Return the list of permissions
+    }
+}
 
 /**
  * Load IMAP servers for the user config object
diff --git a/modules/imap/hm-imap.php b/modules/imap/hm-imap.php
index 8d002fc808..e8625965e3 100644
--- a/modules/imap/hm-imap.php
+++ b/modules/imap/hm-imap.php
@@ -369,6 +369,78 @@ public function get_capability() {
             return $this->capability;
         }
 
+        /**
+        * Sets the Access Control List (ACL) for a specified mailbox.
+        *
+        * This function sends the `SETACL` command to the IMAP server to modify
+        * the access rights of a user or identifier for a given mailbox. The access rights
+        * can either be granted or revoked based on the rights modification string.
+        *
+        * The third argument can either:
+        * - Add rights (using a `+` prefix),
+        * - Remove rights (using a `-` prefix),
+        * - Completely replace existing rights (no prefix).
+        *
+        * @param string $mailbox_name The name of the mailbox for which the ACL is to be set.
+        * @param string $identifier The user or identifier whose permissions are being modified.
+        * @param string $rights_modification The modification to the user's rights (e.g., "+rw" to add read and write access,
+        *                                    "-w" to remove write access, or "rw" to set read and write access explicitly).
+        *
+        * @return bool True if the ACL was successfully set, false if an error occurred.
+        */
+        public function set_acl($mailbox_name, $identifier, $rights_modification) {
+            $command = "SETACL \"$mailbox_name\" \"$identifier\" \"$rights_modification\"\r\n";
+            
+            $this->send_command($command);
+            $response = $this->get_response();
+
+            foreach ($response as $line) {
+                if (mb_strpos($line, 'OK') !== false) {
+                    return true;
+                }
+                elseif (mb_strpos($line, 'NO') !== false || mb_strpos($line, 'BAD') !== false) {
+                    $this->debug[] = 'SETACL failed: ' . $line;
+                    return false;
+                }
+            }
+            return false;
+        }
+
+        /**
+        * Retrieves the Access Control List (ACL) for a specified mailbox.
+        *
+        * This function sends a `GETACL` command to the IMAP server to fetch the list
+        * of users and their respective access rights for the given mailbox. It then
+        * parses the server's response and maps the raw rights to human-readable
+        * permissions using the `map_permissions` function.
+        *
+        * @param string $mailbox_name The name of the mailbox for which to retrieve the ACL.
+        *
+        * @return array An associative array where the keys are email addresses (or user identifiers),
+        *               and the values are human-readable permissions (e.g., 'Read, Write').
+        */
+        public function get_acl($mailbox_name) {
+            $acl_list = [];        
+            $command = "GETACL \"$mailbox_name\"\r\n";
+            $this->send_command($command);
+            $response = $this->get_response();
+        
+            foreach ($response as $line) {
+                if (preg_match('/^\* ACL ([^\s]+) (.+)$/', $line, $matches)) {
+                    $mailbox = $matches[1];
+                    $acl_string = $matches[2];
+        
+                    $acl_parts = explode(' ', $acl_string);
+                    for ($i = 1; $i < count($acl_parts); $i += 2) {
+                        $user = $acl_parts[$i - 1];
+                        $rights = $acl_parts[$i];      
+                        $acl_list[$user] = $this->map_permissions($rights);
+                    }
+                }
+            }
+            return $acl_list;
+        }
+
         /**
          * special version of LIST to return just special use mailboxes
          * @param string $type type of special folder to return (sent, all, trash, flagged, junk)
@@ -892,6 +964,43 @@ public function get_message_structure($uid) {
             return $struct;
         }
 
+        /**
+        * This function maps raw IMAP rights to human-readable permissions.
+        *
+        * It takes the raw IMAP rights string, such as 'lrws' and converts it into a more
+        * understandable format like 'Lookup, Read, Write, Write Seen'.
+        *
+        * @param string $rights The string of IMAP rights (e.g., 'lrws'), where each character 
+        *                       represents a specific permission.
+        *
+        * @return string A comma-separated string of human-readable permissions.
+        */
+        private function map_permissions($rights_string) {
+            $permissions = [];
+            $permission_map = [
+                'l' => 'Lookup',
+                'r' => 'Read',
+                's' => 'See',
+                'w' => 'Write',
+                'i' => 'Insert',
+                'p' => 'Post',
+                'k' => 'Administer',
+                'x' => 'Delete Mailbox',
+                't' => 'Take',
+                'e' => 'Examine',
+                'c' => 'Create',
+                'd' => 'Delete'
+            ];
+        
+            foreach (str_split($rights_string) as $char) {
+                if (isset($permission_map[$char])) {
+                    $permissions[] = $permission_map[$char];
+                }
+            }
+        
+            return implode(', ', $permissions);
+        }
+
         /**
          * get the raw IMAP BODYSTRUCTURE response
          * @param int $uid IMAP UID of the message
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index dfe04da0fc..a62ab0fe3c 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -790,6 +790,15 @@ protected function output() {
     }
 }
 
+/**
+ * @subpackage imap/output
+ */
+class Hm_Output_get_list_imap_folders_permissions extends Hm_Output_Module {
+    public function output() {
+        $this->out('ajax_imap_folders_permissions', $this->get('imap_folders_permissions', array()));
+    }
+}
+
 /**
  * Add move/copy dialog to the message list controls
  * @subpackage imap/output
diff --git a/modules/imap/setup.php b/modules/imap/setup.php
index 71cac98234..4722524bed 100644
--- a/modules/imap/setup.php
+++ b/modules/imap/setup.php
@@ -318,6 +318,12 @@
 add_handler('ajax_imap_unsnooze', 'save_imap_cache',  true);
 add_handler('ajax_imap_unsnooze', 'imap_unsnooze_message',  true, 'core');
 
+/* share folders */
+setup_base_ajax_page('ajax_share_folders', 'core');
+add_handler('ajax_share_folders', 'load_imap_folders_permissions',  true);
+add_output('ajax_share_folders', 'get_list_imap_folders_permissions',  true);
+add_handler('ajax_share_folders', 'set_acl_to_imap_folders',  true);
+
 /* allowed input */
 return array(
     'allowed_pages' => array(
@@ -346,6 +352,7 @@
         'ajax_imap_unsnooze',
         'ajax_imap_junk',
         'message_source',
+        'ajax_share_folders',
     ),
 
     'allowed_output' => array(
@@ -368,6 +375,7 @@
         'snoozed_messages' => array(FILTER_VALIDATE_INT, false),
         'auto_advance_email_enabled' => array(FILTER_VALIDATE_BOOLEAN, false),
         'do_not_flag_as_read_on_open' => array(FILTER_VALIDATE_BOOLEAN, false),
+        'ajax_imap_folders_permissions' => array(FILTER_UNSAFE_RAW, FILTER_REQUIRE_ARRAY),
     ),
 
     'allowed_get' => array(
@@ -438,5 +446,9 @@
         'tag_id' => FILTER_DEFAULT,
         'first_time_screen_emails' => FILTER_VALIDATE_INT,
         'move_messages_in_screen_email' => FILTER_VALIDATE_BOOLEAN,
+        'imap_folder_uid' => FILTER_DEFAULT,
+        'imap_folder' => FILTER_DEFAULT,
+        'identifier' => FILTER_DEFAULT,
+        'permissions' => FILTER_DEFAULT,
     )
 );
diff --git a/modules/imap/site.css b/modules/imap/site.css
index 95b3acf306..bc8ff84d2d 100644
--- a/modules/imap/site.css
+++ b/modules/imap/site.css
@@ -553,4 +553,10 @@ li[class^="imap_"] .inner_list li[class^="imap_"] {
 }
 .inner_list li[class^="imap_"]:hover .action-link {
     opacity: 1;
+}
+#loadingSpinner {
+    position: absolute;
+    left: 25%;
+    top: 50%;
+    transform: translate(-50%, -50%);
 }
\ No newline at end of file
diff --git a/modules/imap/site.js b/modules/imap/site.js
index 59e4d85246..d062ef39b1 100644
--- a/modules/imap/site.js
+++ b/modules/imap/site.js
@@ -1431,17 +1431,80 @@ $(document).on('click', '[data-bs-dismiss="modal"]', function() {
 
 $(document).on('click', 'a.dropdown-item.share', function(e) {
     e.preventDefault();
-    console.log("Event", e)
     const listItem = e.target.closest('li');
     if(listItem) {
         listItem.getAttribute('data-id');
         const uid = listItem.getAttribute('data-id');
+        const folder_uid = listItem.getAttribute('data-folder-uid');
         const folder = listItem.getAttribute('data-folder');
-        //must send a request to get the data using imap_getacl function
-
-        //then populate the modal with the data
         $('#server_id').val(uid);
-        $('#folder_uid').val(folder);
+        $('#folder_uid').val(folder_uid);
+        $('#folder').val(folder);
+        const currentLabel = $('#shareFolderModalLabel').text();
+        $('#shareFolderModalLabel').text(`${currentLabel} - ${folder} Folder`);
+
+        $('#shareFolderModalLabel').val(`Share ${folder} Folder`);
+        $('#shareFolderModal table tbody').empty();
+        $('#loadingSpinner').show();
+        Hm_Ajax.request(
+            [
+              { name: 'hm_ajax_hook', value: 'ajax_share_folders' },
+              { name: 'imap_server_id', value: uid },
+              { name: 'imap_folder_uid', value: folder_uid },
+              { name: 'imap_folder', value: folder },
+            ],
+            function (res) {
+                $('#loadingSpinner').hide();
+                if (res.ajax_imap_folders_permissions) {
+                    //then populate the modal with the data
+                    const permissions = res.ajax_imap_folders_permissions;
+                    for (const [email, permissionList] of Object.entries(permissions)) {
+                        const row = `
+                            <tr>
+                                <td>${email}</td>
+                                <td>${permissionList}</td>
+                            </tr>
+                        `;
+                        $('#shareFolderModal table tbody').append(row);
+                    }
+                    $('#permissionTable').show();
+                }
+            }
+        );
         $('#shareFolderModal').modal('show');
     }
 });
+
+$(document).on('submit', '#shareForm', function(e) {
+    e.preventDefault();
+    const server_id = $('#server_id').val();
+    const folder = $('#folder').val();
+
+
+    let identifier = '';
+    if ($('#identifierUser').is(':checked')) {
+        identifier = $('#email').val();
+    } else if ($('#identifierAll').is(':checked')) {
+        identifier = 'all';
+    } else if ($('#identifierGuests').is(':checked')) {
+        identifier = 'guests';
+    }
+
+    let permissions = '';
+    if ($('#accessRead').is(':checked')) permissions += 'r';
+    if ($('#accessWrite').is(':checked')) permissions += 'w';
+    if ($('#accessDelete').is(':checked')) permissions += 'd';
+    if ($('#accessOther').is(':checked')) permissions += 'a'; 
+    Hm_Ajax.request(
+        [
+          { name: 'hm_ajax_hook', value: 'ajax_share_folders' },
+          { name: 'imap_server_id', value: server_id },
+          { name: 'identifier', value: identifier },
+          { name: 'imap_folder', value: folder },
+          { name: 'permissions', value: `+${permissions}` },
+        ],
+        function (res) {
+            window.location.reload();
+        }
+    );
+});
diff --git a/tests/phpunit/modules/core/functions.php b/tests/phpunit/modules/core/functions.php
index d0f7b383b7..818cf4018e 100644
--- a/tests/phpunit/modules/core/functions.php
+++ b/tests/phpunit/modules/core/functions.php
@@ -171,7 +171,7 @@ public function test_setup_base_page() {
         $res2 = Hm_Output_Modules::dump();
         $len2 = count($res2['foo']);
         $this->assertEquals(12, $len);
-        $this->assertEquals(19, $len2);
+        $this->assertEquals(20, $len2);
     }
     /**
      * @preserveGlobalState disabled
diff --git a/tests/phpunit/modules/core/output_modules.php b/tests/phpunit/modules/core/output_modules.php
index 904dc90bf1..02f90ec28d 100644
--- a/tests/phpunit/modules/core/output_modules.php
+++ b/tests/phpunit/modules/core/output_modules.php
@@ -1013,7 +1013,16 @@ public function test_content_section_start() {
     public function test_content_section_end() {
         $test = new Output_Test('content_section_end', 'core');
         $res = $test->run();
-        $this->assertEquals(array('</div></main><div class="modal fade" id="shareFolderModal" tabindex="-1" aria-labelledby="shareFolderModalLabel" aria-hidden="true"><div class="modal-dialog"><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="shareFolderModalLabel">Edit Permissions</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="modal-body"><form id="shareForm" action="" method="POST"><input type="hidden" name="server_id" id="server_id" value=""><input type="hidden" name="folder_uid" id="folder_uid" value=""><div class="mb-3 row"><div class="col-lg-4 col-md-4 col-sm-12"><label class="form-label">Identifier</label></div><div class="col-lg-8 col-md-8 col-sm-12"><div><input type="radio" name="identifier" value="user" id="identifierUser" checked><label for="identifierUser">User:</label><input type="text" class="form-control d-inline-block" id="email" name="email" required placeholder="Enter email"></div><div><input type="radio" name="identifier" value="all" id="identifierAll"><label for="identifierAll">All users (anyone)</label></div><div><input type="radio" name="identifier" value="guests" id="identifierGuests"><label for="identifierGuests">Guests (anonymous)</label></div></div></div><div class="mb-3 row"><div class="col-lg-4 col-md-4 col-sm-12"><label class="form-label">Access Rights</label></div><div class="col-lg-8 col-md-8 col-sm-12"><div><input type="checkbox" name="access_read" id="accessRead" checked><label for="accessRead">Read</label></div><div><input type="checkbox" name="access_write" id="accessWrite"><label for="accessWrite">Write</label></div><div><input type="checkbox" name="access_delete" id="accessDelete"><label for="accessDelete">Delete</label></div><div><input type="checkbox" name="access_other" id="accessOther"><label for="accessOther">Other</label></div></div></div><div class="modal-footer"><button type="submit" class="btn btn-primary">Save</button><button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button></div></form></div></div></div></div>'), $res->output_response);
+        $this->assertEquals(array('</div></main>'), $res->output_response);
+    }
+    /**
+     * @preserveGlobalState disabled
+     * @runInSeparateProcess
+     */
+    public function test_modals() {
+        $test = new Output_Test('modals', 'core');
+        $res = $test->run();
+        $this->assertEquals(array('<div class="modal fade" id="shareFolderModal" tabindex="-1" aria-labelledby="shareFolderModalLabel" aria-hidden="true"><div class="modal-dialog modal-lg"><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="shareFolderModalLabel">Edit Permissions</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="modal-body"><div class="row"><div class="col-lg-6 col-md-12"><div id="loadingSpinner" class="text-center"><div class="spinner-border text-primary" role="status"><span class="visually-hidden">Loading...</span></div></div><table class="table table-striped" id="permissionTable" style="display:none;"><thead><tr><th>Email</th><th>Permissions</th></tr></thead><tbody></tbody></table></div><div class="col-lg-6 col-md-12"><form id="shareForm" action="" method="POST"><input type="hidden" name="server_id" id="server_id" value=""><input type="hidden" name="folder_uid" id="folder_uid" value=""><input type="hidden" name="folder" id="folder" value=""><div class="mb-3 row"><div class="col-12"><label class="form-label">Identifier</label><div><input type="radio" name="identifier" value="user" id="identifierUser" checked><label for="identifierUser">User:</label><input type="text" class="form-control d-inline-block" id="email" name="email" required placeholder="Enter email"></div><div><input type="radio" name="identifier" value="all" id="identifierAll"><label for="identifierAll">All users (anyone)</label></div><div><input type="radio" name="identifier" value="guests" id="identifierGuests"><label for="identifierGuests">Guests (anonymous)</label></div></div></div><div class="mb-3 row"><div class="col-12"><label class="form-label">Access Rights</label><div><input type="checkbox" name="access_read" id="accessRead" checked><label for="accessRead">Read</label></div><div><input type="checkbox" name="access_write" id="accessWrite"><label for="accessWrite">Write</label></div><div><input type="checkbox" name="access_delete" id="accessDelete"><label for="accessDelete">Delete</label></div><div><input type="checkbox" name="access_other" id="accessOther"><label for="accessOther">Other</label></div></div></div><div class="modal-footer"><button type="submit" class="btn btn-primary">Save</button><button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button></div></form></div></div></div></div></div></div>'), $res->output_response);
     }
     /**
      * @preserveGlobalState disabled

From ac7d952fda21ce1be5bb8bf06a65c44753f2b0d5 Mon Sep 17 00:00:00 2001
From: Steven Ngesera <muhngesteven@gmail.com>
Date: Fri, 11 Oct 2024 01:42:50 +0200
Subject: [PATCH 4/4] delete_acl add

---
 modules/core/output_modules.php               | 33 ++++-----
 modules/imap/functions.php                    |  6 --
 modules/imap/handler_modules.php              | 46 +++---------
 modules/imap/hm-imap.php                      | 42 +++++++++++
 modules/imap/setup.php                        |  1 +
 modules/imap/site.css                         |  2 +-
 modules/imap/site.js                          | 72 +++++++++++++++----
 tests/phpunit/modules/core/output_modules.php |  2 +-
 8 files changed, 131 insertions(+), 73 deletions(-)

diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index b037c6371f..47e93d3acd 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -1662,14 +1662,14 @@ protected function output() {
         $share_folder_modal .= '<div class="modal-dialog modal-lg">';
         $share_folder_modal .= '<div class="modal-content">';
         $share_folder_modal .= '<div class="modal-header">';
-        $share_folder_modal .= '<h5 class="modal-title" id="shareFolderModalLabel">Edit Permissions</h5>';
+        $share_folder_modal .= '<h5 class="modal-title" id="shareFolderModalLabel">'.$this->trans('Edit Permissions').'</h5>';
         $share_folder_modal .= '<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>';
         $share_folder_modal .= '</div>';
 
         $share_folder_modal .= '<div class="modal-body">';
         $share_folder_modal .= '<div class="row">';
 
-        $share_folder_modal .= '<div class="col-lg-6 col-md-12">';
+        $share_folder_modal .= '<div class="col-lg-8 col-md-12">';
 
         $share_folder_modal .= '<div id="loadingSpinner" class="text-center">';
         $share_folder_modal .= '<div class="spinner-border text-primary" role="status">';
@@ -1680,8 +1680,9 @@ protected function output() {
         $share_folder_modal .= '<table class="table table-striped" id="permissionTable" style="display:none;">';
         $share_folder_modal .= '<thead>';
         $share_folder_modal .= '<tr>';
-        $share_folder_modal .= '<th>Email</th>';
-        $share_folder_modal .= '<th>Permissions</th>';
+        $share_folder_modal .= '<th>'.$this->trans('User').'</th>';
+        $share_folder_modal .= '<th>'.$this->trans('Permissions').'</th>';
+        $share_folder_modal .= '<th>'.$this->trans('Actions').'</th>';
         $share_folder_modal .= '</tr>';
         $share_folder_modal .= '</thead>';
         $share_folder_modal .= '<tbody></tbody>';
@@ -1689,7 +1690,7 @@ protected function output() {
         
         $share_folder_modal .= '</div>';
         
-        $share_folder_modal .= '<div class="col-lg-6 col-md-12">';
+        $share_folder_modal .= '<div class="col-lg-4 col-md-12">';
         $share_folder_modal .= '<form id="shareForm" action="" method="POST">';
         $share_folder_modal .= '<input type="hidden" name="server_id" id="server_id" value="">';
         $share_folder_modal .= '<input type="hidden" name="folder_uid" id="folder_uid" value="">';
@@ -1697,48 +1698,48 @@ protected function output() {
 
         $share_folder_modal .= '<div class="mb-3 row">';
         $share_folder_modal .= '<div class="col-12">';
-        $share_folder_modal .= '<label class="form-label">Identifier</label>';
+        $share_folder_modal .= '<label class="form-label">'.$this->trans('Identifier').'</label>';
         $share_folder_modal .= '<div>';
         $share_folder_modal .= '<input type="radio" name="identifier" value="user" id="identifierUser" checked>';
-        $share_folder_modal .= '<label for="identifierUser">User:</label>';
+        $share_folder_modal .= '<label for="identifierUser">'.$this->trans('User').':</label>';
         $share_folder_modal .= '<input type="text" class="form-control d-inline-block" id="email" name="email" required placeholder="Enter email">';
         $share_folder_modal .= '</div>';
         $share_folder_modal .= '<div>';
         $share_folder_modal .= '<input type="radio" name="identifier" value="all" id="identifierAll">';
-        $share_folder_modal .= '<label for="identifierAll">All users (anyone)</label>';
+        $share_folder_modal .= '<label for="identifierAll">'.$this->trans('All users (anyone)').'</label>';
         $share_folder_modal .= '</div>';
         $share_folder_modal .= '<div>';
         $share_folder_modal .= '<input type="radio" name="identifier" value="guests" id="identifierGuests">';
-        $share_folder_modal .= '<label for="identifierGuests">Guests (anonymous)</label>';
+        $share_folder_modal .= '<label for="identifierGuests">'.$this->trans('Guests (anonymous)').'</label>';
         $share_folder_modal .= '</div>';
         $share_folder_modal .= '</div>';
         $share_folder_modal .= '</div>';
 
         $share_folder_modal .= '<div class="mb-3 row">';
         $share_folder_modal .= '<div class="col-12">';
-        $share_folder_modal .= '<label class="form-label">Access Rights</label>';
+        $share_folder_modal .= '<label class="form-label">'.$this->trans('Access Rights').'</label>';
         $share_folder_modal .= '<div>';
         $share_folder_modal .= '<input type="checkbox" name="access_read" id="accessRead" checked>';
-        $share_folder_modal .= '<label for="accessRead">Read</label>';
+        $share_folder_modal .= '<label for="accessRead">'.$this->trans('Read').'</label>';
         $share_folder_modal .= '</div>';
         $share_folder_modal .= '<div>';
         $share_folder_modal .= '<input type="checkbox" name="access_write" id="accessWrite">';
-        $share_folder_modal .= '<label for="accessWrite">Write</label>';
+        $share_folder_modal .= '<label for="accessWrite">'.$this->trans('Write').'</label>';
         $share_folder_modal .= '</div>';
         $share_folder_modal .= '<div>';
         $share_folder_modal .= '<input type="checkbox" name="access_delete" id="accessDelete">';
-        $share_folder_modal .= '<label for="accessDelete">Delete</label>';
+        $share_folder_modal .= '<label for="accessDelete">'.$this->trans('Delete').'</label>';
         $share_folder_modal .= '</div>';
         $share_folder_modal .= '<div>';
         $share_folder_modal .= '<input type="checkbox" name="access_other" id="accessOther">';
-        $share_folder_modal .= '<label for="accessOther">Other</label>';
+        $share_folder_modal .= '<label for="accessOther">'.$this->trans('Other').'</label>';
         $share_folder_modal .= '</div>';
         $share_folder_modal .= '</div>';
         $share_folder_modal .= '</div>';
 
         $share_folder_modal .= '<div class="modal-footer">';
-        $share_folder_modal .= '<button type="submit" class="btn btn-primary">Save</button>';
-        $share_folder_modal .= '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>';
+        $share_folder_modal .= '<button type="submit" class="btn btn-primary">'.$this->trans('Save').'</button>';
+        $share_folder_modal .= '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">'.$this->trans('Cancel').'</button>';
         $share_folder_modal .= '</div>';
         $share_folder_modal .= '</form>';
         $share_folder_modal .= '</div>';
diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index 0ae238daab..ca57d4846d 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -102,12 +102,6 @@ function prepare_imap_message_list($msgs, $mod, $type) {
     $mod->out('formatted_message_list', $res);
 }}
 
-if (!hm_exists('open_share_folder_modal')) {
-function open_share_folder_modal($folder, $id) {
-    
-}
-}
-
 /**
  * Build HTML for a list of IMAP folders
  * @subpackage imap/functions
diff --git a/modules/imap/handler_modules.php b/modules/imap/handler_modules.php
index e3ccb91243..7868b485cd 100644
--- a/modules/imap/handler_modules.php
+++ b/modules/imap/handler_modules.php
@@ -1663,50 +1663,26 @@ class Hm_Handler_set_acl_to_imap_folders extends Hm_Handler_Module {
      * Output IMAP server permissions array for shared folders
      */
     public function process() {
-        list($success, $form) = $this->process_form(array('imap_server_id','imap_folder','identifier','permissions'));
+        list($success, $form) = $this->process_form(array('imap_server_id','imap_folder','identifier','permissions','action'));
         
-        if ($success && !empty($form['imap_server_id']) && !empty($form['identifier'])  && !empty($form['permissions'])) {
+        if ($success && !empty($form['imap_server_id']) && !empty($form['identifier'])  && !empty($form['permissions']) && !empty($form['action'])) {
 
             Hm_IMAP_List::init($this->user_config, $this->session);
             $server = Hm_IMAP_List::dump($form['imap_server_id'], true);
             $cache = Hm_IMAP_List::get_cache($this->cache, $form['imap_server_id']);
             
             $imap = Hm_IMAP_List::connect($form['imap_server_id'], $cache, $server['user'], $server['pass']);
-            $response = $imap->set_acl($form['imap_folder'], $form['identifier'], $form['permissions']);
-            exit(var_dump($response));
+            if($form['action'] === 'add') {
+                $response = $imap->set_acl($form['imap_folder'], $form['identifier'], $form['permissions']);
+            } else {
+                $response = $imap->delete_acl($form['imap_folder'], $form['identifier']);
+            }
+            if($response) {
+                $permissions = $imap->get_acl($form['imap_folder']);
+                $this->out('imap_folders_permissions', $permissions);
+            }
         }
     }
-
-    // Define the permission mapping
-    private function map_permissions($rights_string) {
-        $permissions = [];
-        
-        // Map each permission character to its description
-        $permission_map = [
-            'l' => 'Lookup',
-            'r' => 'Read',
-            'w' => 'Write',
-            's' => 'See',
-            't' => 'Take',
-            'i' => 'Insert',
-            'p' => 'Post',
-            'e' => 'Examine',
-            'k' => 'Administer',
-            'a' => 'All rights',
-            'd' => 'Delete',
-            'c' => 'Create',
-            'x' => 'Delete mailbox',
-        ];
-
-        // Check which permissions are present in the rights string
-        foreach (str_split($rights_string) as $char) {
-            if (array_key_exists($char, $permission_map)) {
-                $permissions[] = $permission_map[$char];
-            }
-        }
-
-        return $permissions; // Return the list of permissions
-    }
 }
 
 /**
diff --git a/modules/imap/hm-imap.php b/modules/imap/hm-imap.php
index e8625965e3..a15444893a 100644
--- a/modules/imap/hm-imap.php
+++ b/modules/imap/hm-imap.php
@@ -381,6 +381,9 @@ public function get_capability() {
         * - Remove rights (using a `-` prefix),
         * - Completely replace existing rights (no prefix).
         *
+        * For more information on ACLs, see RFC 4314: 
+        * [Access Control Lists (ACLs) in Internet Message Access Protocol (IMAP)](https://tools.ietf.org/html/rfc4314).
+        *
         * @param string $mailbox_name The name of the mailbox for which the ACL is to be set.
         * @param string $identifier The user or identifier whose permissions are being modified.
         * @param string $rights_modification The modification to the user's rights (e.g., "+rw" to add read and write access,
@@ -396,10 +399,46 @@ public function set_acl($mailbox_name, $identifier, $rights_modification) {
 
             foreach ($response as $line) {
                 if (mb_strpos($line, 'OK') !== false) {
+                    Hm_Msgs::add('Permissions added successfully');
                     return true;
                 }
                 elseif (mb_strpos($line, 'NO') !== false || mb_strpos($line, 'BAD') !== false) {
                     $this->debug[] = 'SETACL failed: ' . $line;
+                    Hm_Msgs::add('ERRSETACL failed:' . $line);
+                    return false;
+                }
+            }
+            return false;
+        }
+
+        /**
+        * Deletes an access control list (ACL) entry for a specified identifier on a given mailbox.
+        *
+        * This function sends a DELETEACL command to remove any <identifier, rights> pair
+        * for the specified identifier from the access control list for the specified mailbox.
+        *
+        * For more information on ACLs, see RFC 4314: 
+        * [Access Control Lists (ACLs) in Internet Message Access Protocol (IMAP)](https://tools.ietf.org/html/rfc4314).
+        *
+        * @param string $mailbox The name of the mailbox from which to delete the ACL entry.
+        * @param string $identifier The authentication identifier whose rights are to be removed.
+        *
+        * @throws Exception If the delete operation fails or if invalid arguments are provided.
+        *
+        * @return bool Returns true on successful deletion of the ACL entry; otherwise, false.
+        */
+        public function delete_acl($mailbox_name, $identifier) {
+            $command = "DELETEACL \"$mailbox_name\" \"$identifier\"\r\n";
+            $this->send_command($command);
+            $response = $this->get_response();
+
+            foreach ($response as $line) {
+                if (strpos($line, 'OK') !== false) {
+                    Hm_Msgs::add('Permissions removed successfully');
+                    return true;
+                } else {
+                    $this->debug[] = 'DELETEACL failed: ' . $line;
+                    Hm_Msgs::add('ERRDELETEACL failed: ailure: can\'t delete acl');
                     return false;
                 }
             }
@@ -414,6 +453,9 @@ public function set_acl($mailbox_name, $identifier, $rights_modification) {
         * parses the server's response and maps the raw rights to human-readable
         * permissions using the `map_permissions` function.
         *
+        * For more information on ACLs, see RFC 4314: 
+        * [Access Control Lists (ACLs) in Internet Message Access Protocol (IMAP)](https://tools.ietf.org/html/rfc4314).
+        *
         * @param string $mailbox_name The name of the mailbox for which to retrieve the ACL.
         *
         * @return array An associative array where the keys are email addresses (or user identifiers),
diff --git a/modules/imap/setup.php b/modules/imap/setup.php
index 4722524bed..d6413d1250 100644
--- a/modules/imap/setup.php
+++ b/modules/imap/setup.php
@@ -450,5 +450,6 @@
         'imap_folder' => FILTER_DEFAULT,
         'identifier' => FILTER_DEFAULT,
         'permissions' => FILTER_DEFAULT,
+        'action' => FILTER_DEFAULT,
     )
 );
diff --git a/modules/imap/site.css b/modules/imap/site.css
index bc8ff84d2d..7dad732212 100644
--- a/modules/imap/site.css
+++ b/modules/imap/site.css
@@ -556,7 +556,7 @@ li[class^="imap_"] .inner_list li[class^="imap_"] {
 }
 #loadingSpinner {
     position: absolute;
-    left: 25%;
+    left: 33.5%;
     top: 50%;
     transform: translate(-50%, -50%);
 }
\ No newline at end of file
diff --git a/modules/imap/site.js b/modules/imap/site.js
index d062ef39b1..be84fcb62c 100644
--- a/modules/imap/site.js
+++ b/modules/imap/site.js
@@ -1456,17 +1456,9 @@ $(document).on('click', 'a.dropdown-item.share', function(e) {
             function (res) {
                 $('#loadingSpinner').hide();
                 if (res.ajax_imap_folders_permissions) {
-                    //then populate the modal with the data
                     const permissions = res.ajax_imap_folders_permissions;
-                    for (const [email, permissionList] of Object.entries(permissions)) {
-                        const row = `
-                            <tr>
-                                <td>${email}</td>
-                                <td>${permissionList}</td>
-                            </tr>
-                        `;
-                        $('#shareFolderModal table tbody').append(row);
-                    }
+                    //then populate the modal with the data
+                    populate_permissions_table(permissions);
                     $('#permissionTable').show();
                 }
             }
@@ -1475,12 +1467,57 @@ $(document).on('click', 'a.dropdown-item.share', function(e) {
     }
 });
 
+var populate_permissions_table = function(permissions) {
+    $('#shareFolderModal table tbody').empty();
+    for (const [email, permissionList] of Object.entries(permissions)) {
+        const translatedPermissions = permissionList.split(',').map(permission => {
+            return hm_trans(permission.trim()); // Translate each permission
+        });
+        const permissionsString = translatedPermissions.join(', ');
+        const row = `
+            <tr>
+                <td>${email}</td>
+                <td>${permissionsString}</td>
+                <td>
+                    <button class="btn btn-sm btn-primary edit-permission" data-email="${email}" data-permissions="${permissionList}">Edit</button>
+                </td>
+            </tr>
+        `;
+        $('#shareFolderModal table tbody').append(row);
+    }
+}
+
+$(document).on('click', '.edit-permission', function(e) {
+    e.preventDefault();
+
+    const email = $(this).data('email');
+    const permissions = $(this).data('permissions');
+
+    $('#email').val(email);
+    $('#identifierUser').prop('checked', true);
+
+
+    // Uncheck all permissions initially
+    $('#accessRead').prop('checked', false);
+    $('#accessWrite').prop('checked', false);
+    $('#accessDelete').prop('checked', false);
+    $('#accessOther').prop('checked', false);
+
+    // Map the permissions string to checkboxes
+    if (permissions.includes('Read')) $('#accessRead').prop('checked', true);
+    if (permissions.includes('Write')) $('#accessWrite').prop('checked', true);
+    if (permissions.includes('Delete')) $('#accessDelete').prop('checked', true);
+    if (permissions.includes('Administer') || permissions.includes('Other')) $('#accessOther').prop('checked', true);
+
+    // Show the form for editing
+    $('#shareFolderModal').modal('show');
+});
+
 $(document).on('submit', '#shareForm', function(e) {
     e.preventDefault();
     const server_id = $('#server_id').val();
     const folder = $('#folder').val();
 
-
     let identifier = '';
     if ($('#identifierUser').is(':checked')) {
         identifier = $('#email').val();
@@ -1494,17 +1531,24 @@ $(document).on('submit', '#shareForm', function(e) {
     if ($('#accessRead').is(':checked')) permissions += 'r';
     if ($('#accessWrite').is(':checked')) permissions += 'w';
     if ($('#accessDelete').is(':checked')) permissions += 'd';
-    if ($('#accessOther').is(':checked')) permissions += 'a'; 
+    if ($('#accessOther').is(':checked')) permissions += 'a';
+    // If no permissions are selected, call DELETEACL elser call SETACL
+    const action = permissions === '' ? 'remove' : 'add';
     Hm_Ajax.request(
         [
           { name: 'hm_ajax_hook', value: 'ajax_share_folders' },
           { name: 'imap_server_id', value: server_id },
           { name: 'identifier', value: identifier },
           { name: 'imap_folder', value: folder },
-          { name: 'permissions', value: `+${permissions}` },
+          { name: 'action', value: action },
+          { name: 'permissions', value: permissions },
         ],
         function (res) {
-            window.location.reload();
+            if(res.ajax_imap_folders_permissions) {
+                console.log("ajax_imap_folders_permissions",res.ajax_imap_folders_permissions);
+                const permissions = res.ajax_imap_folders_permissions;
+                populate_permissions_table(permissions);
+            }
         }
     );
 });
diff --git a/tests/phpunit/modules/core/output_modules.php b/tests/phpunit/modules/core/output_modules.php
index 02f90ec28d..41b71454e9 100644
--- a/tests/phpunit/modules/core/output_modules.php
+++ b/tests/phpunit/modules/core/output_modules.php
@@ -1022,7 +1022,7 @@ public function test_content_section_end() {
     public function test_modals() {
         $test = new Output_Test('modals', 'core');
         $res = $test->run();
-        $this->assertEquals(array('<div class="modal fade" id="shareFolderModal" tabindex="-1" aria-labelledby="shareFolderModalLabel" aria-hidden="true"><div class="modal-dialog modal-lg"><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="shareFolderModalLabel">Edit Permissions</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="modal-body"><div class="row"><div class="col-lg-6 col-md-12"><div id="loadingSpinner" class="text-center"><div class="spinner-border text-primary" role="status"><span class="visually-hidden">Loading...</span></div></div><table class="table table-striped" id="permissionTable" style="display:none;"><thead><tr><th>Email</th><th>Permissions</th></tr></thead><tbody></tbody></table></div><div class="col-lg-6 col-md-12"><form id="shareForm" action="" method="POST"><input type="hidden" name="server_id" id="server_id" value=""><input type="hidden" name="folder_uid" id="folder_uid" value=""><input type="hidden" name="folder" id="folder" value=""><div class="mb-3 row"><div class="col-12"><label class="form-label">Identifier</label><div><input type="radio" name="identifier" value="user" id="identifierUser" checked><label for="identifierUser">User:</label><input type="text" class="form-control d-inline-block" id="email" name="email" required placeholder="Enter email"></div><div><input type="radio" name="identifier" value="all" id="identifierAll"><label for="identifierAll">All users (anyone)</label></div><div><input type="radio" name="identifier" value="guests" id="identifierGuests"><label for="identifierGuests">Guests (anonymous)</label></div></div></div><div class="mb-3 row"><div class="col-12"><label class="form-label">Access Rights</label><div><input type="checkbox" name="access_read" id="accessRead" checked><label for="accessRead">Read</label></div><div><input type="checkbox" name="access_write" id="accessWrite"><label for="accessWrite">Write</label></div><div><input type="checkbox" name="access_delete" id="accessDelete"><label for="accessDelete">Delete</label></div><div><input type="checkbox" name="access_other" id="accessOther"><label for="accessOther">Other</label></div></div></div><div class="modal-footer"><button type="submit" class="btn btn-primary">Save</button><button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button></div></form></div></div></div></div></div></div>'), $res->output_response);
+        $this->assertEquals(array('<div class="modal fade" id="shareFolderModal" tabindex="-1" aria-labelledby="shareFolderModalLabel" aria-hidden="true"><div class="modal-dialog modal-lg"><div class="modal-content"><div class="modal-header"><h5 class="modal-title" id="shareFolderModalLabel">Edit Permissions</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="modal-body"><div class="row"><div class="col-lg-8 col-md-12"><div id="loadingSpinner" class="text-center"><div class="spinner-border text-primary" role="status"><span class="visually-hidden">Loading...</span></div></div><table class="table table-striped" id="permissionTable" style="display:none;"><thead><tr><th>User</th><th>Permissions</th><th>Actions</th></tr></thead><tbody></tbody></table></div><div class="col-lg-4 col-md-12"><form id="shareForm" action="" method="POST"><input type="hidden" name="server_id" id="server_id" value=""><input type="hidden" name="folder_uid" id="folder_uid" value=""><input type="hidden" name="folder" id="folder" value=""><div class="mb-3 row"><div class="col-12"><label class="form-label">Identifier</label><div><input type="radio" name="identifier" value="user" id="identifierUser" checked><label for="identifierUser">User:</label><input type="text" class="form-control d-inline-block" id="email" name="email" required placeholder="Enter email"></div><div><input type="radio" name="identifier" value="all" id="identifierAll"><label for="identifierAll">All users (anyone)</label></div><div><input type="radio" name="identifier" value="guests" id="identifierGuests"><label for="identifierGuests">Guests (anonymous)</label></div></div></div><div class="mb-3 row"><div class="col-12"><label class="form-label">Access Rights</label><div><input type="checkbox" name="access_read" id="accessRead" checked><label for="accessRead">Read</label></div><div><input type="checkbox" name="access_write" id="accessWrite"><label for="accessWrite">Write</label></div><div><input type="checkbox" name="access_delete" id="accessDelete"><label for="accessDelete">Delete</label></div><div><input type="checkbox" name="access_other" id="accessOther"><label for="accessOther">Other</label></div></div></div><div class="modal-footer"><button type="submit" class="btn btn-primary">Save</button><button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button></div></form></div></div></div></div></div></div>'), $res->output_response);
     }
     /**
      * @preserveGlobalState disabled