From b57bed3b7dc7e589e5e480922723b9144a3317c9 Mon Sep 17 00:00:00 2001
From: Astrid van Eerd <Pinkeltje@users.noreply.github.com>
Date: Tue, 5 Nov 2024 08:41:51 +0100
Subject: [PATCH 01/11] Update upload.main.js

Stripping linebreaks when removing attachment.
---
 src/media/kunena/core/js/upload.main.js | 44 ++++++++++++++-----------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/media/kunena/core/js/upload.main.js b/src/media/kunena/core/js/upload.main.js
index ae140a8f9b7..9e9270cc2f8 100644
--- a/src/media/kunena/core/js/upload.main.js
+++ b/src/media/kunena/core/js/upload.main.js
@@ -345,7 +345,7 @@ jQuery(function ($) {
                 });
         });
 
-    const removeButton = $('<button/>')
+   const removeButton = $('<button/>')
         .addClass('btn btn-danger')
         .attr('type', 'button')
         .html(Joomla.getOptions('com_kunena.icons.trash') + ' ' + Joomla.Text._('COM_KUNENA_GEN_REMOVE_FILE'))
@@ -384,10 +384,14 @@ jQuery(function ($) {
             }
 
             $('#alert_max_file').remove();
-            var editor_text = null;
+            
+            // Get editor content while preserving line breaks
+            let editor_text = '';
             if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
+                // For CKEditor, getData() already preserves formatting
                 editor_text = CKEDITOR.instances.message.getData();
             } else {
+                // For SCEditor, get raw content with preserved line breaks
                 editor_text = sceditor.instance(document.getElementById('message')).val();
             }
 
@@ -397,24 +401,26 @@ jQuery(function ($) {
 
                 // Ajax Request to delete the file from filesystem
                 $.ajax({
-	                url: Joomla.getOptions('com_kunena.kunena_upload_files_rem') + '&files_id_delete=' + JSON.stringify(file_query_id) + '&editor_text=' + editor_text,
-                type: 'POST'
+                    url: Joomla.getOptions('com_kunena.kunena_upload_files_rem') + '&files_id_delete=' + JSON.stringify(file_query_id) + '&editor_text=' + encodeURIComponent(editor_text),
+                    type: 'POST'
                 })
-	              .done(function (data) {
-	                    $this.parent().remove();
-
-	                    if (data.text_prepared !== false) {
- 	                          if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
-							        CKEDITOR.instances.message.setData(data.text_prepared);
-							  } else {
-							        sceditor.instance(document.getElementById('message')).insert(data.text_prepared);
-							  }
-	                    }
-	                })
-	                .fail(function () {
-	                    //TODO: handle the error of ajax request
-	                });
-	            }
+                .done(function (data) {
+                    $this.parent().remove();
+
+                    if (data.text_prepared !== false) {
+                        if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
+                            // Set content while preserving line breaks for CKEditor
+                            CKEDITOR.instances.message.setData(data.text_prepared);
+                        } else {
+                            // Set content while preserving line breaks for SCEditor
+                            sceditor.instance(document.getElementById('message')).val(data.text_prepared);
+                        }
+                    }
+                })
+                .fail(function () {
+                    //TODO: handle the error of ajax request
+                });
+            }
         });
 
     $('#fileupload').fileupload({

From 17266c150855438e73997c95b4b202d5c078ddf1 Mon Sep 17 00:00:00 2001
From: Astrid van Eerd <Pinkeltje@users.noreply.github.com>
Date: Tue, 5 Nov 2024 16:26:51 +0100
Subject: [PATCH 02/11] Update upload.main.js

---
 src/media/kunena/core/js/upload.main.js | 157 ++++++++++--------------
 1 file changed, 63 insertions(+), 94 deletions(-)

diff --git a/src/media/kunena/core/js/upload.main.js b/src/media/kunena/core/js/upload.main.js
index 9e9270cc2f8..c21fd627079 100644
--- a/src/media/kunena/core/js/upload.main.js
+++ b/src/media/kunena/core/js/upload.main.js
@@ -97,109 +97,78 @@ jQuery(function ($) {
         }
     });
 
-    $('#remove-all').on('click', function (e) {
-        e.preventDefault();
-
-        $('#progress').hide();
-
-        $('#insert-all').removeClass('btn-success');
-        $('#insert-all').addClass('btn-primary');
-        $('#insert-all').html(Joomla.getOptions('com_kunena.icons.upload') + ' ' + Joomla.Text._('COM_KUNENA_UPLOADED_LABEL_INSERT_ALL_BUTTON'));
-
-        $('#remove-all').hide();
-        $('#insert-all').hide();
-
-        var editor_text = null;
-        if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
-            editor_text = CKEDITOR.instances.message.getData();
-        } else {
-            editor_text = sceditor.instance(document.getElementById('message')).val();
-        }
-
-        // Removing items in edit if they are present
-        if ($.isEmptyObject(filesedit) === false) {
-            const filesidinedittodelete = [];
-
-            $(filesedit).each(function (index, file) {
-                if ($('#kattachs-' + file.id).length === 0) {
-                    $('#kattach-list').append('<input id="kattachs-' + file.id + '" type="hidden" name="attachments[' + file.id + ']" value="1" />');
-                }
-
-                if ($('#kattach-' + file.id).length > 0) {
-                    $('#kattach-' + file.id).remove();
-                }
-
-                filesidinedittodelete.push(file.id);
-            });
-
-            $.ajax({
-                url: Joomla.getOptions('com_kunena.kunena_upload_files_rem') + '&files_id_delete=' + JSON.stringify(filesidinedittodelete) + '&editor_text=' + editor_text,
-                type: 'POST'
-            })
-                .done(function (data) {
-                    $('#files').empty();
-
-                    if (data.text_prepared !== false) {
-                        if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
-                            CKEDITOR.instances.message.setData(data.text_prepared);
-                        } else {
-                            sceditor.instance(document.getElementById('message')).insert(data.text_prepared);
-                        }
-                    }
-                })
-                .fail(function () {
-                    //TODO: handle the error of ajax request
-                });
-
-            filesedit = null;
-        }
-
-        const child = $('#kattach-list').find('input');
-        const filesidtodelete = [];
-
-        child.each(function (i, el) {
-            const elem = $(el);
+   $('#remove-all').on('click', function (e) {
+    e.preventDefault();
+
+    $('#progress').hide();
+
+    $('#insert-all').removeClass('btn-success');
+    $('#insert-all').addClass('btn-primary');
+    $('#insert-all').html(Joomla.getOptions('com_kunena.icons.upload') + ' ' + Joomla.Text._('COM_KUNENA_UPLOADED_LABEL_INSERT_ALL_BUTTON'));
+
+    $('#remove-all').hide();
+    $('#insert-all').hide();
+
+    // Get editor content while preserving line breaks
+    let editor_text = '';
+    if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
+        // For CKEditor, getData() already preserves formatting
+        editor_text = CKEDITOR.instances.message.getData();
+    } else {
+        // For SCEditor, get raw content with preserved line breaks
+        editor_text = sceditor.instance(document.getElementById('message')).val();
+    }
 
-            if (!elem.attr('id').match("[a-z]{8}")) {
-                const fileid = elem.attr('id').match("[0-9]{1,8}");
+    // Find all attachment BBCodes
+    const attachmentRegex = /\[attachment=([0-9]+)\]([^[\]]+)\[\/attachment\]/g;
+    const attachments = [];
+    let attachmentMatches;
+    while ((attachmentMatches = attachmentRegex.exec(editor_text)) !== null) {
+        attachments.push({
+            id: attachmentMatches[1],
+            filename: attachmentMatches[2]
+        });
+    }
 
-                if ($('#kattachs-' + fileid).length === 0) {
-                    $('#kattach-list').append('<input id="kattachs-' + fileid + '" type="hidden" name="attachments[' + fileid + ']" value="1" />');
-                }
+    // Remove all attachment BBCodes from the editor text
+    const cleanedEditorText = editor_text.replace(attachmentRegex, '');
 
-                if ($('#kattach-' + fileid).length > 0) {
-                    $('#kattach-' + fileid).remove();
-                }
+    // Update the editor content with the cleaned-up text
+    if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
+        CKEDITOR.instances.message.setData(cleanedEditorText);
+    } else {
+        sceditor.instance(document.getElementById('message')).val(cleanedEditorText);
+    }
 
-                filesidtodelete.push(fileid);
+    // Remove all found attachments from the database
+    if (attachments.length > 0) {
+        $.ajax({
+            url: Joomla.getOptions('com_kunena.kunena_upload_files_rem'),
+            type: 'POST',
+            data: {
+                'files_id_delete': JSON.stringify(attachments.map(a => a.id)),
+                'editor_text': encodeURIComponent(editor_text)
             }
+        })
+        .done(function () {
+            // Refresh the editor content to ensure all attachments are removed
+            if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
+                CKEDITOR.instances.message.setData(cleanedEditorText);
+            } else {
+                sceditor.instance(document.getElementById('message')).val(cleanedEditorText);
+            }
+            $('#files').empty();
+        })
+        .fail(function () {
+            //TODO: handle the error of ajax request
         });
+    }
 
-        if (filesidtodelete.length !== 0) {
-            $.ajax({
-                url: Joomla.getOptions('com_kunena.kunena_upload_files_rem') + '&files_id_delete=' + JSON.stringify(filesidtodelete) + '&editor_text=' + editor_text,
-                type: 'POST'
-            })
-                .done(function (data) {
-                    $('#files').empty();
+    $('#alert_max_file').remove();
 
-                    if (data.text_prepared !== false) {
-                        if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
-                            CKEDITOR.instances.message.setData(data.text_prepared);
-                        } else {
-                            sceditor.instance(document.getElementById('message')).insert(data.text_prepared);
-                        }
-                    }
-                })
-                .fail(function () {
-                    //TODO: handle the error of ajax request
-                });
-        }
-
-        $('#alert_max_file').remove();
+    fileCount = 0;
+});
 
