From d4e8617eef86080d5d77ee41beb6c26cfcfd65d7 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 26 Oct 2023 18:17:44 +0200
Subject: [PATCH] Use "null coalescing assignment" operator for $docroot

---
 .../dynamix.plugin.manager/post-hooks/post_plugin_checks    | 2 +-
 .../dynamix.plugin.manager/pre-hooks/pre_plugin_checks      | 2 +-
 emhttp/plugins/dynamix/include/LanguageReset.php            | 6 +++---
 emhttp/plugins/gui.search/exec.php                          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/emhttp/plugins/dynamix.plugin.manager/post-hooks/post_plugin_checks b/emhttp/plugins/dynamix.plugin.manager/post-hooks/post_plugin_checks
index 272a30b3f..d681d3df3 100755
--- a/emhttp/plugins/dynamix.plugin.manager/post-hooks/post_plugin_checks
+++ b/emhttp/plugins/dynamix.plugin.manager/post-hooks/post_plugin_checks
@@ -12,7 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: "/usr/local/emhttp";
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php";
 
 function readJson($file) {
diff --git a/emhttp/plugins/dynamix.plugin.manager/pre-hooks/pre_plugin_checks b/emhttp/plugins/dynamix.plugin.manager/pre-hooks/pre_plugin_checks
index 78f266f47..de0ffc911 100755
--- a/emhttp/plugins/dynamix.plugin.manager/pre-hooks/pre_plugin_checks
+++ b/emhttp/plugins/dynamix.plugin.manager/pre-hooks/pre_plugin_checks
@@ -12,7 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: "/usr/local/emhttp";
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php";
 
 $type    = $argv[1]??'';   // plugin or language
diff --git a/emhttp/plugins/dynamix/include/LanguageReset.php b/emhttp/plugins/dynamix/include/LanguageReset.php
index 1a7953986..e75132c97 100644
--- a/emhttp/plugins/dynamix/include/LanguageReset.php
+++ b/emhttp/plugins/dynamix/include/LanguageReset.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: "/usr/local/emhttp";
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 
 $lang = $_POST['lang'] ?? '';
 $file = '/boot/config/plugins/dynamix/dynamix.cfg';
diff --git a/emhttp/plugins/gui.search/exec.php b/emhttp/plugins/gui.search/exec.php
index 588f66fb6..afa70a118 100755
--- a/emhttp/plugins/gui.search/exec.php
+++ b/emhttp/plugins/gui.search/exec.php
@@ -29,7 +29,7 @@ if ( $locale ) {
 	}
 }
 
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: "/usr/local/emhttp";
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 
 $_SERVER['REQUEST_URI'] = $uri;
 $_SESSION['locale'] = $locale;