From 4086665d16ce680b34992d5e1ebcc572240a8137 Mon Sep 17 00:00:00 2001
From: Peter Bieringer <pb@bieringer.de>
Date: Thu, 6 Mar 2025 08:20:40 +0100
Subject: [PATCH 1/8] InfCloud: extension for link

---
 radicale/web/internal_data/css/main.css | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/radicale/web/internal_data/css/main.css b/radicale/web/internal_data/css/main.css
index a6d7da72..1e2dcef0 100644
--- a/radicale/web/internal_data/css/main.css
+++ b/radicale/web/internal_data/css/main.css
@@ -39,6 +39,17 @@ main{
     color: #484848;
 }
 
+#loginscene .infcloudlink{
+    margin: 0;
+    width: 100%;
+    text-align: center;
+    color: #484848;
+}
+
+#loginscene .infcloudlink-hidden{
+    visibility: hidden;
+}
+
 #loginscene input{
 }
 

From 7839ac5783abcac56ed8bceec10de26874ad2dca Mon Sep 17 00:00:00 2001
From: Peter Bieringer <pb@bieringer.de>
Date: Thu, 6 Mar 2025 08:21:25 +0100
Subject: [PATCH 2/8] InfCloud: conditional display of link

---
 radicale/web/internal_data/index.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/radicale/web/internal_data/index.html b/radicale/web/internal_data/index.html
index 9ac96795..8d257c92 100644
--- a/radicale/web/internal_data/index.html
+++ b/radicale/web/internal_data/index.html
@@ -33,8 +33,15 @@
       </section>
 
       <section id="loginscene" class="container hidden">
+        <div class="infcloudlink-hidden">
+	  <form action="infcloud/" method="get" target="_blank">
+            <button class="blue" type="submit">Collection content<br>(InfCloud web client)</button>
+	  </form>
+        </div>
         <div class="logocontainer">
           <img src="css/logo.svg" alt="Radicale">
+	  <br>
+	  Collection management
         </div>
         <h1>Sign in</h1>
         <br>

From 2ae1762daa53441d1dca3eb97e7be1999ac24af1 Mon Sep 17 00:00:00 2001
From: Peter Bieringer <pb@bieringer.de>
Date: Thu, 6 Mar 2025 08:22:02 +0100
Subject: [PATCH 3/8] Infcloud: on-the-fly link activation (if available) and
 default content adjustment

---
 radicale/httputils.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/radicale/httputils.py b/radicale/httputils.py
index 23cc3677..c3dea678 100644
--- a/radicale/httputils.py
+++ b/radicale/httputils.py
@@ -196,6 +196,24 @@ def _serve_traversable(
             "%a, %d %b %Y %H:%M:%S GMT",
             time.gmtime(traversable.stat().st_mtime))
     answer = traversable.read_bytes()
+    if path == "/.web/index.html" or path == "/.web/":
+        # enable link on the fly in index.html if InfCloud index.html is existing
+        # class="infcloudlink-hidden" -> class="infcloudlink"
+        path_posix = traversable.as_posix()
+        path_posix_infcloud = path_posix.replace("/internal_data/index.html", "/internal_data/infcloud/index.html")
+        if os.path.isfile(path_posix_infcloud):
+            # logger.debug("Enable InfCloud link in served page: %r", path)
+            answer = answer.replace(b"infcloudlink-hidden", b"infcloud")
+    elif path == "/.web/infcloud/config.js":
+        # adjust on the fly default config.js of InfCloud installation
+        # logger.debug("Adjust on-the-fly default InfCloud config.js in served page: %r", path)
+        answer = answer.replace(b"location.pathname.replace(RegExp('/+[^/]+/*(index\.html)?$'),'')+", b"location.pathname.replace(RegExp('/\.web\.infcloud/(index\.html)?$'),'')+")
+        answer = answer.replace(b"'/caldav.php/',", b"'/',")
+        answer = answer.replace(b"settingsAccount: true,", b"settingsAccount: false,")
+    elif path == "/.web/infcloud/main.js":
+        # adjust on the fly default main.js of InfCloud installation
+        logger.debug("Adjust on-the-fly default InfCloud main.js in served page: %r", path)
+        answer = answer.replace(b"'InfCloud - the open source CalDAV/CardDAV web client'", b"'InfCloud - the open source CalDAV/CardDAV web client - served through Radicale CalDAV/CardDAV server'")
     return client.OK, headers, answer
 
 

From 45df5a3b947f1eae035ec0976bde850c434e059a Mon Sep 17 00:00:00 2001
From: Peter Bieringer <pb@bieringer.de>
Date: Thu, 6 Mar 2025 08:23:50 +0100
Subject: [PATCH 4/8] InfCloud support

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ce89ba7..120390a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 * Add: option [server] script_name for reverse proxy base_prefix handling
 * Fix: proper base_prefix stripping if running behind reverse proxy
 * Review: Apache reverse proxy config example
+* Add: on-the-fly link activation and default content adjustment in case of bundled InfCloud
 
 ## 3.4.1
 * Add: option [auth] dovecot_connection_type / dovecot_host / dovecot_port

