Galleries/PHPGallery
1
0
Fork 0
mirror of https://github.com/Fluffy-Bean/image-gallery.git synced 2025-06-13 21:53:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing problems caused with conf.json

Browse source 
Adding to upcoming autofix feature
This commit is contained in:
Michał Gdula 2022-11-01 17:34:24 +00:00
parent 37e1db5b7b
commit 05533395eb
4 changed files with 66 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/settings.php
View file

@ -8,22 +8,15 @@
| the default background and accent colour
|-------------------------------------------------------------
*/
$user_settings = json_decode(file_get_contents(__DIR__."/../usr/conf/conf.json"), true);
if (is_file(__DIR__."/../usr/conf/conf.json")) {
$settings = json_decode(file_get_contents(__DIR__."/../usr/conf/conf.json"), true);
$user_settings = json_decode(file_get_contents(__DIR__."/../usr/conf/conf.json"), true);
} else {
$settings = json_decode(file_get_contents(__DIR__."/../usr/conf.default.json"), true);
$user_settings = json_decode(file_get_contents(__DIR__."/../usr/conf.default.json"), true);
}
if (is_file(__DIR__."/../usr/conf/msg.json")) {
$user_welcome = json_decode(file_get_contents(__DIR__."/../usr/conf/msg.json"), true);
$user_welcome = $user_welcome['welcome'];
} else {
$user_welcome = array('Welcome to your new Only Legs installation! You can change this message in the settings page.');
}
$web_info = json_decode(file_get_contents(__DIR__."/app.json"), true);
$upload_conf = $user_settings["upload"];
$web_info = json_decode(file_get_contents(__DIR__."/app.json"), true);