From 80f4ffcc179760f0ac6c07a511fc8fc56fb1fb7a Mon Sep 17 00:00:00 2001
From: Tatevik <tatevikg1@gmail.com>
Date: Tue, 5 May 2026 15:47:56 +0400
Subject: [PATCH 1/3] Update plugin installation script

---
 composer.lock              |  8 ++++----
 scripts/install-plugins.sh | 27 +++++++++++++++++++++------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/composer.lock b/composer.lock
index baba3aff5..a104491f6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1061,12 +1061,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpList/phplist-plugin-saml2.git",
-                "reference": "ad8aaa2f5a22f42b3cc50f720de039ddeb6d56f1"
+                "reference": "31c6f67c946ca343af49b9e21036558cf39dc383"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpList/phplist-plugin-saml2/zipball/ad8aaa2f5a22f42b3cc50f720de039ddeb6d56f1",
-                "reference": "ad8aaa2f5a22f42b3cc50f720de039ddeb6d56f1",
+                "url": "https://api.github.com/repos/phpList/phplist-plugin-saml2/zipball/31c6f67c946ca343af49b9e21036558cf39dc383",
+                "reference": "31c6f67c946ca343af49b9e21036558cf39dc383",
                 "shasum": ""
             },
             "require": {
@@ -1092,7 +1092,7 @@
                 "wiki": "http://resources.phplist.com/",
                 "source": "https://github.com/phpList/phpList3"
             },
-            "time": "2025-06-28T09:36:08+00:00"
+            "time": "2026-05-05T11:40:02+00:00"
         },
         {
             "name": "phplist/phplist-plugin-subjectlineplaceholders",
diff --git a/scripts/install-plugins.sh b/scripts/install-plugins.sh
index 4277ae043..490aec7e0 100755
--- a/scripts/install-plugins.sh
+++ b/scripts/install-plugins.sh
@@ -11,9 +11,24 @@ echo $from $to
   apt install -y rsync
 }
 
-for plugin in $(find $from -type d -name phplist-plugin-*); do
-  [[ ! -z "$(ls -A $plugin/plugins/)" ]] && {
-    echo installing plugin $plugin
-    rsync -a $plugin/plugins/* $to
-  }
-done
+while IFS= read -r -d '' plugin; do
+  plugin_name="$(basename "$plugin")"
+
+  [[ -d "$plugin/plugins" ]] || continue
+  [[ -n "$(find "$plugin/plugins" -mindepth 1 -maxdepth 1 -print -quit)" ]] || continue
+
+  echo "Installing plugin: $plugin_name"
+
+  rsync_args=(-a)
+
+  case "$plugin_name" in
+    phplist-plugin-saml2)
+      echo "Preserving SAML2 settings.php"
+
+      rsync_args+=(--exclude='simplesaml/settings.php')
+      ;;
+  esac
+
+  rsync "${rsync_args[@]}" "$plugin/plugins/" "$to/"
+
+done < <(find "$from" -type d -name 'phplist-plugin-*' -print0)

From b0b85261d8c306179ac5ce1715b4c831ca7e41f9 Mon Sep 17 00:00:00 2001
From: Tatevik <tatevikg1@gmail.com>
Date: Wed, 6 May 2026 11:35:09 +0400
Subject: [PATCH 2/3] Let settings file be created if it does not exist

---
 scripts/install-plugins.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/install-plugins.sh b/scripts/install-plugins.sh
index 490aec7e0..fb3fa365f 100755
--- a/scripts/install-plugins.sh
+++ b/scripts/install-plugins.sh
@@ -23,9 +23,14 @@ while IFS= read -r -d '' plugin; do
 
   case "$plugin_name" in
     phplist-plugin-saml2)
-      echo "Preserving SAML2 settings.php"
-
-      rsync_args+=(--exclude='simplesaml/settings.php')
+      settings_file="$to/simplesaml/settings.php"
+
+      if [[ -f "$settings_file" ]]; then
+        echo "Preserving existing SAML2 settings.php"
+        rsync_args+=(--exclude='simplesaml/settings.php')
+      else
+        echo "SAML2 settings.php does not exist, it will be created"
+      fi
       ;;
   esac
 

From 9a3cfe91fd3695abb1a58f60c33322652c092b0d Mon Sep 17 00:00:00 2001
From: Tatevik <tatevikg1@gmail.com>
Date: Wed, 6 May 2026 13:04:32 +0400
Subject: [PATCH 3/3] Update saml with fixed logout version

---
 composer.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index a104491f6..effe384ae 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1061,12 +1061,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpList/phplist-plugin-saml2.git",
-                "reference": "31c6f67c946ca343af49b9e21036558cf39dc383"
+                "reference": "8f1ca9ff9ed0812103126bc0c0b9fe064bb6575d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpList/phplist-plugin-saml2/zipball/31c6f67c946ca343af49b9e21036558cf39dc383",
-                "reference": "31c6f67c946ca343af49b9e21036558cf39dc383",
+                "url": "https://api.github.com/repos/phpList/phplist-plugin-saml2/zipball/8f1ca9ff9ed0812103126bc0c0b9fe064bb6575d",
+                "reference": "8f1ca9ff9ed0812103126bc0c0b9fe064bb6575d",
                 "shasum": ""
             },
             "require": {
@@ -1092,7 +1092,7 @@
                 "wiki": "http://resources.phplist.com/",
                 "source": "https://github.com/phpList/phpList3"
             },
-            "time": "2026-05-05T11:40:02+00:00"
+            "time": "2026-05-06T08:58:48+00:00"
         },
         {
             "name": "phplist/phplist-plugin-subjectlineplaceholders",