From 25e90d8d75382721ff7473fa1686090fcfeb46ff Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sun, 11 Oct 2020 13:34:38 +0200
Subject: Bulk creation: fix private status based on the first form

---
 application/front/controller/admin/ShaarePublishController.php | 6 +++++-
 assets/default/js/base.js                                      | 8 ++++++++
 tpl/default/addlink.html                                       | 4 ++--
 tpl/default/editlink.html                                      | 2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/application/front/controller/admin/ShaarePublishController.php b/application/front/controller/admin/ShaarePublishController.php
index 608f79cf..fd680ea0 100644
--- a/application/front/controller/admin/ShaarePublishController.php
+++ b/application/front/controller/admin/ShaarePublishController.php
@@ -169,7 +169,11 @@ class ShaarePublishController extends ShaarliAdminController
             $title = $request->getParam('title');
             $description = $request->getParam('description');
             $tags = $request->getParam('tags');
-            $private = filter_var($request->getParam('private'), FILTER_VALIDATE_BOOLEAN);
+            if ($request->getParam('private') !== null) {
+                $private = filter_var($request->getParam('private'), FILTER_VALIDATE_BOOLEAN);
+            } else {
+                $private = $this->container->conf->get('privacy.default_private_links', false);
+            }
 
             // If this is an HTTP(S) link, we try go get the page to extract
             // the title (otherwise we will to straight to the edit form.)
diff --git a/assets/default/js/base.js b/assets/default/js/base.js
index 9161b4fc..4163577d 100644
--- a/assets/default/js/base.js
+++ b/assets/default/js/base.js
@@ -654,5 +654,13 @@ function init(description) {
       e.preventDefault();
       toggleBulkCreationVisibility(bulkCreationButton, bulkCreationForm);
     });
+
+    // Force to send falsy value if the checkbox is not checked.
+    const privateButton = bulkCreationForm.querySelector('input[type="checkbox"][name="private"]');
+    const privateHiddenButton = bulkCreationForm.querySelector('input[type="hidden"][name="private"]');
+    privateButton.addEventListener('click', () => {
+      privateHiddenButton.disabled = !privateHiddenButton.disabled;
+    });
+    privateHiddenButton.disabled = privateButton.checked;
   }
 })();
diff --git a/tpl/default/addlink.html b/tpl/default/addlink.html
index 7d4bc9e6..4aac7ff1 100644
--- a/tpl/default/addlink.html
+++ b/tpl/default/addlink.html
@@ -62,8 +62,8 @@
           </div>
 
           <div>
-            <input type="checkbox" name="private"
-                   {if="$default_private_links"} checked="checked"{/if}>
+            <input type="hidden" name="private" value="0">
+            <input type="checkbox" name="private" {if="$default_private_links"} checked="checked"{/if}>
           &nbsp; <label for="lf_private">{'Private'|t}</label>
           </div>
         </div>
diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html
index 980b2b8e..83e541fd 100644
--- a/tpl/default/editlink.html
+++ b/tpl/default/editlink.html
@@ -65,7 +65,7 @@
 
       <div>
         <input type="checkbox"  name="lf_private" id="lf_private"
-        {if="($link_is_new && $default_private_links || $link.private == true)"}
+        {if="$link.private === true"}
           checked="checked"
         {/if}>
         &nbsp;<label for="lf_private">{'Private'|t}</label>
-- 
cgit v1.2.3