Merge pull request #3863 from laurentj/notification-sender

[internal] support of new config parameter notificationReceiverEmail
3liz · Aug 31, 2023 · 3edd47e · 3edd47e
2 parents 62bb8d0 + d85390e
commit 3edd47e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/lizmap/modules/lizmap/classes/lizmapServices.class.php b/lizmap/modules/lizmap/classes/lizmapServices.class.php
@@ -437,8 +437,12 @@ public function saveIntoIni($ini, $liveIni)
                 $liveIni->setValue($key, $this->{$prop}, $section);
             } elseif ($this->{$prop} != '') {
                 $ini->setValue($prop, $this->{$prop}, 'services');
-                if ($prop == 'adminContactEmail' && $this->globalConfig->lizmap['setAdminContactEmailAsReplyTo']) {
-                    $liveIni->setValue('replyTo', $this->{$prop}, 'mailer');
+                if ($prop == 'adminContactEmail') {
+                    if ($this->globalConfig->lizmap['setAdminContactEmailAsReplyTo']) {
+                        $liveIni->setValue('replyTo', $this->{$prop}, 'mailer');
+                    }
+                    // for jCommunity 1.4+
+                    $liveIni->setValue('notificationReceiverEmail', $this->{$prop}, 'jcommunity');
                 }
             } else {
                 $ini->removeValue($prop, 'services');

diff --git a/lizmap/modules/lizmap/install/upgrade_commconfig.php b/lizmap/modules/lizmap/install/upgrade_commconfig.php
@@ -0,0 +1,26 @@
+<?php
+
+class lizmapModuleUpgrader_commconfig extends jInstallerModule
+{
+    public $targetVersions = array(
+        '3.7.0-alpha.3',
+        '3.6.6',
+    );
+
+    public $date = '2023-08-31';
+
+    public function install()
+    {
+        // copy the value of adminContactEmail into the config parameter notificationReceiverEmail
+        // for jCommunity 1.4+
+        $liveIni = new \Jelix\IniFile\IniModifier(jApp::varConfigPath('liveconfig.ini.php'));
+        $currentValue = $liveIni->getValue('notificationReceiverEmail', 'jcommunity');
+        if (!$currentValue) {
+            $lizmapConfFile = jApp::varConfigPath('lizmapConfig.ini.php');
+            $ini = new \Jelix\IniFile\IniModifier($lizmapConfFile);
+            $contact = $ini->getValue('adminContactEmail', 'services');
+            $liveIni->setValue('notificationReceiverEmail', $contact, 'jcommunity');
+            $liveIni->save();
+        }
+    }
+}