From 627aa045ed0701781bda2a161de2bcddc94afa85 Mon Sep 17 00:00:00 2001
From: Linty <lintydev@gmail.com>
Date: Fri, 20 Dec 2024 10:45:36 +0100
Subject: [PATCH] fixes #2296 include the correct class file depending on the
 version of php

---
 include/functions_session.inc.php | 44 ++++++++-----------------------
 include/pwgsession.class.php      | 33 +++++++++++++++++++++++
 include/pwgsession_php7.class.php | 34 ++++++++++++++++++++++++
 3 files changed, 78 insertions(+), 33 deletions(-)
 create mode 100644 include/pwgsession.class.php
 create mode 100644 include/pwgsession_php7.class.php

diff --git a/include/functions_session.inc.php b/include/functions_session.inc.php
index 6093abca8..afa52b36f 100644
--- a/include/functions_session.inc.php
+++ b/include/functions_session.inc.php
@@ -10,39 +10,6 @@
  * @package functions\session
  */
 
- // see https://php.watch/versions/8.4/session_set_save_handler-alt-signature-deprecated
- class PwgSession implements SessionHandlerInterface {
-  public function open(string $path, string $name): bool
-  {
-    return pwg_session_open($path, $name);
-  }
-
-  public function close(): bool
-  {
-    return pwg_session_close();
-  }
-
-  public function read(string $id): string
-  {
-    return pwg_session_read($id);
-  }
-
-  public function write(string $id, string $data): bool
-  {
-    return pwg_session_write($id, $data);
-  }
-
-  public function destroy(string $id): bool
-  {
-    return pwg_session_destroy($id);
-  }
-
-  public function gc(int $max_lifetime): int
-  {
-    return pwg_session_gc();
-  }
-}
-
 if (isset($conf['session_save_handler'])
   and ($conf['session_save_handler'] == 'db')
   and defined('PHPWG_INSTALLED'))
@@ -50,6 +17,17 @@ if (isset($conf['session_save_handler'])
   // In PHP 8.4+ calling session_set_save_handler with
   // two parameters is deprecated. To correct this, 
   // we pass a SessionHandlerInterface instance.
+  // https://github.com/Piwigo/Piwigo/issues/2296
+  // Depending on the PHP version, we include the appropriate
+  // session handler class file. 
+  if (version_compare(PHP_VERSION, '8.0.0') < 0)
+  {
+    include_once(PHPWG_ROOT_PATH.'/include/pwgsession_php7.class.php');
+  }
+  else
+  {
+    include_once(PHPWG_ROOT_PATH.'/include/pwgsession.class.php');
+  }
   session_set_save_handler(new PwgSession());
 
   if (function_exists('ini_set'))
diff --git a/include/pwgsession.class.php b/include/pwgsession.class.php
new file mode 100644
index 000000000..4aac9612c
--- /dev/null
+++ b/include/pwgsession.class.php
@@ -0,0 +1,33 @@
+<?php
+// see https://php.watch/versions/8.4/session_set_save_handler-alt-signature-deprecated
+class PwgSession implements SessionHandlerInterface {
+  public function open(string $path, string $name): bool
+  {
+    return pwg_session_open($path, $name);
+  }
+
+  public function close(): bool
+  {
+    return pwg_session_close();
+  }
+
+  public function read(string $id): string
+  {
+    return pwg_session_read($id);
+  }
+
+  public function write(string $id, string $data): bool
+  {
+    return pwg_session_write($id, $data);
+  }
+
+  public function destroy(string $id): bool
+  {
+    return pwg_session_destroy($id);
+  }
+
+  public function gc(int $max_lifetime): int
+  {
+    return pwg_session_gc();
+  }
+}
\ No newline at end of file
diff --git a/include/pwgsession_php7.class.php b/include/pwgsession_php7.class.php
new file mode 100644
index 000000000..530144802
--- /dev/null
+++ b/include/pwgsession_php7.class.php
@@ -0,0 +1,34 @@
+<?php
+// see https://php.watch/versions/8.4/session_set_save_handler-alt-signature-deprecated
+// https://github.com/Piwigo/Piwigo/issues/2296
+class PwgSession implements SessionHandlerInterface {
+  public function open($path, $name)
+  {
+    return pwg_session_open($path, $name);
+  }
+
+  public function close()
+  {
+    return pwg_session_close();
+  }
+
+  public function read($id)
+  {
+    return pwg_session_read($id);
+  }
+
+  public function write($id, $data)
+  {
+    return pwg_session_write($id, $data);
+  }
+
+  public function destroy($id)
+  {
+    return pwg_session_destroy($id);
+  }
+
+  public function gc($max_lifetime)
+  {
+    return pwg_session_gc();
+  }
+}
\ No newline at end of file