From 236b55cdaa50f6f47e91ef83af8dd244362a755c Mon Sep 17 00:00:00 2001
From: GitHub Workflow <workflow@github.com>
Date: Thu, 23 May 2024 08:36:10 +0000
Subject: [PATCH] Repo-sync

---
 Containers/collabora/Dockerfile     | 2 +-
 Containers/mastercontainer/start.sh | 2 +-
 php/public/domain-prefill.js        | 7 -------
 php/templates/containers.twig       | 7 ++-----
 4 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 php/public/domain-prefill.js

diff --git a/Containers/collabora/Dockerfile b/Containers/collabora/Dockerfile
index 3eb2b187..ea0385ac 100644
--- a/Containers/collabora/Dockerfile
+++ b/Containers/collabora/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:latest
 # From a file located probably somewhere here: https://github.com/CollaboraOnline/online/tree/master/docker
-FROM collabora/code:24.04.2.1.1
+FROM collabora/code:24.04.3.1.1
 
 USER root
 ARG DEBIAN_FRONTEND noninteractive
diff --git a/Containers/mastercontainer/start.sh b/Containers/mastercontainer/start.sh
index 8ea80817..f215f6c6 100644
--- a/Containers/mastercontainer/start.sh
+++ b/Containers/mastercontainer/start.sh
@@ -76,7 +76,7 @@ if ! sudo -u www-data docker info &>/dev/null; then
     exit 1
 fi
 API_VERSION_FILE="$(find ./ -name DockerActionManager.php | head -1)"
-API_VERSION="$(grep -oP 'const API_VERSION.*\;' "$API_VERSION_FILE" | grep -oP '[0-9]+.[0-9]+' | head -1)"
+API_VERSION="$(grep -oP 'const string API_VERSION.*\;' "$API_VERSION_FILE" | grep -oP '[0-9]+.[0-9]+' | head -1)"
 # shellcheck disable=SC2001
 API_VERSION_NUMB="$(echo "$API_VERSION" | sed 's/\.//')"
 LOCAL_API_VERSION_NUMB="$(sudo -u www-data docker version | grep -i "api version" | grep -oP '[0-9]+.[0-9]+' | head -1 | sed 's/\.//')"
diff --git a/php/public/domain-prefill.js b/php/public/domain-prefill.js
deleted file mode 100644
index c81f2231..00000000
--- a/php/public/domain-prefill.js
+++ /dev/null
@@ -1,7 +0,0 @@
-document.addEventListener("DOMContentLoaded", function(event) {
-    // domain
-    let domain = document.getElementById("domain_input");
-    if (domain) {
-        domain.value = window.location.host
-    }
-});
diff --git a/php/templates/containers.twig b/php/templates/containers.twig
index bf03801d..d8fab230 100644
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -20,9 +20,6 @@
 
         {# Add 2nd tab warning #}
         <script type="text/javascript" src="second-tab-warning.js"></script>
-        
-        {# Add domain-prefill #}
-        <script type="text/javascript" src="domain-prefill.js"></script>
 
         {# timezone-prefill #}
         <script type="text/javascript" src="timezone.js"></script>
@@ -106,7 +103,7 @@
                             <b>Please note:</b> The domain validation is disabled so any domain will be accepted here! Make sure you do not make a typo here as you will not be able to change it afterwards!<br><br>
                         {% endif %}
                         <form method="POST" action="/api/configuration" class="xhr">
-                            <input type="text" id="domain_input" name="domain" value="{{ domain }}" placeholder="nextcloud.yourdomain.com"/>
+                            <input type="text" name="domain" value="{{ domain }}" placeholder="nextcloud.yourdomain.com"/>
                             <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
                             <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
                             <input class="button" type="submit" value="Submit domain" />
@@ -211,7 +208,7 @@
             {% endif %}
 
             {% if is_backup_container_running == true %}
-                <span class="status running"></span> Backup container is currently running. (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup" target="_blank" rel="noopener">Logs</a>)<br /><br />
+                <span class="status running"></span> Backup container is currently running: {{ borg_backup_mode }} (<a href="/api/docker/logs?id=nextcloud-aio-borgbackup" target="_blank" rel="noopener">Logs</a>)<br /><br />
                 <a href="" class="button reload">Reload ↻</a><br/><br>
             {% endif %}