From f9309c706d5752e186e4d22cebff8fae1e5d9f71 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Thu, 29 Oct 2020 10:28:58 +0100
Subject: [PATCH] FEAT #13671 TIME 0:25 use config.json.default in installer
---
.../maarch_entreprise/xml/config.json.default | 2 +-
src/core/controllers/InstallerController.php | 40 +++++++++----------
2 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/apps/maarch_entreprise/xml/config.json.default b/apps/maarch_entreprise/xml/config.json.default
index a9a3cb28953..d12029594e8 100644
--- a/apps/maarch_entreprise/xml/config.json.default
+++ b/apps/maarch_entreprise/xml/config.json.default
@@ -7,7 +7,7 @@
"maarchDirectory" : "/var/www/html/MaarchCourrier/",
"customID" : "",
"maarchUrl" : "http://preview.maarchcourrier.com/",
- "lockAdvancedPrivileges" : false
+ "lockAdvancedPrivileges" : true
},
"database": [
{
diff --git a/src/core/controllers/InstallerController.php b/src/core/controllers/InstallerController.php
index d2dc17ee9f1..5575497fcd1 100644
--- a/src/core/controllers/InstallerController.php
+++ b/src/core/controllers/InstallerController.php
@@ -51,16 +51,16 @@ class InstallerController
$netcatOrNmap = !empty($outputNetcat[1]) || !empty($outputNmap[1]);
$pdoPgsql = @extension_loaded('pdo_pgsql');
- $pgsql = @extension_loaded('pgsql');
+ $pgsql = @extension_loaded('pgsql');
$mbstring = @extension_loaded('mbstring');
$fileinfo = @extension_loaded('fileinfo');
- $gd = @extension_loaded('gd');
- $imagick = @extension_loaded('imagick');
- $gettext = @extension_loaded('gettext');
- $curl = @extension_loaded('curl');
- $zip = @extension_loaded('zip');
- $json = @extension_loaded('json');
- $xml = @extension_loaded('xml');
+ $gd = @extension_loaded('gd');
+ $imagick = @extension_loaded('imagick');
+ $gettext = @extension_loaded('gettext');
+ $curl = @extension_loaded('curl');
+ $zip = @extension_loaded('zip');
+ $json = @extension_loaded('json');
+ $xml = @extension_loaded('xml');
$writable = is_writable('.') && is_readable('.');
@@ -306,20 +306,18 @@ class InstallerController
fwrite($fp, json_encode($customFile, JSON_PRETTY_PRINT));
fclose($fp);
- $jsonFile = [
- 'config' => [
- 'lang' => $body['lang'] ?? 'fr',
- 'applicationName' => $body['applicationName'] ?? $body['customId'],
- 'cookieTime' => 10080,
- 'timezone' => 'Europe/Paris',
- 'maarchDirectory' => realpath('.') . '/',
- 'customID' => $body['customId'],
- 'maarchUrl' => ''
- ],
- 'database' => []
- ];
+ $config = file_get_contents('apps/maarch_entreprise/xml/config.json.default');
+ $config = json_decode($config, true);
+ $config['config']['lang'] = $body['lang'] ?? 'fr';
+ $config['config']['applicationName'] = $body['applicationName'] ?? $body['customId'];
+ $config['config']['cookieTime'] = 10080;
+ $config['config']['timezone'] = 'Europe/Paris';
+ $config['config']['maarchDirectory'] = realpath('.') . '/';
+ $config['config']['customID'] = $body['customId'];
+ $config['config']['maarchUrl'] = '';
+
$fp = fopen("custom/{$body['customId']}/apps/maarch_entreprise/xml/config.json", 'w');
- fwrite($fp, json_encode($jsonFile, JSON_PRETTY_PRINT));
+ fwrite($fp, json_encode($config, JSON_PRETTY_PRINT));
fclose($fp);
$cmd = 'ln -s ' . realpath('.') . "/ {$body['customId']}";
--
GitLab