Jeremy Newman : set a session server config option

[Jeremy Newman]

Module: appdb
Branch: master
Commit: 32461dd89cb8b52673085dc6a5e22e42b54f326f
URL:    https://source.winehq.org/git/appdb.git/?a=commit;h=32461dd89cb8b52673085dc6a5e22e42b54f326f

Author: Jeremy Newman <jnewman at codeweavers.com>
Date:   Tue Sep 21 10:45:46 2021 -0500

set a session server config option

---

 include/config.php.sample | 4 ++++
 include/incl.php          | 2 +-
 include/session.php       | 8 ++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/include/config.php.sample b/include/config.php.sample
index 8e1408b..f75d6d8 100644
--- a/include/config.php.sample
+++ b/include/config.php.sample
@@ -37,6 +37,10 @@ define("RECAPTCHA_SECRET","");
 // How old (days) a test report has to before it is judged to be aged
 define("TESTDATA_AGED_THRESHOLD", 175);
 
+/*
+ * session server (redis url)
+ */
+define("APPDB_SESSION_SERVER", "tcp://127.0.0.1:6379?&database=2");
 
 /*
  * apps database info
diff --git a/include/incl.php b/include/incl.php
index fe38923..777b5f8 100644
--- a/include/incl.php
+++ b/include/incl.php
@@ -44,7 +44,7 @@ $_APPDB_debugLog = "";
  * Init Session (stores user info in session)
  */
 
-$session = new session("whq_appdb");
+$session = new session("whq_appdb", APPDB_SESSION_SERVER);
 $session->register("current");
 if(!isset($_SESSION['current']))
 {
diff --git a/include/session.php b/include/session.php
index db6da24..06c6a22 100644
--- a/include/session.php
+++ b/include/session.php
@@ -13,11 +13,15 @@ class session
     public $msg;
 
     // create session object
-    public function __construct ($name, $server = "127.0.0.1", $expire = 30)
+    public function __construct ($name, $server = "", $expire = 30)
     {
         // set name for this session
         $this->name = $name;
 
+        // require server setting
+        if (empty($server))
+            trigger_error("No Session Server Defined!", E_USER_ERROR);
+
         // define options for sessions
         ini_set('session.name', $this->name);
         ini_set('session.use_cookies', true);
@@ -25,7 +29,7 @@ class session
 
         // use memcached
         ini_set('session.save_handler', 'redis');
-        ini_set('session.save_path', "tcp://{$server}:6379?&database=2");
+        ini_set('session.save_path', "{$server}");
 
         // default lifetime on session cookie expiration (default 30 days)
         ini_set('session.gc_maxlifetime', (60 * 60 * 24 * $expire));