move website settings back to settings/

We don't want the settings to become visible when a server is
accidentally configured wrongly.

diff --git a/cmake/website.tmpl b/cmake/website.tmpl
index 8b94658485ac7f7daabc89397a246defffbf7780..268ded39f12284f51a8ae25842f3d3eecca01b0f 100755 (executable)
--- a/cmake/website.tmpl
+++ b/cmake/website.tmpl
@@ -1,5 +1,5 @@
 <?php
 @define('CONST_Debug', (isset($_GET['debug']) && $_GET['debug']));
-require_once(dirname(dirname(__FILE__)).'/website/settings-frontend.php');
+require_once(dirname(dirname(__FILE__)).'/settings/settings-frontend.php');
 
 require_once(CONST_BasePath.'/@script_source@');

diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index 8da0b106c20237438bfecf0ca3598e8cb7d34bb4..cd620902965d81ef25a77239ab9c5112b0e7ddee 100755 (executable)
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@ -701,7 +701,7 @@ class SetupFunctions
      */
     public function setupWebsite()
     {
-        $rOutputFile = fopen(CONST_InstallPath.'/website/settings-frontend.php', 'w');
+        $rOutputFile = fopen(CONST_InstallPath.'/settings/settings-frontend.php', 'w');
 
         fwrite($rOutputFile, "<?php
 @define('CONST_BasePath', '".CONST_BasePath."');