From 2bbc4af06898de527516f701ce9f3738d23fb1f4 Mon Sep 17 00:00:00 2001
From: Yasen Pramatarov <yasen@lindeas.com>
Date: Mon, 19 Aug 2024 13:42:16 +0300
Subject: [PATCH] Fixes error handling

---
 app/config/jilo-web.conf.php |  2 +-
 app/pages/config.php         | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/config/jilo-web.conf.php b/app/config/jilo-web.conf.php
index a5dfd11..2a0c975 100644
--- a/app/config/jilo-web.conf.php
+++ b/app/config/jilo-web.conf.php
@@ -29,7 +29,7 @@ return [
     // system info
     'version'			=> '0.1.1',
     // development has verbose error messages, production has not
-    'environment'		=> 'production1',
+    'environment'		=> 'production',
 
     // *************************************
     // Maintained by the app, edit with care
diff --git a/app/pages/config.php b/app/pages/config.php
index 02e2212..f772edc 100644
--- a/app/pages/config.php
+++ b/app/pages/config.php
@@ -1,6 +1,7 @@
 <?php
 
 $action = $_REQUEST['action'] ?? '';
+require '../app/helpers/errors.php';
 
 // if a form is submitted, it's from the edit page
 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -20,13 +21,23 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
         $updatedContent = preg_replace($oldValue, $newValue, $updatedContent);
     }
 
+    // check if file is writable
+    if (!is_writable($config_file)) {
+        $_SESSION['error'] = getError('Configuration file is not writable.');
+        header("Location: $app_root?platform=$platform_id&page=config");
+        exit();
+    }
+
+    // try to update the config file
     if (file_put_contents($config_file, $updatedContent) !== false) {
         // update successful
         $_SESSION['notice'] = "Configuration for {$_POST['name']} is updated.";
     } else {
         // unsuccessful
-        $_SESSION['error'] = 'Error updating the config';
+        $error = error_get_last();
+        $_SESSION['error'] = getError('Error updating the config: ' . ($error['message'] ?? 'unknown error'));
     }
+
 // FIXME the new file is not loaded on first page load
     unset($config);
     header("Location: $app_root?platform=$platform_id&page=config");