From 066b15bf2f87ea2738cd57a9715f126087d102cd Mon Sep 17 00:00:00 2001
From: Mark W <24956497+ndg63276@users.noreply.github.com>
Date: Mon, 25 Sep 2023 16:17:41 +0100
Subject: [PATCH] LIMS-743: Get MOTD from database (#611)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
---
 api/index.php       | 8 +++++++-
 api/src/Options.php | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/api/index.php b/api/index.php
index c95874ef7..45435ea84 100644
--- a/api/index.php
+++ b/api/index.php
@@ -24,6 +24,7 @@
 use SynchWeb\Database\DatabaseParent;
 use SynchWeb\ImagingShared;
 use SynchWeb\Dispatch;
+use SynchWeb\Options;
 
 require 'vendor/autoload.php';
 
@@ -71,8 +72,9 @@ function setupApplication($mode): Slim
             $dhl_enable, $dhl_link, $scale_grid, $scale_grid_end_date, $preset_proposal, $timezone,
             $valid_components, $enabled_container_types, $ifsummary;
         $app->contentType('application/json');
+        $options = $app->container['options'];
         $app->response()->body(json_encode(array(
-            'motd' => $motd,
+            'motd' => $options->get('motd', $motd),
             'authentication_type' => $authentication_type,
             'cas_url' => $cas_url,
             'cas_sso' => $cas_sso,
@@ -145,4 +147,8 @@ function setupDependencyInjectionContainer($app)
     $app->container->singleton('dispatch', function () use ($app) {
         return new Dispatch($app, $app->container['db'], $app->container['user']);
     });
+
+    $app->container->singleton('options', function () use ($app) {
+        return new Options($app->container['db']);
+    });
 }
diff --git a/api/src/Options.php b/api/src/Options.php
index 895787617..750c3c460 100644
--- a/api/src/Options.php
+++ b/api/src/Options.php
@@ -21,7 +21,7 @@ private function _retrieve() {
 
             $this->options = array();
             foreach ($options as $o) {
-                $this->options[$o['NAME']] = unserialize($o['VALUE']);
+                $this->options[$o['NAME']] = $o['VALUE'];
                 if ($o['UI'] == 1) $this->public[$o['NAME']] = $this->options[$o['NAME']];
 
             }