From f0585f18c2050ea255fe292055d2a49dbbef2be1 Mon Sep 17 00:00:00 2001
From: "o.pinke" <o.pinke@conlite.org>
Date: Fri, 11 Mar 2022 18:33:58 +0100
Subject: [PATCH] fix #1 - saving of config files

---
 .../controller/class.modrewrite_content_controller.php | 10 +++++-----
 includes/functions.mod_rewrite.php                     |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/classes/controller/class.modrewrite_content_controller.php b/classes/controller/class.modrewrite_content_controller.php
index 9aeaefb..a26b415 100644
--- a/classes/controller/class.modrewrite_content_controller.php
+++ b/classes/controller/class.modrewrite_content_controller.php
@@ -69,15 +69,15 @@ class ModRewrite_ContentController extends ModRewrite_ControllerAbstract {
 
                 if (mr_arrayValue($request, 'checkrootdir') == 1) {
                     // root dir check is enabled, this results in error
-                    $sMsg = i18n("The specified directory '%s' does not exists", "cl-mod-rewrite");
-                    $sMsg = sprintf($sMsg, $_SERVER['DOCUMENT_ROOT'] . $request['rootdir']);
+                    $sMsgTpl = i18n("The specified directory '%s' does not exists", "cl-mod-rewrite");
+                    $sMsg = sprintf($sMsgTpl, $_SERVER['DOCUMENT_ROOT'] . $request['rootdir']);
                     $this->_oView->rootdir_error = $this->_notifyBox('error', $sMsg);
                     $bError = true;
                 } else {
                     // root dir check ist disabled, take over the setting and
                     // output a warning.
-                    $sMsg = i18n("The specified directory '%s' does not exists in DOCUMENT_ROOT '%s'. This could happen, if clients DOCUMENT_ROOT differs from CONTENIDO backends DOCUMENT_ROOT. However, the setting will be taken over because of disabled check.", "cl-mod-rewrite");
-                    $sMsg = sprintf($sMsg, $request['rootdir'], $_SERVER['DOCUMENT_ROOT']);
+                    $sMsgTpl = i18n("The specified directory '%s' does not exists in DOCUMENT_ROOT '%s'. This could happen, if clients DOCUMENT_ROOT differs from CONTENIDO backends DOCUMENT_ROOT. However, the setting will be taken over because of disabled check.", "cl-mod-rewrite");
+                    $sMsg = sprintf($sMsgTpl, $request['rootdir'], $_SERVER['DOCUMENT_ROOT']);
                     $this->_oView->rootdir_error = $this->_notifyBox('warning', $sMsg);
                 }
             }
@@ -377,7 +377,7 @@ class ModRewrite_ContentController extends ModRewrite_ControllerAbstract {
             $this->_oView->content_before .= $this->_notifyBox('info', $sMsg);
         } else {
             $sMsg = i18n("Configuration could not saved. Please check write permissions for %s ", "cl-mod-rewrite");
-            $sMsg = sprintf($sMsg, $options['key']);
+            $sMsg = sprintf($sMsg, mr_getConfigurationFilePath($this->_client));
             $this->_oView->content_before .= $this->_notifyBox('error', $sMsg);
         }
     }
diff --git a/includes/functions.mod_rewrite.php b/includes/functions.mod_rewrite.php
index 274f85b..e007994 100644
--- a/includes/functions.mod_rewrite.php
+++ b/includes/functions.mod_rewrite.php
@@ -688,12 +688,12 @@ function mr_setConfiguration($clientId, array $config) {
      
      if(file_exists($sConfigClientPath) && is_writable($sConfigClientPath)) {
          $file = $sConfigClientPath. 'config.mod_rewrite.php';
-     } else {
+     } else {         
          $file = cRegistry::getConfigValue('path', 'contenido') . cRegistry::getConfigValue('path', 'plugins') . 'cl-mod-rewrite/includes/config.mod_rewrite_' . cRegistry::getClientId() . '.php';
      }
      
     $result = file_put_contents($file, serialize($config));
-    return ($result) ? true : false;
+    return (empty($result)) ? false : true;
 }
 
 /**