From 75711b46dc84e557c1df10dec49f4630161dcf1e Mon Sep 17 00:00:00 2001
From: Peter Bieringer <pb@bieringer.de>
Date: Thu, 6 Mar 2025 08:32:09 +0100
Subject: [PATCH 5/8] add specific version

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 120390a3..5decab27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
 * Add: option [server] script_name for reverse proxy base_prefix handling
 * Fix: proper base_prefix stripping if running behind reverse proxy
 * Review: Apache reverse proxy config example
-* Add: on-the-fly link activation and default content adjustment in case of bundled InfCloud
+* Add: on-the-fly link activation and default content adjustment in case of bundled InfCloud (tested with 0.13.1)
 
 ## 3.4.1
 * Add: option [auth] dovecot_connection_type / dovecot_host / dovecot_port

From e52056dea332137ae0b6137726052ccf82e468de Mon Sep 17 00:00:00 2001
From: Peter Bieringer <pb@bieringer.de>
Date: Thu, 6 Mar 2025 08:32:27 +0100
Subject: [PATCH 6/8] InfCloud: update related to support of bundled package

---
 DOCUMENTATION.md | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md
index f4e04d8f..32514e79 100644
--- a/DOCUMENTATION.md
+++ b/DOCUMENTATION.md
@@ -1448,16 +1448,13 @@ It will list your existing address books.
 
 #### InfCloud, CalDavZAP and CardDavMATE
 
-You can integrate InfCloud into Radicale's web interface with
-[RadicaleInfCloud](https://github.com/Unrud/RadicaleInfCloud). No additional
-configuration is required.
+You can integrate InfCloud into Radicale's web interface with by simply
+download latest package from [InfCloud](https://www.inf-it.com/open-source/clients/infcloud/)
+and extract content to new folder `infcloud` in `radicale/web/internal_data/`.
 
-Set the URL of the Radicale server in ``config.js``. If **InfCloud** is not
-hosted on the same server and port as Radicale, the browser will deny access to
-the Radicale server, because of the
-[same-origin policy](https://en.wikipedia.org/wiki/Same-origin_policy).
-You have to add additional HTTP header in the `headers` section of Radicale's
-configuration. The documentation of **InfCloud** has more details on this.
+No further adjustments are required as content is adjusted on the fly (tested with 0.13.1).
+
+See also [Wiki/Client InfCloud](https://github.com/Kozea/Radicale/wiki/Client-InfCloud).
 
 #### Command line
 

From 1d0ff9e84aca7377b009069c066f08500d7f3a67 Mon Sep 17 00:00:00 2001
From: Peter Bieringer <pb@bieringer.de>
Date: Thu, 6 Mar 2025 08:51:56 +0100
Subject: [PATCH 7/8] tox fix

---
 radicale/httputils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/radicale/httputils.py b/radicale/httputils.py
index c3dea678..1b653118 100644
--- a/radicale/httputils.py
+++ b/radicale/httputils.py
@@ -199,7 +199,7 @@ def _serve_traversable(
     if path == "/.web/index.html" or path == "/.web/":
         # enable link on the fly in index.html if InfCloud index.html is existing
         # class="infcloudlink-hidden" -> class="infcloudlink"
-        path_posix = traversable.as_posix()
+        path_posix = str(traversable)
         path_posix_infcloud = path_posix.replace("/internal_data/index.html", "/internal_data/infcloud/index.html")
         if os.path.isfile(path_posix_infcloud):
             # logger.debug("Enable InfCloud link in served page: %r", path)

From 76281ad1ff1596ce34cfc26cd05d382b94a1a473 Mon Sep 17 00:00:00 2001
From: Peter Bieringer <pb@bieringer.de>
Date: Thu, 6 Mar 2025 08:52:54 +0100
Subject: [PATCH 8/8] tox fixes

---
 radicale/httputils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/radicale/httputils.py b/radicale/httputils.py
index 1b653118..23f10ec1 100644
--- a/radicale/httputils.py
+++ b/radicale/httputils.py
@@ -207,7 +207,7 @@ def _serve_traversable(
     elif path == "/.web/infcloud/config.js":
         # adjust on the fly default config.js of InfCloud installation
         # logger.debug("Adjust on-the-fly default InfCloud config.js in served page: %r", path)
-        answer = answer.replace(b"location.pathname.replace(RegExp('/+[^/]+/*(index\.html)?$'),'')+", b"location.pathname.replace(RegExp('/\.web\.infcloud/(index\.html)?$'),'')+")
+        answer = answer.replace(b"location.pathname.replace(RegExp('/+[^/]+/*(index\\.html)?$'),'')+", b"location.pathname.replace(RegExp('/\\.web\\.infcloud/(index\\.html)?$'),'')+")
         answer = answer.replace(b"'/caldav.php/',", b"'/',")
         answer = answer.replace(b"settingsAccount: true,", b"settingsAccount: false,")
     elif path == "/.web/infcloud/main.js":