Merge branch '2024.11'

Author: gitlabci

scripts/ansible/roles/tinedockercompose/defaults/main.yml

@@ -39,6 +39,7 @@ tinedockercompose_documentserver: false
 tinedockercompose_documentserver_version: "latest"
 tinedockercompose_documentserver_secret: "change_me_also_define_in_tine_cfg"
 tinedockercompose_documentserver_publicurl: "http://localhost:4020/"
+tinedockercompose_documentserver_serverurl: true
 
 tinedockercompose_redis_version: "6.0.16"
 

scripts/ansible/roles/tinedockercompose/tasks/filedeploy.yml

@@ -91,7 +91,7 @@
 
 - name: configure edocument
   template:
-    src: broadcasthub.inc.php.j2
+    src: edocument.inc.php.j2
     dest: "{{ tinedockercompose_confd_path }}/edocument.inc.php"
     owner: tine20
     group: root

scripts/ansible/roles/tinedockercompose/templates/ooi.inc.php.j2

@@ -2,8 +2,10 @@
 return [
     'OnlyOfficeIntegrator' => [
         'onlyOfficePublicUrl' => '{{ tinedockercompose_documentserver_publicurl }}',
+{% if tinedockercompose_documentserver_serverurl|bool %}
         'onlyOfficeServerUrl' => 'http://documentserver/',
         'tine20ServerUrl' => 'http://web/',
+{% endif %}
         'jwtEnabled' => true,
         'jwtSecret' => '{{ tinedockercompose_documentserver_secret }}',
     ],

tine20/Courses/Import/DivisCourses.php

@@ -857,7 +857,12 @@ protected function _skipAccount(Tinebase_Model_FullUser $account): bool
 
     protected function _getLehrerUserName(array $raw): string
     {
-        return strtolower(substr($raw[0], 0, 1) . '.' . $raw[1]);
+        $tmp = new Tinebase_Model_FullUser([
+            'accountFirstName' => $raw[0],
+            'accountLastName' => $raw[1],
+        ], true);
+        $tmp->applyTwigTemplates();
+        return $tmp->shortenUsername();
     }
 
     protected function _getRawData(&$_resource)