fix remaining rename of collabora to Nextcloud Office

Signed-off-by: Simon L. <szaimen@e.mail.de>

Containers/docker-socket-proxy/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:latest
-FROM haproxy:3.3.1-alpine
+FROM haproxy:3.3.2-alpine
 
 # hadolint ignore=DL3002
 USER root

Containers/whiteboard/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:latest
 # Probably from this file: https://github.com/nextcloud/whiteboard/blob/main/Dockerfile
-FROM ghcr.io/nextcloud-releases/whiteboard:v1.5.3
+FROM ghcr.io/nextcloud-releases/whiteboard:v1.5.4
 
 USER root
 RUN set -ex; \

php/src/Data/ConfigurationManager.php

@@ -263,11 +263,6 @@ class ConfigurationManager
         set { $this->set('collabora_seccomp_disabled', $value); }
     }
 
-    public string $apacheAdditionalNetwork {
-        get => $this->getEnvironmentalVariableOrConfig('APACHE_ADDITIONAL_NETWORK', 'apache_additional_network', '');
-        set { $this->set('apache_additional_network', $value); }
-    }
-
     public bool $disableBackupSection {
         get => $this->booleanize($this->getEnvironmentalVariableOrConfig('AIO_DISABLE_BACKUP_SECTION', 'disable_backup_section', ''));
         set { $this->set('disable_backup_section', $value); }
@@ -854,6 +849,14 @@ class ConfigurationManager
         return false;
     }
 
+    public function getApacheAdditionalNetwork() : string {
+        $network = getenv('APACHE_ADDITIONAL_NETWORK');
+        if (is_string($network)) {
+            return trim($network);
+        }
+        return '';
+    }
+
     public function getNextcloudStartupApps() : string {
         $apps = getenv('NEXTCLOUD_STARTUP_APPS');
         if (is_string($apps)) {

php/src/Docker/DockerActionManager.php

@@ -843,7 +843,7 @@ readonly class DockerActionManager {
         $this->ConnectContainerIdToNetwork($container->identifier, $container->internalPorts, alias: $alias);
 
         if ($container->identifier === 'nextcloud-aio-apache' || $container->identifier === 'nextcloud-aio-domaincheck') {
-            $apacheAdditionalNetwork = $this->configurationManager->apacheAdditionalNetwork;
+            $apacheAdditionalNetwork = $this->configurationManager->getApacheAdditionalNetwork();
             if ($apacheAdditionalNetwork !== '') {
                 $this->ConnectContainerIdToNetwork($container->identifier, $container->internalPorts, $apacheAdditionalNetwork, false, $alias);
             }

php/templates/includes/optional-containers.twig

@@ -236,7 +236,7 @@
             <input type="text" name="collabora_dictionaries" placeholder="de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru" />
             <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
             <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
-            <input type="submit" value="Submit collabora dictionaries" />
+            <input type="submit" value="Submit Nextcloud Office dictionaries" />
         </form>
         <p>You need to make sure that the dictionaries that you enter are valid. An example is <strong>de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru</strong>.</p>
     {% else %}