From 86acea61b18ae3cb3ef6c28d8edd080a34539f56 Mon Sep 17 00:00:00 2001
From: Laria Carolin Chabowski <laria@laria.me>
Date: Tue, 28 Apr 2020 19:39:11 +0200
Subject: Format config generation code

---
 ratatoeskr/setup/setup.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'ratatoeskr')

diff --git a/ratatoeskr/setup/setup.php b/ratatoeskr/setup/setup.php
index a5ebba2..3e3be9c 100644
--- a/ratatoeskr/setup/setup.php
+++ b/ratatoeskr/setup/setup.php
@@ -234,8 +234,17 @@ STYLE;
             }
 
             /* Almost done. Give the user the config file. */
-            $config = "<?php\n\ndefine(\"__DEBUG__\", False);\ndefine(\"CONFIG_FILLED_OUT\", True);\ndefine(\"PLUGINS_ENABLED\", True);\n\n\$config[\"mysql\"][\"server\"] = '" . addcslashes($config["mysql"]["server"], "'") . "';\n\$config[\"mysql\"][\"db\"]     = '" . addcslashes($config["mysql"]["db"], "'") . "';\n\$config[\"mysql\"][\"user\"]   = '" . addcslashes($config["mysql"]["user"], "'") . "';\n\$config[\"mysql\"][\"passwd\"] = '" . addcslashes($config["mysql"]["passwd"], "'") . "';\n\$config[\"mysql\"][\"prefix\"] = '" . addcslashes($config["mysql"]["prefix"], "'") . "';\n\n?>";
-            $ste->vars["config"] = $config;
+            $ste->vars["config"] = "<?php\n"
+                . "\n"
+                . "define(\"__DEBUG__\", false);\n"
+                . "define(\"CONFIG_FILLED_OUT\", true);\n"
+                . "define(\"PLUGINS_ENABLED\", true);\n"
+                . "\n"
+                . "\$config[\"mysql\"][\"server\"] = '" . addcslashes($config["mysql"]["server"], "'") . "';\n"
+                . "\$config[\"mysql\"][\"db\"]     = '" . addcslashes($config["mysql"]["db"], "'") . "';\n"
+                . "\$config[\"mysql\"][\"user\"]   = '" . addcslashes($config["mysql"]["user"], "'") . "';\n"
+                . "\$config[\"mysql\"][\"passwd\"] = '" . addcslashes($config["mysql"]["passwd"], "'") . "';\n"
+                . "\$config[\"mysql\"][\"prefix\"] = '" . addcslashes($config["mysql"]["prefix"], "'") . "';";
             die($ste->exectemplate("/systemtemplates/setup_done.html"));
         } catch (MySQLException $e) {
             $ste->vars["error"] = $e->getMessage();
-- 
cgit v1.2.3-54-g00ecf