-        fileCount = 0;
-    });
 
     $('#insert-all').bind('keypress keydown keyup', function(e){
 		if(e.keyCode == 13) { e.preventDefault(); }

From baa33f172ecaa3062bd6b8e3fee6ec7da08dff4c Mon Sep 17 00:00:00 2001
From: Astrid van Eerd <Pinkeltje@users.noreply.github.com>
Date: Fri, 8 Nov 2024 10:18:12 +0100
Subject: [PATCH 03/11] Update upload.main.js

Removed Insert private attachment as this doesn't work. Inserted private attachments are still visible for everyone.
Buttons are now ok.
---
 src/media/kunena/core/js/upload.main.js | 37 +------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

diff --git a/src/media/kunena/core/js/upload.main.js b/src/media/kunena/core/js/upload.main.js
index c21fd627079..16535f11713 100644
--- a/src/media/kunena/core/js/upload.main.js
+++ b/src/media/kunena/core/js/upload.main.js
@@ -240,42 +240,7 @@ jQuery(function ($) {
         filesedit = null;
     });
 
-    const setPrivateButton = $('<button>')
-        .addClass("btn btn-primary")
-        .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + Joomla.Text._('COM_KUNENA_EDITOR_INSERT_PRIVATE_ATTACHMENT'))
-        .on('click', function (e) {
-            // Make sure the button click doesn't submit the form:
-            e.preventDefault();
-            e.stopPropagation();
-
-        const $this = $(this),
-        data = $this.data();
-
-        let file_id = 0;
-        let filename = null;
-        if (data.result !== undefined) {
-            file_id = data.result.data.id;
-            filename = data.result.data.filename;
-        } else {
-            file_id = data.id;
-            filename = data.name;
-        }
-
-        const files_id = [];
-        files_id.push(file_id);
-
-        $.ajax({
-            url: Joomla.getOptions('com_kunena.kunena_upload_files_set_private') + '&files_id=' + JSON.stringify(files_id),
-            type: 'POST'
-        })
-        .done(function (data) {
-
-        })
-        .fail(function () {
-            //TODO: handle the error of ajax request
-        });
-    });
-
+ 
     const insertButton = $('<button>')
         .addClass("btn btn-primary")
         .html(Joomla.getOptions('com_kunena.icons.upload') + ' ' + Joomla.Text._('COM_KUNENA_EDITOR_INSERT'))

From e9a167c4afd52adb0d3540300dd23bef6eced90a Mon Sep 17 00:00:00 2001
From: Astrid van Eerd <Pinkeltje@users.noreply.github.com>
Date: Fri, 8 Nov 2024 17:15:15 +0100
Subject: [PATCH 04/11] Update upload.main.js

Remove all working I think
---
 src/media/kunena/core/js/upload.main.js | 51 +++++++++++++++----------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/media/kunena/core/js/upload.main.js b/src/media/kunena/core/js/upload.main.js
index 16535f11713..d3876c66c12 100644
--- a/src/media/kunena/core/js/upload.main.js
+++ b/src/media/kunena/core/js/upload.main.js
@@ -125,7 +125,7 @@ jQuery(function ($) {
     let attachmentMatches;
     while ((attachmentMatches = attachmentRegex.exec(editor_text)) !== null) {
         attachments.push({
-            id: attachmentMatches[1],
+            id: parseInt(attachmentMatches[1]),
             filename: attachmentMatches[2]
         });
     }
@@ -142,26 +142,38 @@ jQuery(function ($) {
 
     // Remove all found attachments from the database
     if (attachments.length > 0) {
-        $.ajax({
-            url: Joomla.getOptions('com_kunena.kunena_upload_files_rem'),
-            type: 'POST',
-            data: {
-                'files_id_delete': JSON.stringify(attachments.map(a => a.id)),
-                'editor_text': encodeURIComponent(editor_text)
-            }
-        })
-        .done(function () {
-            // Refresh the editor content to ensure all attachments are removed
-            if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
-                CKEDITOR.instances.message.setData(cleanedEditorText);
+        let i = 0;
+        const removeAttachments = function() {
+            if (i < attachments.length) {
+                const attachment = attachments[i];
+                $.ajax({
+                    url: Joomla.getOptions('com_kunena.kunena_upload_files_rem'),
+                    type: 'POST',
+                    data: {
+                        files_id_delete: JSON.stringify([attachment.id]),
+                        editor_text: editor_text
+                    }
+                })
+                .done(function () {
+                    i++;
+                    removeAttachments();
+                })
+                .fail(function () {
+                    // TODO: handle the error of ajax request
+                    i++;
+                    removeAttachments();
+                });
             } else {
-                sceditor.instance(document.getElementById('message')).val(cleanedEditorText);
+                // Refresh the editor content to ensure all attachments are removed
+                if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
+                    CKEDITOR.instances.message.setData(cleanedEditorText);
+                } else {
+                    sceditor.instance(document.getElementById('message')).val(cleanedEditorText);
+                }
+                $('#files').empty();
             }
-            $('#files').empty();
-        })
-        .fail(function () {
-            //TODO: handle the error of ajax request
-        });
+        };
+        removeAttachments();
     }
 
     $('#alert_max_file').remove();
@@ -169,7 +181,6 @@ jQuery(function ($) {
     fileCount = 0;
 });
 
-
     $('#insert-all').bind('keypress keydown keyup', function(e){
 		if(e.keyCode == 13) { e.preventDefault(); }
 	});

From 03549a8204c0b17795df0ec224ae6562be6e0839 Mon Sep 17 00:00:00 2001
From: Astrid van Eerd <Pinkeltje@users.noreply.github.com>
Date: Mon, 11 Nov 2024 13:25:15 +0100
Subject: [PATCH 05/11] Update upload.main.js

buttons display fixed and remove individual attachment now possible
---
 src/media/kunena/core/js/upload.main.js | 159 ++++++++++++++++--------
 1 file changed, 107 insertions(+), 52 deletions(-)

diff --git a/src/media/kunena/core/js/upload.main.js b/src/media/kunena/core/js/upload.main.js
index d3876c66c12..d2fdaf9c961 100644
--- a/src/media/kunena/core/js/upload.main.js
+++ b/src/media/kunena/core/js/upload.main.js
@@ -97,7 +97,7 @@ jQuery(function ($) {
         }
     });
 
-   $('#remove-all').on('click', function (e) {
+  $('#remove-all').on('click', function (e) {
     e.preventDefault();
 
     $('#progress').hide();
@@ -181,77 +181,132 @@ jQuery(function ($) {
     fileCount = 0;
 });
 
-    $('#insert-all').bind('keypress keydown keyup', function(e){
-		if(e.keyCode == 13) { e.preventDefault(); }
-	});
-
     $('#insert-all').on('click', function (e) {
-        e.preventDefault();
-
-        const child = $('#kattach-list').find('input');
-        const files_id = [];
-        let content_to_inject = '';
+    e.preventDefault();
 
-        child.each(function (i, el) {
-            const elem = $(el);
+    const child = $('#kattach-list').find('input');
+    const files_id = [];
+    let content_to_inject = '';
+
+    child.each(function (i, el) {
+        const elem = $(el);
+
+        if (!elem.attr('id').match("[a-z]{8}")) {
+            const attachid = elem.attr('id').match("[0-9]{1,8}");
+            const filename = elem.attr('placeholder');
+
+            content_to_inject += '[attachment=' + attachid + ']' + filename + '[/attachment]';
+
+            // Find all buttons in #files div
+            $('#files > div').each(function() {
+                const $buttons = $(this).find('button');
+                $buttons.each(function() {
+                    const $btn = $(this);
+                    // Check if this is the insert button (not private or remove button)
+                    if ($btn.hasClass('btn-primary') && 
+                        !$btn.hasClass('btn-danger') && 
+                        $btn.html().includes(Joomla.Text._('COM_KUNENA_EDITOR_INSERT')) &&
+                        ($btn.data('result')?.data?.id == attachid || 
+                         $btn.data('id') == attachid)) {
+                            $btn.removeClass('btn-primary btn-outline-primary')
+                               .addClass('btn-success')
+                               .html(Joomla.getOptions('com_kunena.icons.upload') + ' ' + 
+                                    Joomla.Text._('COM_KUNENA_EDITOR_IN_MESSAGE'));
+                            
+                            // Hide the private button for this attachment
+                            $(this).siblings('button').each(function() {
+                                if ($(this).html().includes(Joomla.Text._('COM_KUNENA_EDITOR_INSERT_PRIVATE_ATTACHMENT'))) {
+                                    $(this).hide();
+                                }
+                            });
+                    }
+                });
+            });
 
-            if (!elem.attr('id').match("[a-z]{8}")) {
-                const attachid = elem.attr('id').match("[0-9]{1,8}");
-                const filename = elem.attr('placeholder');
+            files_id.push(attachid);
+        }
+    });
 
-                content_to_inject += '[attachment=' + attachid + ']' + filename + '[/attachment]';
+    // Update the Insert All button state
+    $('#insert-all').removeClass('btn-primary btn-outline-primary')
+                   .addClass('btn-success')
+                   .html(Joomla.getOptions('com_kunena.icons.upload') + ' ' + 
+                        Joomla.Text._('COM_KUNENA_EDITOR_IN_MESSAGE'));
 
-                $('#insert-all').removeClass('btn-primary');
-                $('#insert-all').addClass('btn-success');
-                $('#insert-all').html(Joomla.getOptions('com_kunena.icons.upload') + Joomla.Text._('COM_KUNENA_EDITOR_IN_MESSAGE'));
+    // Hide the "Set all attachments private" button since they're now inline
+    if ($('#set-secure-all').length > 0) {
+        $('#set-secure-all').hide();
+    }
 
-                files_id.push(attachid);
+    // Inserting items in message from edit if they aren't already present
+    if ($.isEmptyObject(filesedit) === false) {
+        $(filesedit).each(function (index, file) {
+            if (file.inline !== true) {
+                content_to_inject += '[attachment=' + file.id + ']' + file.name + '[/attachment]';
+                files_id.push(file.id);
             }
         });
+    }
 
-        // Inserting items in message from edit if they aren't already present
-        if ($.isEmptyObject(filesedit) === false) {
-            const filesid_list = [];
-
-            $(filesedit).each(function (index, file) {
-                if (file.inline !== true) {
-                    content_to_inject += '[attachment=' + file.id + ']' + file.name + '[/attachment]';
-                    files_id.push(file.id);
-                }
-            });
+    // Insert content into message
+    if ($('#message').length > 0) {
+        if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
+            CKEDITOR.instances.message.insertText(content_to_inject);
+        } else {
+            sceditor.instance(document.getElementById('message')).insert(content_to_inject);
         }
+    }
 
-        // Prevent the press on enter key to press the button enter all when previously clicked
-        if ($('#message').length > 0)
-        {
-            if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
-                CKEDITOR.instances.message.insertText(content_to_inject);
-            } else {
-                sceditor.instance(document.getElementById('message')).insert(content_to_inject);
-            }
+    $.ajax({
+        url: Joomla.getOptions('com_kunena.kunena_upload_files_set_inline') + '&files_id=' + JSON.stringify(files_id),
+        type: 'POST'
+    })
+    .done(function (data) {
+        // Success handler if needed
+    })
+    .fail(function () {
+        // TODO: handle the error of ajax request
+    });
+
+    filesedit = null;
+});
+
+    const setPrivateButton = $('<button>')
+        .addClass("btn btn-primary")
+        .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + Joomla.Text._('COM_KUNENA_EDITOR_INSERT_PRIVATE_ATTACHMENT'))
+        .on('click', function (e) {
+            // Make sure the button click doesn't submit the form:
+            e.preventDefault();
+            e.stopPropagation();
+
+        const $this = $(this),
+        data = $this.data();
+
+        let file_id = 0;
+        let filename = null;
+        if (data.result !== undefined) {
+            file_id = data.result.data.id;
+            filename = data.result.data.filename;
+        } else {
+            file_id = data.id;
+            filename = data.name;
         }
 
-        $('#files .btn.btn-primary').each(function () {
-            $('#files .btn.btn-primary').addClass('btn-success');
-            $('#files .btn.btn-success').removeClass('btn-primary');
-            $('#files .btn.btn-success').html(Joomla.getOptions('com_kunena.icons.upload') + Joomla.Text._('COM_KUNENA_EDITOR_IN_MESSAGE'));
-        });
+        const files_id = [];
+        files_id.push(file_id);
 
         $.ajax({
-            url: Joomla.getOptions('com_kunena.kunena_upload_files_set_inline') + '&files_id=' + JSON.stringify(files_id),
+            url: Joomla.getOptions('com_kunena.kunena_upload_files_set_private') + '&files_id=' + JSON.stringify(files_id),
             type: 'POST'
         })
-            .done(function (data) {
-
-            })
-            .fail(function () {
-                //TODO: handle the error of ajax request
-            });
+        .done(function (data) {
 
-        filesedit = null;
+        })
+        .fail(function () {
+            //TODO: handle the error of ajax request
+        });
     });
 
- 
     const insertButton = $('<button>')
         .addClass("btn btn-primary")
         .html(Joomla.getOptions('com_kunena.icons.upload') + ' ' + Joomla.Text._('COM_KUNENA_EDITOR_INSERT'))

From e07c54dc3d228cef192f5576a48c1180f8071e5f Mon Sep 17 00:00:00 2001
From: Astrid van Eerd <Pinkeltje@users.noreply.github.com>
Date: Tue, 12 Nov 2024 12:50:17 +0100
Subject: [PATCH 06/11] Update upload.main.js

Added buttons Is Private and all attachments private
Requires adding language constants COM_KUNENA_ATTACHMENT_IS_PRIVATE and COM_KUNENA_ALL_ATTACHMENTS_ARE_PRIVATE added to transifex
---
 src/media/kunena/core/js/upload.main.js | 233 +++++++++++++++---------
 1 file changed, 145 insertions(+), 88 deletions(-)

diff --git a/src/media/kunena/core/js/upload.main.js b/src/media/kunena/core/js/upload.main.js
index d2fdaf9c961..3a84837554c 100644
--- a/src/media/kunena/core/js/upload.main.js
+++ b/src/media/kunena/core/js/upload.main.js
@@ -72,13 +72,13 @@ jQuery(function ($) {
 
         const child = $('#kattach-list').find('input');
         const filesidtosetprivate = [];
+        const $this = $(this);
 
         child.each(function (i, el) {
             const elem = $(el);
 
             if (!elem.attr('id').match("[a-z]{8}")) {
                 const fileid = elem.attr('id').match("[0-9]{1,8}");
-
                 filesidtosetprivate.push(fileid);
             }
         });
@@ -89,7 +89,24 @@ jQuery(function ($) {
                 type: 'POST'
             })
             .done(function (data) {
+                // Update all individual private buttons
+                $('#files button').each(function() {
+                    const $btn = $(this);
+                    if ($btn.html().includes(Joomla.Text._('COM_KUNENA_EDITOR_INSERT_PRIVATE_ATTACHMENT'))) {
+                        $btn.removeClass('btn-primary')
+                           .addClass('btn-success')
+                           .prop('disabled', true)
+                           .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + 
+                                Joomla.Text._('COM_KUNENA_ATTACHMENT_IS_PRIVATE'));
+                    }
+                });
 
+                // Update the set-secure-all button
+                $this.removeClass('btn-primary')
+                     .addClass('btn-success')
+                     .prop('disabled', true)
+                     .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + 
+                          Joomla.Text._('COM_KUNENA_ALL_ATTACHMENTS_ARE_PRIVATE'));
             })
             .fail(function () {
                 //TODO: handle the error of ajax request
@@ -102,20 +119,20 @@ jQuery(function ($) {
 
     $('#progress').hide();
 
-    $('#insert-all').removeClass('btn-success');
-    $('#insert-all').addClass('btn-primary');
+    // Reset insert-all button state
+    $('#insert-all').removeClass('btn-success').addClass('btn-primary');
     $('#insert-all').html(Joomla.getOptions('com_kunena.icons.upload') + ' ' + Joomla.Text._('COM_KUNENA_UPLOADED_LABEL_INSERT_ALL_BUTTON'));
 
+    // Hide action buttons
     $('#remove-all').hide();
     $('#insert-all').hide();
+    $('#set-secure-all').hide(); // Also hide the secure-all button
 
     // Get editor content while preserving line breaks
     let editor_text = '';
     if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
-        // For CKEditor, getData() already preserves formatting
         editor_text = CKEDITOR.instances.message.getData();
     } else {
-        // For SCEditor, get raw content with preserved line breaks
         editor_text = sceditor.instance(document.getElementById('message')).val();
     }
 
@@ -123,6 +140,8 @@ jQuery(function ($) {
     const attachmentRegex = /\[attachment=([0-9]+)\]([^[\]]+)\[\/attachment\]/g;
     const attachments = [];
     let attachmentMatches;
+    
+    // Collect all attachments from the editor content
     while ((attachmentMatches = attachmentRegex.exec(editor_text)) !== null) {
         attachments.push({
             id: parseInt(attachmentMatches[1]),
@@ -130,18 +149,37 @@ jQuery(function ($) {
         });
     }
 
-    // Remove all attachment BBCodes from the editor text
-    const cleanedEditorText = editor_text.replace(attachmentRegex, '');
-
-    // Update the editor content with the cleaned-up text
-    if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
-        CKEDITOR.instances.message.setData(cleanedEditorText);
-    } else {
-        sceditor.instance(document.getElementById('message')).val(cleanedEditorText);
-    }
+    // Also collect attachments from the #files container that aren't in the editor
+    $('#files > div').each(function() {
+        const $buttons = $(this).find('button');
+        $buttons.each(function() {
+            const $btn = $(this);
+            const data = $btn.data();
+            if (data.result?.data?.id || data.file_id) {
+                const fileId = data.result?.data?.id || data.file_id;
+                if (!attachments.some(a => a.id === fileId)) {
+                    attachments.push({
+                        id: fileId,
+                        filename: data.result?.data?.filename || data.name
+                    });
+                }
+            }
+        });
+    });
 
-    // Remove all found attachments from the database
+    // Remove all attachments if we found any
     if (attachments.length > 0) {
+        // Clean editor content
+        const cleanedEditorText = editor_text.replace(attachmentRegex, '');
+        
+        // Update editor content
+        if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
+            CKEDITOR.instances.message.setData(cleanedEditorText);
+        } else {
+            sceditor.instance(document.getElementById('message')).val(cleanedEditorText);
+        }
+
+        // Remove each attachment via AJAX
         let i = 0;
         const removeAttachments = function() {
             if (i < attachments.length) {
@@ -150,37 +188,32 @@ jQuery(function ($) {
                     url: Joomla.getOptions('com_kunena.kunena_upload_files_rem'),
                     type: 'POST',
                     data: {
-                        files_id_delete: JSON.stringify([attachment.id]),
-                        editor_text: editor_text
+                        files_id_delete: JSON.stringify([attachment.id])
                     }
                 })
-                .done(function () {
-                    i++;
-                    removeAttachments();
-                })
-                .fail(function () {
-                    // TODO: handle the error of ajax request
+                .always(function () {
+                    // Remove the attachment's input fields
+                    $('#kattachs-' + attachment.id).remove();
+                    $('#kattach-' + attachment.id).remove();
+                    
                     i++;
                     removeAttachments();
                 });
             } else {
-                // Refresh the editor content to ensure all attachments are removed
-                if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
-                    CKEDITOR.instances.message.setData(cleanedEditorText);
-                } else {
-                    sceditor.instance(document.getElementById('message')).val(cleanedEditorText);
-                }
+                // Clear the files container and reset counters
                 $('#files').empty();
+                fileCount = 0;
+                fileeditinline = 0;
             }
         };
         removeAttachments();
     }
 
+    // Remove any alert messages
     $('#alert_max_file').remove();
-
-    fileCount = 0;
 });
 
+
     $('#insert-all').on('click', function (e) {
     e.preventDefault();
 
@@ -228,7 +261,7 @@ jQuery(function ($) {
     });
 
     // Update the Insert All button state
-    $('#insert-all').removeClass('btn-primary btn-outline-primary')
+    $('#insert-all').removeClass('btn-outline-primary btn-primary')
                    .addClass('btn-success')
                    .html(Joomla.getOptions('com_kunena.icons.upload') + ' ' + 
                         Joomla.Text._('COM_KUNENA_EDITOR_IN_MESSAGE'));
@@ -271,41 +304,41 @@ jQuery(function ($) {
     filesedit = null;
 });
 
-    const setPrivateButton = $('<button>')
+      const setPrivateButton = $('<button>')
         .addClass("btn btn-primary")
         .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + Joomla.Text._('COM_KUNENA_EDITOR_INSERT_PRIVATE_ATTACHMENT'))
         .on('click', function (e) {
-            // Make sure the button click doesn't submit the form:
             e.preventDefault();
             e.stopPropagation();
 
-        const $this = $(this),
-        data = $this.data();
-
-        let file_id = 0;
-        let filename = null;
-        if (data.result !== undefined) {
-            file_id = data.result.data.id;
-            filename = data.result.data.filename;
-        } else {
-            file_id = data.id;
-            filename = data.name;
-        }
+            const $this = $(this),
+            data = $this.data();
 
-        const files_id = [];
-        files_id.push(file_id);
+            let file_id = 0;
+            if (data.result !== undefined) {
+                file_id = data.result.data.id;
+            } else {
+                file_id = data.id;
+            }
 
-        $.ajax({
-            url: Joomla.getOptions('com_kunena.kunena_upload_files_set_private') + '&files_id=' + JSON.stringify(files_id),
-            type: 'POST'
-        })
-        .done(function (data) {
+            const files_id = [];
+            files_id.push(file_id);
 
-        })
-        .fail(function () {
-            //TODO: handle the error of ajax request
+            $.ajax({
+                url: Joomla.getOptions('com_kunena.kunena_upload_files_set_private') + '&files_id=' + JSON.stringify(files_id),
+                type: 'POST'
+            })
+            .done(function (data) {
+                $this.removeClass('btn-primary')
+                     .addClass('btn-success')
+                     .prop('disabled', true)
+                     .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + 
+                          Joomla.Text._('COM_KUNENA_ATTACHMENT_IS_PRIVATE'));
+            })
+            .fail(function () {
+                //TODO: handle the error of ajax request
+            });
         });
-    });
 
     const insertButton = $('<button>')
         .addClass("btn btn-primary")
@@ -598,7 +631,7 @@ jQuery(function ($) {
         .parent().addClass($.support.fileInput ? undefined : 'disabled');
 
     // Load attachments when the message is edited
-    if ($('#kmessageid').val() > 0) {
+     if ($('#kmessageid').val() > 0) {
         $.ajax({
             type: 'POST',
             url: Joomla.getOptions('com_kunena.kunena_upload_files_preload'),
@@ -606,44 +639,68 @@ jQuery(function ($) {
             dataType: 'json',
             data: {mes_id: $('#kmessageid').val()}
         })
-            .done(function (data) {
-                if ($.isEmptyObject(data.files) === false) {
-                    fileCount = Object.keys(data.files).length;
+        .done(function (data) {
+            if ($.isEmptyObject(data.files) === false) {
+                fileCount = Object.keys(data.files).length;
 
-                    filesedit = data.files;
+                filesedit = data.files;
 
-                    $(data.files).each(function (index, file) {
-                        let image = '';
-                        if (file.image === true) {
-                            image = '<img alt="" src="' + file.path + '" width="100" height="100" /><br />';
-                        } else {
-                            image = Joomla.getOptions('com_kunena.icons.attach') + ' <br />';
-                        }
+                $(data.files).each(function (index, file) {
+                    let image = '';
+                    if (file.image === true) {
+                        image = '<img alt="" src="' + file.path + '" width="100" height="100" /><br />';
+                    } else {
+                        image = Joomla.getOptions('com_kunena.icons.attach') + ' <br />';
+                    }
 
-                        if (file.inline === true) {
-                            fileeditinline = fileeditinline + 1;
-                        }
+                    if (file.inline === true) {
+                        fileeditinline = fileeditinline + 1;
+                    }
 
-                        const object = $('<div><p>' + image + '<span>' + file.name + '</span><br /></p></div>');
-                        data.uploaded = true;
-                        data.result = false;
-                        data.file_id = file.id;
+                    const object = $('<div><p>' + image + '<span>' + file.name + '</span><br /></p></div>');
+                    data.uploaded = true;
+                    data.result = false;
+                    data.file_id = file.id;
+
+                    // Add insert button
+                    object.append(insertButton.clone(true).data(file));
+
+                    // Add private button if private messages are enabled
+                    if (Joomla.getOptions('com_kunena.privateMessage') == 1) {
+                        const privateBtn = setPrivateButton.clone(true).data(file);
+                        
+                        // Check the protected status instead of private
+                        if (file.protected) {
+                            privateBtn.removeClass('btn-primary')
+                                    .addClass('btn-success')
+                                    .prop('disabled', true)
+                                    .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + 
+                                         Joomla.Text._('COM_KUNENA_ATTACHMENT_IS_PRIVATE'));
+                        }
+                        
+                        object.append(privateBtn);
+                    }
 
-                        object.append(insertButton.clone(true).data(file));
-                        object.append(removeButton.clone(true).data(data));
+                    // Add remove button
+                    object.append(removeButton.clone(true).data(data));
 
-                        object.appendTo("#files");
-                    });
+                    object.appendTo("#files");
+                });
 
-                    if (fileeditinline == 0) {
-                        $('#insert-all').show();
-                    }
+                if (fileeditinline == 0) {
+                    $('#insert-all').show();
+                }
 
-                    $('#remove-all').show();
+                $('#remove-all').show();
+                
+                // Show set-secure-all button if private messages are enabled
+                if (Joomla.getOptions('com_kunena.privateMessage') == 1) {
+                    $('#set-secure-all').show();
                 }
-            })
-            .fail(function () {
-                //TODO: handle the error of ajax request
-            });
+            }
+        })
+        .fail(function () {
+            //TODO: handle the error of ajax request
+        });
     }
 });

From 947678e692c8706342f3636db41c1048803fdbfa Mon Sep 17 00:00:00 2001
From: Astrid van Eerd <Pinkeltje@users.noreply.github.com>
Date: Wed, 13 Nov 2024 09:10:19 +0100
Subject: [PATCH 07/11] Update upload.main.js

hide insert when private is clicked and hide private when insert is clicked for individual attachment and all attachments
---
 src/media/kunena/core/js/upload.main.js | 263 ++++++++++++++----------
 1 file changed, 159 insertions(+), 104 deletions(-)

diff --git a/src/media/kunena/core/js/upload.main.js b/src/media/kunena/core/js/upload.main.js
index 3a84837554c..ac421b3a072 100644
--- a/src/media/kunena/core/js/upload.main.js
+++ b/src/media/kunena/core/js/upload.main.js
@@ -68,51 +68,73 @@ jQuery(function ($) {
     var fileeditinline = 0;
 
     $('#set-secure-all').on('click', function (e) {
-        e.preventDefault();
+    e.preventDefault();
 
-        const child = $('#kattach-list').find('input');
-        const filesidtosetprivate = [];
-        const $this = $(this);
+    const child = $('#kattach-list').find('input');
+    const filesidtosetprivate = [];
+    const $this = $(this);
 
-        child.each(function (i, el) {
-            const elem = $(el);
+    child.each(function (i, el) {
+        const elem = $(el);
 
-            if (!elem.attr('id').match("[a-z]{8}")) {
-                const fileid = elem.attr('id').match("[0-9]{1,8}");
-                filesidtosetprivate.push(fileid);
-            }
-        });
+        if (!elem.attr('id').match("[a-z]{8}")) {
+            const fileid = elem.attr('id').match("[0-9]{1,8}");
+            filesidtosetprivate.push(fileid);
+        }
+    });
 
-        if (filesidtosetprivate.length !== 0) {
-            $.ajax({
-                url: Joomla.getOptions('com_kunena.kunena_upload_files_set_private') + '&files_id=' + JSON.stringify(filesidtosetprivate),
-                type: 'POST'
-            })
-            .done(function (data) {
-                // Update all individual private buttons
-                $('#files button').each(function() {
-                    const $btn = $(this);
-                    if ($btn.html().includes(Joomla.Text._('COM_KUNENA_EDITOR_INSERT_PRIVATE_ATTACHMENT'))) {
-                        $btn.removeClass('btn-primary')
-                           .addClass('btn-success')
-                           .prop('disabled', true)
-                           .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + 
-                                Joomla.Text._('COM_KUNENA_ATTACHMENT_IS_PRIVATE'));
-                    }
-                });
+    if (filesidtosetprivate.length !== 0) {
+        $.ajax({
+            url: Joomla.getOptions('com_kunena.kunena_upload_files_set_private') + '&files_id=' + JSON.stringify(filesidtosetprivate),
+            type: 'POST'
+        })
+        .done(function (data) {
+            // Update all individual private buttons
+            $('#files button').each(function() {
+                const $btn = $(this);
+                if ($btn.html().includes(Joomla.Text._('COM_KUNENA_EDITOR_INSERT_PRIVATE_ATTACHMENT'))) {
+                    $btn.removeClass('btn-primary')
+                       .addClass('btn-success')
+                       .prop('disabled', true)
+                       .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + 
+                            Joomla.Text._('COM_KUNENA_ATTACHMENT_IS_PRIVATE'));
+                    
+                    // Hide the corresponding insert button in the same container
+                    $btn.siblings('button').each(function() {
+                        const $siblingBtn = $(this);
+                        if ($siblingBtn.html().includes(Joomla.Text._('COM_KUNENA_EDITOR_INSERT')) ||
+                            $siblingBtn.html().includes(Joomla.Text._('COM_KUNENA_EDITOR_IN_MESSAGE'))) {
+                            $siblingBtn.hide();
+                        }
+                    });
+                }
+            });
 
-                // Update the set-secure-all button
-                $this.removeClass('btn-primary')
-                     .addClass('btn-success')
-                     .prop('disabled', true)
-                     .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + 
-                          Joomla.Text._('COM_KUNENA_ALL_ATTACHMENTS_ARE_PRIVATE'));
-            })
-            .fail(function () {
-                //TODO: handle the error of ajax request
+            // Update the set-secure-all button
+            $this.removeClass('btn-primary')
+                 .addClass('btn-success')
+                 .prop('disabled', true)
+                 .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + 
+                      Joomla.Text._('COM_KUNENA_ALL_ATTACHMENTS_ARE_PRIVATE'));
+
+            // Hide both insert and insert-all buttons
+            $('button').each(function() {
+                const $btn = $(this);
+                if ($btn.html().includes(Joomla.Text._('COM_KUNENA_EDITOR_INSERT')) ||
+                    $btn.html().includes(Joomla.Text._('COM_KUNENA_EDITOR_IN_MESSAGE')) ||
+                    $btn.attr('id') === 'insert-all') {
+                    $btn.hide();
+                }
             });
-        }
-    });
+
+            // Explicitly hide the insert-all button
+            $('#insert-all').hide();
+        })
+        .fail(function () {
+            //TODO: handle the error of ajax request
+        });
+    }
+});
 
   $('#remove-all').on('click', function (e) {
     e.preventDefault();
@@ -120,7 +142,7 @@ jQuery(function ($) {
     $('#progress').hide();
 
     // Reset insert-all button state
-    $('#insert-all').removeClass('btn-success').addClass('btn-primary');
+    $('#insert-all').removeClass('btn-success').addClass('btn-outline-primary');
     $('#insert-all').html(Joomla.getOptions('com_kunena.icons.upload') + ' ' + Joomla.Text._('COM_KUNENA_UPLOADED_LABEL_INSERT_ALL_BUTTON'));
 
     // Hide action buttons
@@ -214,7 +236,7 @@ jQuery(function ($) {
 });
 
 
-    $('#insert-all').on('click', function (e) {
+   $('#insert-all').on('click', function (e) {
     e.preventDefault();
 
     const child = $('#kattach-list').find('input');
@@ -267,9 +289,7 @@ jQuery(function ($) {
                         Joomla.Text._('COM_KUNENA_EDITOR_IN_MESSAGE'));
 
     // Hide the "Set all attachments private" button since they're now inline
-    if ($('#set-secure-all').length > 0) {
-        $('#set-secure-all').hide();
-    }
+    $('#set-secure-all').hide();
 
     // Inserting items in message from edit if they aren't already present
     if ($.isEmptyObject(filesedit) === false) {
@@ -304,80 +324,115 @@ jQuery(function ($) {
     filesedit = null;
 });
 
-      const setPrivateButton = $('<button>')
-        .addClass("btn btn-primary")
-        .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + Joomla.Text._('COM_KUNENA_EDITOR_INSERT_PRIVATE_ATTACHMENT'))
-        .on('click', function (e) {
-            e.preventDefault();
-            e.stopPropagation();
+     const setPrivateButton = $('<button>')
+    .addClass("btn btn-primary")
+    .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + Joomla.Text._('COM_KUNENA_EDITOR_INSERT_PRIVATE_ATTACHMENT'))
+    .on('click', function (e) {
+        e.preventDefault();
+        e.stopPropagation();
 
-            const $this = $(this),
-            data = $this.data();
+        const $this = $(this),
+        data = $this.data();
 
-            let file_id = 0;
-            if (data.result !== undefined) {
-                file_id = data.result.data.id;
-            } else {
-                file_id = data.id;
-            }
+        let file_id = 0;
+        if (data.result !== undefined) {
+            file_id = data.result.data.id;
+        } else {
+            file_id = data.id;
+        }
 
-            const files_id = [];
-            files_id.push(file_id);
+        const files_id = [];
+        files_id.push(file_id);
 
-            $.ajax({
-                url: Joomla.getOptions('com_kunena.kunena_upload_files_set_private') + '&files_id=' + JSON.stringify(files_id),
-                type: 'POST'
-            })
-            .done(function (data) {
-                $this.removeClass('btn-primary')
-                     .addClass('btn-success')
-                     .prop('disabled', true)
-                     .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + 
-                          Joomla.Text._('COM_KUNENA_ATTACHMENT_IS_PRIVATE'));
-            })
-            .fail(function () {
-                //TODO: handle the error of ajax request
+        $.ajax({
+            url: Joomla.getOptions('com_kunena.kunena_upload_files_set_private') + '&files_id=' + JSON.stringify(files_id),
+            type: 'POST'
+        })
+        .done(function (data) {
+            // Update private button state
+            $this.removeClass('btn-primary')
+                 .addClass('btn-success')
+                 .prop('disabled', true)
+                 .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + 
+                      Joomla.Text._('COM_KUNENA_ATTACHMENT_IS_PRIVATE'));
+            
+            // Find and hide the insert button in the same container
+            $this.siblings('button').each(function() {
+                const $btn = $(this);
+                if ($btn.html().includes(Joomla.Text._('COM_KUNENA_EDITOR_INSERT')) ||
+                    $btn.html().includes(Joomla.Text._('COM_KUNENA_EDITOR_IN_MESSAGE'))) {
+                    $btn.hide();
+                }
             });
-        });
-
-    const insertButton = $('<button>')
-        .addClass("btn btn-primary")
-        .html(Joomla.getOptions('com_kunena.icons.upload') + ' ' + Joomla.Text._('COM_KUNENA_EDITOR_INSERT'))
-        .on('click', function (e) {
-            // Make sure the button click doesn't submit the form:
-            e.preventDefault();
-            e.stopPropagation();
 
-            const $this = $(this),
-                data = $this.data();
+            // Check if all attachments are now private
+            let allPrivate = true;
+            $('#files button').each(function() {
+                const $btn = $(this);
+                if ($btn.html().includes(Joomla.Text._('COM_KUNENA_EDITOR_INSERT_PRIVATE_ATTACHMENT')) &&
+                    !$btn.prop('disabled')) {
+                    allPrivate = false;
+                    return false; // Break the loop
+                }
+            });
 
-            let file_id = 0;
-            let filename = null;
-            if (data.result !== undefined) {
-                file_id = data.result.data.id;
-                filename = data.result.data.filename;
-            } else {
-                file_id = data.id;
-                filename = data.name;
+            // If all attachments are private, update the insert-all button
+            if (allPrivate) {
+                $('#insert-all').hide();
             }
+        })
+        .fail(function () {
+            //TODO: handle the error of ajax request
+        });
+    });
+    const insertButton = $('<button>')
+    .addClass("btn btn-primary")
+    .html(Joomla.getOptions('com_kunena.icons.upload') + ' ' + Joomla.Text._('COM_KUNENA_EDITOR_INSERT'))
+    .on('click', function (e) {
+        // Make sure the button click doesn't submit the form:
+        e.preventDefault();
+        e.stopPropagation();
 
-            insertInMessage(file_id, filename, $this);
+        const $this = $(this),
+            data = $this.data();
 
-            const files_id = [];
-            files_id.push(file_id);
+        let file_id = 0;
+        let filename = null;
+        if (data.result !== undefined) {
+            file_id = data.result.data.id;
+            filename = data.result.data.filename;
+        } else {
+            file_id = data.id;
+            filename = data.name;
+        }
 
-            $.ajax({
-                url: Joomla.getOptions('com_kunena.kunena_upload_files_set_inline') + '&files_id=' + JSON.stringify(files_id),
-                type: 'POST'
-            })
-                .done(function (data) {
+        insertInMessage(file_id, filename, $this);
 
-                })
-                .fail(function () {
-                    //TODO: handle the error of ajax request
-                });
+        const files_id = [];
+        files_id.push(file_id);
+
+        // Hide the private button for this attachment
+        $this.siblings('button').each(function() {
+            if ($(this).html().includes(Joomla.Text._('COM_KUNENA_EDITOR_INSERT_PRIVATE_ATTACHMENT'))) {
+                $(this).hide();
+            }
         });
 
+        // Hide the set-secure-all button since we're inserting an attachment
+        $('#set-secure-all').hide();
+
+        $.ajax({
+            url: Joomla.getOptions('com_kunena.kunena_upload_files_set_inline') + '&files_id=' + JSON.stringify(files_id),
+            type: 'POST'
+        })
+            .done(function (data) {
+                // Success handler if needed
+            })
+            .fail(function () {
+                //TODO: handle the error of ajax request
+            });
+    });
+
    const removeButton = $('<button/>')
         .addClass('btn btn-danger')
         .attr('type', 'button')

From ce5b4e07a947f65ca34ed587459140e0001293bf Mon Sep 17 00:00:00 2001
From: Astrid van Eerd <Pinkeltje@users.noreply.github.com>
Date: Wed, 13 Nov 2024 09:36:01 +0100
Subject: [PATCH 08/11] Update upload.main.js

changed language constants to existing language constants for private buttons
---
 src/media/kunena/core/js/upload.main.js | 34 +++++++++++++++++--------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/media/kunena/core/js/upload.main.js b/src/media/kunena/core/js/upload.main.js
index ac421b3a072..932f7dcf245 100644
--- a/src/media/kunena/core/js/upload.main.js
+++ b/src/media/kunena/core/js/upload.main.js
@@ -97,7 +97,7 @@ jQuery(function ($) {
                        .addClass('btn-success')
                        .prop('disabled', true)
                        .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + 
-                            Joomla.Text._('COM_KUNENA_ATTACHMENT_IS_PRIVATE'));
+                            Joomla.Text._('COM_KUNENA_EDITOR_ATTACHMENT_IS_SECURED'));
                     
                     // Hide the corresponding insert button in the same container
                     $btn.siblings('button').each(function() {
@@ -115,7 +115,7 @@ jQuery(function ($) {
                  .addClass('btn-success')
                  .prop('disabled', true)
                  .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + 
-                      Joomla.Text._('COM_KUNENA_ALL_ATTACHMENTS_ARE_PRIVATE'));
+                      Joomla.Text._('COM_KUNENA_EDITOR_ATTACHMENTS_ARE_SECURED'));
 
             // Hide both insert and insert-all buttons
             $('button').each(function() {
@@ -324,7 +324,7 @@ jQuery(function ($) {
     filesedit = null;
 });
 
-     const setPrivateButton = $('<button>')
+      const setPrivateButton = $('<button>')
     .addClass("btn btn-primary")
     .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + Joomla.Text._('COM_KUNENA_EDITOR_INSERT_PRIVATE_ATTACHMENT'))
     .on('click', function (e) {
@@ -354,7 +354,7 @@ jQuery(function ($) {
                  .addClass('btn-success')
                  .prop('disabled', true)
                  .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + 
-                      Joomla.Text._('COM_KUNENA_ATTACHMENT_IS_PRIVATE'));
+                      Joomla.Text._('COM_KUNENA_EDITOR_ATTACHMENT_IS_SECURED'));
             
             // Find and hide the insert button in the same container
             $this.siblings('button').each(function() {
@@ -367,18 +367,32 @@ jQuery(function ($) {
 
             // Check if all attachments are now private
             let allPrivate = true;
+            let anyNonPrivate = false;
             $('#files button').each(function() {
                 const $btn = $(this);
-                if ($btn.html().includes(Joomla.Text._('COM_KUNENA_EDITOR_INSERT_PRIVATE_ATTACHMENT')) &&
-                    !$btn.prop('disabled')) {
-                    allPrivate = false;
-                    return false; // Break the loop
+                if ($btn.html().includes(Joomla.Text._('COM_KUNENA_EDITOR_INSERT_PRIVATE_ATTACHMENT'))) {
+                    if (!$btn.prop('disabled')) {
+                        allPrivate = false;
+                        anyNonPrivate = true;
+                        return false; // Break the loop
+                    }
                 }
             });
 
-            // If all attachments are private, update the insert-all button
+            // Update global buttons based on state
             if (allPrivate) {
+                // If all attachments are private, hide both insert-all and set-secure-all
                 $('#insert-all').hide();
+                $('#set-secure-all')
+                    .removeClass('btn-primary')
+                    .addClass('btn-success')
+                    .prop('disabled', true)
+                    .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + 
+                         Joomla.Text._('COM_KUNENA_EDITOR_ATTACHMENTS_ARE_SECURED'));
+            } else if (anyNonPrivate) {
+                // If some attachments are not private, show both buttons
+                $('#insert-all').show();
+                $('#set-secure-all').show();
             }
         })
         .fail(function () {
@@ -730,7 +744,7 @@ jQuery(function ($) {
                                     .addClass('btn-success')
                                     .prop('disabled', true)
                                     .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + 
-                                         Joomla.Text._('COM_KUNENA_ATTACHMENT_IS_PRIVATE'));
+                                         Joomla.Text._('COM_KUNENA_EDITOR_ATTACHMENT_IS_SECURED'));
                         }
                         
                         object.append(privateBtn);

From 11fd689a2cbcafdb76e874b0883260f2da961230 Mon Sep 17 00:00:00 2001
From: Astrid van Eerd <Pinkeltje@users.noreply.github.com>
Date: Wed, 13 Nov 2024 09:45:33 +0100
Subject: [PATCH 09/11] Update upload.main.js

All buttons should now be hidden as expected.
---
 src/media/kunena/core/js/upload.main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/media/kunena/core/js/upload.main.js b/src/media/kunena/core/js/upload.main.js
index 932f7dcf245..41f3418cfdf 100644
--- a/src/media/kunena/core/js/upload.main.js
+++ b/src/media/kunena/core/js/upload.main.js
@@ -391,8 +391,8 @@ jQuery(function ($) {
                          Joomla.Text._('COM_KUNENA_EDITOR_ATTACHMENTS_ARE_SECURED'));
             } else if (anyNonPrivate) {
                 // If some attachments are not private, show both buttons
-                $('#insert-all').show();
-                $('#set-secure-all').show();
+                $('#insert-all').hide();
+                $('#set-secure-all').hide();
             }
         })
         .fail(function () {

From 2ef566f788ba8d0b1f2b0488d532a3573c349c81 Mon Sep 17 00:00:00 2001
From: Astrid van Eerd <Pinkeltje@users.noreply.github.com>
Date: Thu, 14 Nov 2024 12:10:35 +0100
Subject: [PATCH 10/11] Update upload.main.js

---
 src/media/kunena/core/js/upload.main.js | 492 +++++++++++++-----------
 1 file changed, 272 insertions(+), 220 deletions(-)

diff --git a/src/media/kunena/core/js/upload.main.js b/src/media/kunena/core/js/upload.main.js
index 41f3418cfdf..4f2c0d89e50 100644
--- a/src/media/kunena/core/js/upload.main.js
+++ b/src/media/kunena/core/js/upload.main.js
@@ -447,257 +447,269 @@ jQuery(function ($) {
             });
     });
 
-   const removeButton = $('<button/>')
+        const removeButton = $('<button/>')
         .addClass('btn btn-danger')
         .attr('type', 'button')
         .html(Joomla.getOptions('com_kunena.icons.trash') + ' ' + Joomla.Text._('COM_KUNENA_GEN_REMOVE_FILE'))
         .on('click', function (e) {
-            // Make sure the button click doesn't submit the form:
             e.preventDefault();
             e.stopPropagation();
 
-            const $this = $(this),
-                data = $this.data();
+            const $this = $(this);
+            const data = $this.data();
 
             $('#klabel_info_drop_browse').show();
 
             let file_id = 0;
-            if (data.uploaded === true) {
-                if (data.result !== false) {
-                    file_id = data.result.data.id;
-                } else {
-                    file_id = data.file_id;
-                }
+            
+            if (data.result !== undefined) {
+                file_id = data.result.data.id;
+            } else if (data.file_id !== undefined) {
+                file_id = data.file_id;
+            } else if (data.id !== undefined) {
+                file_id = data.id;
             }
 
-            if ($('#kattachs-' + file_id).length === 0) {
-                $('#kattach-list').append('<input id="kattachs-' + file_id + '" type="hidden" name="attachments[' + file_id + ']" value="1" />');
+            if (file_id === 0) {
+                console.error('Could not determine file ID');
+                return;
             }
 
-            if ($('#kattach-' + file_id).length > 0) {
-                $('#kattach-' + file_id).remove();
-            }
+            // Remove hidden input fields
+            $('#kattachs-' + file_id).remove();
+            $('#kattach-' + file_id).remove();
 
-            fileCount = fileCount - 1;
+            fileCount = Math.max(0, fileCount - 1);
 
-            if (fileCount == 0) {
+            // Update visibility of global buttons
+            if (fileCount === 0) {
                 $('#insert-all').hide();
                 $('#remove-all').hide();
+                $('#set-secure-all').hide();
             }
 
             $('#alert_max_file').remove();
             
-            // Get editor content while preserving line breaks
+            // Get editor content
             let editor_text = '';
             if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
-                // For CKEditor, getData() already preserves formatting
                 editor_text = CKEDITOR.instances.message.getData();
             } else {
-                // For SCEditor, get raw content with preserved line breaks
                 editor_text = sceditor.instance(document.getElementById('message')).val();
             }
 
-            if (editor_text.length > 0) {
-                const file_query_id = [];
-                file_query_id.push(file_id);
+            const file_query_id = [file_id];
 
-                // Ajax Request to delete the file from filesystem
-                $.ajax({
-                    url: Joomla.getOptions('com_kunena.kunena_upload_files_rem') + '&files_id_delete=' + JSON.stringify(file_query_id) + '&editor_text=' + encodeURIComponent(editor_text),
-                    type: 'POST'
-                })
-                .done(function (data) {
-                    $this.parent().remove();
+            // Enable submit button before AJAX call
+            $('#form_submit_button').prop('disabled', false);
 
-                    if (data.text_prepared !== false) {
-                        if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
-                            // Set content while preserving line breaks for CKEditor
-                            CKEDITOR.instances.message.setData(data.text_prepared);
-                        } else {
-                            // Set content while preserving line breaks for SCEditor
-                            sceditor.instance(document.getElementById('message')).val(data.text_prepared);
-                        }
+            // Ajax Request to delete the file
+            $.ajax({
+                url: Joomla.getOptions('com_kunena.kunena_upload_files_rem') + '&files_id_delete=' + JSON.stringify(file_query_id) + '&editor_text=' + encodeURIComponent(editor_text),
+                type: 'POST'
+            })
+            .done(function (data) {
+                // Remove the attachment container
+                $this.closest('div').remove();
+
+                // Update editor content if needed
+                if (data.text_prepared !== false) {
+                    if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
+                        CKEDITOR.instances.message.setData(data.text_prepared);
+                    } else {
+                        sceditor.instance(document.getElementById('message')).val(data.text_prepared);
                     }
-                })
-                .fail(function () {
-                    //TODO: handle the error of ajax request
-                });
-            }
-        });
+                }
 
-    $('#fileupload').fileupload({
-        url: $('#kunena_upload_files_url').val(),
-        dataType: 'json',
-        autoUpload: true,
-        // Enable image resizing, except for Android and Opera,
-        // which actually support image resizing, but fail to
-        // send Blob objects via XHR requests:
-        disableImageResize: / Android( ?!.*Chrome) |Opera /
-            .test(window.navigator.userAgent),
-        previewMaxWidth: 100,
-        previewMaxHeight: 100,
-        previewCrop: true
-    }).bind('fileuploadsubmit', function (e, data) {
-        var params = {};
-        $.each(data.files, function (index, file) {
-            params = {
-                'catid': $('#kunena_upload').val(),
-                'filename': file.name,
-                'size': file.size,
-                'mime': file.type
-            };
+                // Ensure submit button is enabled after successful removal
+                setTimeout(function() {
+                    $('#form_submit_button').prop('disabled', false);
+                }, 100);
+            })
+            .fail(function () {
+                // Keep submit button enabled even on failure
+                setTimeout(function() {
+                    $('#form_submit_button').prop('disabled', false);
+                }, 100);
+            })
+            .always(function() {
+                // Final check to ensure button is enabled
+                setTimeout(function() {
+                    $('#form_submit_button').prop('disabled', false);
+                }, 200);
+            });
         });
+    $('#fileupload').fileupload({
+    url: $('#kunena_upload_files_url').val(),
+    dataType: 'json',
+    autoUpload: true,
+    // Enable image resizing, except for Android and Opera,
+    // which actually support image resizing, but fail to
+    // send Blob objects via XHR requests:
+    disableImageResize: /Android(?!.*Chrome)|Opera/
+        .test(window.navigator.userAgent),
+    previewMaxWidth: 100,
+    previewMaxHeight: 100,
+    previewCrop: true
+})
+.bind('fileuploadsubmit', function (e, data) {
+    var params = {};
+    $.each(data.files, function (index, file) {
+        params = {
+            'catid': $('#kunena_upload').val(),
+            'filename': file.name,
+            'size': file.size,
+            'mime': file.type
+        };
+    });
+    data.formData = params;
+})
+.bind('fileuploaddrop', function (e, data) {
+    $('#form_submit_button').prop('disabled', true);
+    $('#remove-all').show();
+    $('#insert-all').show();
+    
+    if (Joomla.getOptions('com_kunena.privateMessage') == 1) {
+        $('#set-secure-all').show();
+    }
 
-        data.formData = params;
-    })
-        .bind('fileuploaddrop', function (e, data) {
-            $('#form_submit_button').prop('disabled', true);
-
-            $('#remove-all').show();
-            $('#insert-all').show();
-            
-            if (Joomla.getOptions('com_kunena.privateMessage') == 1) {
-                $('#set-secure-all').show();
-            }
-
-            $('#kattach_form').show();
-
-            const filecoutntmp = Object.keys(data['files']).length + fileCount;
-
-            if (filecoutntmp > Joomla.getOptions('com_kunena.kunena_upload_files_maxfiles')) {
-                $('<div class="alert alert-danger alert-dismissible fade show" id="alert_max_file" role="alert">  ' + Joomla.Text._('COM_KUNENA_UPLOADED_LABEL_ERROR_REACHED_MAX_NUMBER_FILES') + '  <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>').insertBefore($('#files'));
-
-                $('#form_submit_button').prop('disabled', false);
-
-                return false;
-            } else {
-                fileCount = Object.keys(data['files']).length + fileCount;
-            }
-        })
-        .bind('fileuploadchange', function (e, data) {
-            $('#form_submit_button').prop('disabled', true);
-
-            $('#remove-all').show();
-            $('#insert-all').show();
-            
-            if (Joomla.getOptions('com_kunena.privateMessage') == 1) {
-                $('#set-secure-all').show();
-            }
-
-            const filecoutntmp = Object.keys(data['files']).length + fileCount;
-
-            if (filecoutntmp > Joomla.getOptions('com_kunena.kunena_upload_files_maxfiles')) {
-                $('<div class="alert alert-danger alert-dismissible fade show" id="alert_max_file" role="alert">  ' + Joomla.Text._('COM_KUNENA_UPLOADED_LABEL_ERROR_REACHED_MAX_NUMBER_FILES') + '  <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>').insertBefore($('#files'));
+    $('#kattach_form').show();
 
-                $('#form_submit_button').prop('disabled', false);
+    const fileCountTotal = Object.keys(data['files']).length + fileCount;
 
-                return false;
-            } else {
-                fileCount = Object.keys(data['files']).length + fileCount;
-            }
-        })
-        .on('fileuploadadd', function (e, data) {
-            $('#progress-bar').css(
-                'width',
-                '0%'
-            );
-
-			$('#progress').show();
-
-            data.context = $('<div/>').appendTo('#files');
-
-            $.each(data.files, function (index, file) {
-                const node = $('<p/>')
-                    .append($('<span/>').text(file.name));
-                if (!index) {
-                    node
-                        .append('<br>');
-                }
+    if (fileCountTotal > Joomla.getOptions('com_kunena.kunena_upload_files_maxfiles')) {
+        $('<div class="alert alert-danger alert-dismissible fade show" id="alert_max_file" role="alert">' + 
+          Joomla.Text._('COM_KUNENA_UPLOADED_LABEL_ERROR_REACHED_MAX_NUMBER_FILES') + 
+          '<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>')
+        .insertBefore($('#files'));
+        
+        $('#form_submit_button').prop('disabled', false);
+        return false;
+    }
+    
+    fileCount = fileCountTotal;
+})
+.bind('fileuploadchange', function (e, data) {
+    $('#form_submit_button').prop('disabled', true);
+    $('#remove-all').show();
+    $('#insert-all').show();
+    
+    if (Joomla.getOptions('com_kunena.privateMessage') == 1) {
+        $('#set-secure-all').show();
+    }
 
-                node.appendTo(data.context);
-            });
-        }).on('fileuploadprocessalways', function (e, data) {
-        const index = data.index,
-            file = data.files[index],
-            node = $(data.context.children()[index]);
-        if (file.preview) {
-            node
-                .prepend('<br>')
-                .prepend(file.preview);
-        }
+    const fileCountTotal = Object.keys(data['files']).length + fileCount;
 
-        if (file.error) {
-            node
-                .append('<br>')
-                .append($('<span class="text-danger"/>').text(file.error));
+    if (fileCountTotal > Joomla.getOptions('com_kunena.kunena_upload_files_maxfiles')) {
+        $('<div class="alert alert-danger alert-dismissible fade show" id="alert_max_file" role="alert">' + 
+          Joomla.Text._('COM_KUNENA_UPLOADED_LABEL_ERROR_REACHED_MAX_NUMBER_FILES') + 
+          '<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>')
+        .insertBefore($('#files'));
+        
+        $('#form_submit_button').prop('disabled', false);
+        return false;
+    }
+    
+    fileCount = fileCountTotal;
+})
+.on('fileuploadadd', function (e, data) {
+    $('#progress-bar').css('width', '0%');
+    $('#progress').show();
+
+    data.context = $('<div/>').appendTo('#files');
+
+    $.each(data.files, function (index, file) {
+        const node = $('<p/>').append($('<span/>').text(file.name));
+        if (!index) {
+            node.append('<br>');
         }
+        node.appendTo(data.context);
+    });
+})
+.on('fileuploadprocessalways', function (e, data) {
+    const index = data.index,
+        file = data.files[index],
+        node = $(data.context.children()[index]);
+
+    if (file.preview) {
+        node.prepend('<br>').prepend(file.preview);
+    }
 
-        if (index + 1 === data.files.length) {
-            data.context.find('button.btn-primary')
-                .text(Joomla.Text._('COM_KUNENA_UPLOADED_LABEL_UPLOAD_BUTTON'))
-                .prop('disabled', !!data.files.error);
-        }
-    }).on('fileuploaddone', function (e, data) {
-        // $.each(data.result.data, function (index, file)
-        const progress = parseInt(data.loaded / data.total * 100, 10);
+    if (file.error) {
+        node.append('<br>')
+           .append($('<span class="text-danger"/>').text(file.error));
+    }
 
-        $('.progress-bar').css(
-            'width',
-            progress + '%'
+    if (index + 1 === data.files.length) {
+        data.context.find('button.btn-primary')
+            .text(Joomla.Text._('COM_KUNENA_UPLOADED_LABEL_UPLOAD_BUTTON'))
+            .prop('disabled', !!data.files.error);
+    }
+})
+.on('fileuploaddone', function (e, data) {
+    const progress = parseInt(data.loaded / data.total * 100, 10);
+    $('.progress-bar').css('width', progress + '%')
+                     .prop('aria-valuenow', progress);
+
+    const link = $('<a>').attr('target', '_blank')
+                        .prop('href', data.result.location);
+    
+    data.context.find('span').wrap(link);
+
+    if (data.result.success === true) {
+        $('#form_submit_button').prop('disabled', false);
+
+        // Add hidden inputs for attachments
+        $('#kattach-list').append(
+            '<input id="kattachs-' + data.result.data.id + 
+            '" type="hidden" name="attachments[' + data.result.data.id + ']" value="1" />' +
+            '<input id="kattach-' + data.result.data.id + 
+            '" placeholder="' + data.result.data.filename + 
+            '" type="hidden" name="attachment[' + data.result.data.id + ']" value="1" />'
         );
 
-        $('.progress-bar').prop('aria-valuenow', progress);
-
-        const link = $('<a>')
-            .attr('target', '_blank')
-            .prop('href', data.result.location);
-
-        data.context.find('span')
-            .wrap(link);
-
-        if (data.result.success === true) {
-            $('#form_submit_button').prop('disabled', false);
-
-            // The attachment has been right uploaded, so now we need to put into input hidden to added to message
-            $('#kattach-list').append('<input id="kattachs-' + data.result.data.id + '" type="hidden" name="attachments[' + data.result.data.id + ']" value="1" />');
-            $('#kattach-list').append('<input id="kattach-' + data.result.data.id + '" placeholder="' + data.result.data.filename + '" type="hidden" name="attachment[' + data.result.data.id + ']" value="1" />');
-
-            data.uploaded = true;
-
-            data.context.append(insertButton.clone(true).data(data));
-            if (data.context.find('button').hasClass('btn-danger')) {
-                data.context.find('button.btn-danger').remove();
-            }
-
-			if (Joomla.getOptions('com_kunena.privateMessage') == 1) {
-                data.context.append(setPrivateButton.clone(true).data(data));
-            }
-
-            data.context.append(removeButton.clone(true).data(data));
-        } else if (data.result.message) {
-            $('#form_submit_button').prop('disabled', false);
-
-            data.uploaded = false;
-            data.context.append(removeButton.clone(true).data(data));
+        data.uploaded = true;
 
-            var error = null;
-
-            if (data.result.message.length > 0) {
-                error = $('<div class="alert alert-danger" role="alert">').text(data.result.message);
-                data.context.find('span')
-                    .append('<br>')
-                    .append(error);
-            }
+        // Add action buttons
+        if (data.context.find('button.btn-danger').length) {
+            data.context.find('button.btn-danger').remove();
+        }
+        
+        data.context.append(insertButton.clone(true).data(data));
+        
+        if (Joomla.getOptions('com_kunena.privateMessage') == 1) {
+            data.context.append(setPrivateButton.clone(true).data(data));
         }
-    }).on('fileuploadfail', function (e, data) {
-        $.each(data.files, function (index, file) {
-            const error = $('<span class="text-danger"/>').text(file.error);
-            $(data.context.children()[index])
+        
+        data.context.append(removeButton.clone(true).data(data));
+    } else if (data.result.message) {
+        $('#form_submit_button').prop('disabled', false);
+        data.uploaded = false;
+        
+        // Add remove button and show error message
+        data.context.append(removeButton.clone(true).data(data));
+        
+        if (data.result.message.length > 0) {
+            const error = $('<div class="alert alert-danger" role="alert">')
+                .text(data.result.message);
+            data.context.find('span')
                 .append('<br>')
                 .append(error);
-        });
-    }).prop('disabled', !$.support.fileInput)
-        .parent().addClass($.support.fileInput ? undefined : 'disabled');
+        }
+    }
+})
+.on('fileuploadfail', function (e, data) {
+    $('#form_submit_button').prop('disabled', false);
+    
+    $.each(data.files, function (index, file) {
+        const error = $('<span class="text-danger"/>').text(file.error);
+        $(data.context.children()[index])
+            .append('<br>')
+            .append(error);
+    });
+})
+.prop('disabled', !$.support.fileInput)
+.parent().addClass($.support.fileInput ? undefined : 'disabled');
 
     // Load attachments when the message is edited
      if ($('#kmessageid').val() > 0) {
@@ -711,8 +723,9 @@ jQuery(function ($) {
         .done(function (data) {
             if ($.isEmptyObject(data.files) === false) {
                 fileCount = Object.keys(data.files).length;
-
                 filesedit = data.files;
+                let allProtected = true;
+                let hasInlineAttachments = false;
 
                 $(data.files).each(function (index, file) {
                     let image = '';
@@ -724,47 +737,86 @@ jQuery(function ($) {
 
                     if (file.inline === true) {
                         fileeditinline = fileeditinline + 1;
+                        hasInlineAttachments = true;
                     }
 
                     const object = $('<div><p>' + image + '<span>' + file.name + '</span><br /></p></div>');
-                    data.uploaded = true;
-                    data.result = false;
-                    data.file_id = file.id;
+                    
+                    // Create a clean data object for this attachment
+                    const attachmentData = {
+                        file_id: file.id,
+                        uploaded: true,
+                        name: file.name,
+                        inline: file.inline,
+                        protected: file.protected
+                    };
 
                     // Add insert button
-                    object.append(insertButton.clone(true).data(file));
+                    const insertBtn = insertButton.clone(true).data(attachmentData);
+                    if (file.inline === true) {
+                        insertBtn.removeClass('btn-primary')
+                               .addClass('btn-success')
+                               .html(Joomla.getOptions('com_kunena.icons.upload') + ' ' + 
+                                    Joomla.Text._('COM_KUNENA_EDITOR_IN_MESSAGE'));
+                    }
+                    object.append(insertBtn);
 
                     // Add private button if private messages are enabled
                     if (Joomla.getOptions('com_kunena.privateMessage') == 1) {
-                        const privateBtn = setPrivateButton.clone(true).data(file);
+                        const privateBtn = setPrivateButton.clone(true).data(attachmentData);
                         
-                        // Check the protected status instead of private
                         if (file.protected) {
                             privateBtn.removeClass('btn-primary')
                                     .addClass('btn-success')
                                     .prop('disabled', true)
                                     .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + 
                                          Joomla.Text._('COM_KUNENA_EDITOR_ATTACHMENT_IS_SECURED'));
+                            
+                            insertBtn.hide();
+                        } else {
+                            allProtected = false;
+                            
+                            if (file.inline === true) {
+                                privateBtn.hide();
+                            }
                         }
                         
                         object.append(privateBtn);
                     }
 
-                    // Add remove button
-                    object.append(removeButton.clone(true).data(data));
+                    // Add remove button with the same data
+                    object.append(removeButton.clone(true).data(attachmentData));
 
                     object.appendTo("#files");
-                });
 
-                if (fileeditinline == 0) {
-                    $('#insert-all').show();
-                }
+                    // Add attachment inputs for form submission
+                    $('#kattach-list').append('<input id="kattachs-' + file.id + '" type="hidden" name="attachments[' + file.id + ']" value="1" />');
+                    $('#kattach-list').append('<input id="kattach-' + file.id + '" placeholder="' + file.name + '" type="hidden" name="attachment[' + file.id + ']" value="1" />');
+                });
 
-                $('#remove-all').show();
-                
-                // Show set-secure-all button if private messages are enabled
-                if (Joomla.getOptions('com_kunena.privateMessage') == 1) {
-                    $('#set-secure-all').show();
+                // Show/hide global action buttons based on state
+                if (fileCount > 0) {
+                    $('#remove-all').show();
+                    
+                    if (!hasInlineAttachments && !allProtected) {
+                        $('#insert-all').show();
+                    } else {
+                        $('#insert-all').hide();
+                    }
+                    
+                    if (Joomla.getOptions('com_kunena.privateMessage') == 1) {
+                        if (allProtected) {
+                            $('#set-secure-all')
+                                .removeClass('btn-primary')
+                                .addClass('btn-success')
+                                .prop('disabled', true)
+                                .html(Joomla.getOptions('com_kunena.icons.secure') + ' ' + 
+                                     Joomla.Text._('COM_KUNENA_EDITOR_ATTACHMENTS_ARE_SECURED'))
+                                .show();
+                        } else if (!hasInlineAttachments) {
+                            $('#set-secure-all').show();
+                        }
+                    }
                 }
             }
         })

From 1b21a9434ff9b423478cfc68075fcfd8336ce8ea Mon Sep 17 00:00:00 2001
From: Astrid van Eerd <Pinkeltje@users.noreply.github.com>
Date: Thu, 14 Nov 2024 17:09:21 +0100
Subject: [PATCH 11/11] Update upload.main.js

---
 src/media/kunena/core/js/upload.main.js | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/media/kunena/core/js/upload.main.js b/src/media/kunena/core/js/upload.main.js
index 4f2c0d89e50..bec1a6940a0 100644
--- a/src/media/kunena/core/js/upload.main.js
+++ b/src/media/kunena/core/js/upload.main.js
@@ -447,7 +447,7 @@ jQuery(function ($) {
             });
     });
 
-        const removeButton = $('<button/>')
+         const removeButton = $('<button/>')
         .addClass('btn btn-danger')
         .attr('type', 'button')
         .html(Joomla.getOptions('com_kunena.icons.trash') + ' ' + Joomla.Text._('COM_KUNENA_GEN_REMOVE_FILE'))
@@ -498,6 +498,17 @@ jQuery(function ($) {
                 editor_text = sceditor.instance(document.getElementById('message')).val();
             }
 
+            // Find and remove the attachment BBCode
+            const attachmentRegex = /\[attachment=[0-9]+\][^[\]]+\[\/attachment\]/g;
+            const cleanedEditorText = editor_text.replace(new RegExp('\\[attachment=' + file_id + '\\][^[\\]]+\\[/attachment\\]'), '');
+
+            // Update editor content with the cleaned text
+            if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
+                CKEDITOR.instances.message.setData(cleanedEditorText);
+            } else {
+                sceditor.instance(document.getElementById('message')).val(cleanedEditorText);
+            }
+
             const file_query_id = [file_id];
 
             // Enable submit button before AJAX call
@@ -505,22 +516,13 @@ jQuery(function ($) {
 
             // Ajax Request to delete the file
             $.ajax({
-                url: Joomla.getOptions('com_kunena.kunena_upload_files_rem') + '&files_id_delete=' + JSON.stringify(file_query_id) + '&editor_text=' + encodeURIComponent(editor_text),
+                url: Joomla.getOptions('com_kunena.kunena_upload_files_rem') + '&files_id_delete=' + JSON.stringify(file_query_id) + '&editor_text=' + encodeURIComponent(cleanedEditorText),
                 type: 'POST'
             })
             .done(function (data) {
                 // Remove the attachment container
                 $this.closest('div').remove();
 
-                // Update editor content if needed
-                if (data.text_prepared !== false) {
-                    if (Joomla.getOptions('com_kunena.ckeditor_config') !== undefined) {
-                        CKEDITOR.instances.message.setData(data.text_prepared);
-                    } else {
-                        sceditor.instance(document.getElementById('message')).val(data.text_prepared);
-                    }
-                }
-
                 // Ensure submit button is enabled after successful removal
                 setTimeout(function() {
                     $('#form_submit_button').prop('disabled', false);
@@ -539,6 +541,7 @@ jQuery(function ($) {
                 }, 200);
             });
         });
+
     $('#fileupload').fileupload({
     url: $('#kunena_upload_files_url').val(),
     dataType: 'json',