From 3de8e05432da93ac378848cc13f76d533789163c Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Thu, 15 Aug 2024 14:08:58 +0200
Subject: [PATCH 1/3] fix inconsistent PHP error reporting defaults

---
 emhttp/plugins/dynamix/PHPsettings.page | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/emhttp/plugins/dynamix/PHPsettings.page b/emhttp/plugins/dynamix/PHPsettings.page
index 8ae9664fc..803388511 100644
--- a/emhttp/plugins/dynamix/PHPsettings.page
+++ b/emhttp/plugins/dynamix/PHPsettings.page
@@ -28,7 +28,7 @@ if (!file_exists($log)) touch($log);
 :php_settings_plug:
 This utility is used for development purposes only and allows Plugin Authors to verify their PHP code by enabling different levels of PHP error reporting.
 
-By default error logging is minimum and any errors are shown on screen. Changing the **Error reporting level** will capture the selected level of errors
+By default error logging is minimum and errors are not shown on screen. Changing the **Error reporting level** will capture the selected level of errors
 into a LOG file, which can be opened in a separate window to monitor in real-time the events when visiting various GUI pages or executing background
 processes on the server.
 
@@ -46,7 +46,7 @@ under normal running conditions.
 <input type="hidden" name="log_errors" value="1">
 _(Error reporting level)_:
 : <select name="error_reporting" onchange="toggleScreen(this.selectedIndex)">
-  <?=mk_option(_var($conf,'error_reporting'), "", "_(Default)_");?>
+  <?=mk_option(_var($conf,'error_reporting'), "E_ALL & ~E_NOTICE & ~E_WARNING & ~E_DEPRECATED", "_(Default)_");?>
   <?=mk_option(_var($conf,'error_reporting'), "32767", "_(All Categories)_");?>
   <?=mk_option(_var($conf,'error_reporting'), "1", "_(Errors Only)_");?>
   <?=mk_option(_var($conf,'error_reporting'), "2", "_(Warnings Only)_");?>
@@ -147,11 +147,12 @@ function PHPinfo() {
 }
 function preset(form) {
   // reset to default settings
+  // derived from default .ini file installed at boot
   if (form.error_reporting.selectedIndex==0) {
-    form.error_log.value = "";
-    form.display_startup_errors.value = "";
-    form.display_errors.value = "";
-    form.log_errors.value = "";
+    form.error_log.value = "<?=$log?>";
+    form.display_startup_errors.value = "0";
+    form.display_errors.value = "0";
+    form.log_errors.value = "1";
   }
   $.cookie('reload_php',1);
 }

From 31f81349a890c74c65355b29d167e6418cfcf2ca Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Thu, 15 Aug 2024 16:29:45 +0200
Subject: [PATCH 2/3] sanitize PHP setting constants for update.php

update.php encapsulates the PHP constants used by the OS default PHP error reporting level with double quotes, which breaks functionality as they are then treated as text. by turning the PHP constants into strings first this problem is avoided.
---
 emhttp/plugins/dynamix/PHPsettings.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/PHPsettings.page b/emhttp/plugins/dynamix/PHPsettings.page
index 803388511..83cd215b1 100644
--- a/emhttp/plugins/dynamix/PHPsettings.page
+++ b/emhttp/plugins/dynamix/PHPsettings.page
@@ -46,7 +46,7 @@ under normal running conditions.
 <input type="hidden" name="log_errors" value="1">
 _(Error reporting level)_:
 : <select name="error_reporting" onchange="toggleScreen(this.selectedIndex)">
-  <?=mk_option(_var($conf,'error_reporting'), "E_ALL & ~E_NOTICE & ~E_WARNING & ~E_DEPRECATED", "_(Default)_");?>
+  <?=mk_option(_var($conf,'error_reporting'), strval(E_ALL & ~E_NOTICE & ~E_WARNING & ~E_DEPRECATED), "_(Default)_");?>
   <?=mk_option(_var($conf,'error_reporting'), "32767", "_(All Categories)_");?>
   <?=mk_option(_var($conf,'error_reporting'), "1", "_(Errors Only)_");?>
   <?=mk_option(_var($conf,'error_reporting'), "2", "_(Warnings Only)_");?>

From 8d9e2a04c0a33cb13f8edf622ac0ee6852e8f196 Mon Sep 17 00:00:00 2001
From: desertwitch <24509509+desertwitch@users.noreply.github.com>
Date: Thu, 15 Aug 2024 16:49:32 +0200
Subject: [PATCH 3/3] PHP constants for better read-/maintainability

---
 emhttp/plugins/dynamix/PHPsettings.page | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/emhttp/plugins/dynamix/PHPsettings.page b/emhttp/plugins/dynamix/PHPsettings.page
index 83cd215b1..ccf4c70d4 100644
--- a/emhttp/plugins/dynamix/PHPsettings.page
+++ b/emhttp/plugins/dynamix/PHPsettings.page
@@ -47,11 +47,11 @@ under normal running conditions.
 _(Error reporting level)_:
 : <select name="error_reporting" onchange="toggleScreen(this.selectedIndex)">
   <?=mk_option(_var($conf,'error_reporting'), strval(E_ALL & ~E_NOTICE & ~E_WARNING & ~E_DEPRECATED), "_(Default)_");?>
-  <?=mk_option(_var($conf,'error_reporting'), "32767", "_(All Categories)_");?>
-  <?=mk_option(_var($conf,'error_reporting'), "1", "_(Errors Only)_");?>
-  <?=mk_option(_var($conf,'error_reporting'), "2", "_(Warnings Only)_");?>
-  <?=mk_option(_var($conf,'error_reporting'), "8", "_(Notices Only)_");?>
-  <?=mk_option(_var($conf,'error_reporting'), "8192", "_(Deprecated Only)_");?>
+  <?=mk_option(_var($conf,'error_reporting'), strval(E_ALL), "_(All Categories)_");?>
+  <?=mk_option(_var($conf,'error_reporting'), strval(E_ERROR), "_(Errors Only)_");?>
+  <?=mk_option(_var($conf,'error_reporting'), strval(E_WARNING), "_(Warnings Only)_");?>
+  <?=mk_option(_var($conf,'error_reporting'), strval(E_NOTICE), "_(Notices Only)_");?>
+  <?=mk_option(_var($conf,'error_reporting'), strval(E_DEPRECATED), "_(Deprecated Only)_");?>
   </select>
 
 &nbsp;