final fix

This commit is contained in:
Go Johansson 2022-12-16 23:47:09 +01:00
parent f059e2cf1e
commit 06790f5ce6
4 changed files with 4 additions and 47 deletions

View File

@ -35,18 +35,18 @@
*/
public function __construct()
{
if (!file_exists(__DIR__ . '../config.json')) {
if (!file_exists(__DIR__ . '/../config.json')) {
throw new Exception('Cant read settings file.', 500);
}
try {
$this->CONFIG = json_decode(
file_get_contents(__DIR__ . '../config.json'),
file_get_contents(__DIR__ . '/../config.json'),
true,
);
$this->assemble();
}
catch (Exception) {
throw new Exception('Cant populate settings.', 500);
catch (Exception $e) {
throw new Exception($e->getMessage(), 500);
}
}

View File

@ -39,7 +39,6 @@
"FILES_URL": "https://files.domain.com",
"NAME_LENGTH": 8,
"ID_CHARSET": "abcdefghijklmnopqrstuvwxyzABCDEFGHJKLMNOPQRSTUVWXYZ",
"PHP_ERRORS": true,
"BLOCKED_EXTENSIONS": [
"exe",
"scr",

View File

@ -1,26 +1,5 @@
<?php
function checkConfig()
{
if (!file_exists(__DIR__ . '/../config.json')) {
throw new Exception('Cant read settings file.', 500);
}
try {
$settings = json_decode(
file_get_contents(__DIR__ . '/../config.json'),
true,
);
if ($settings['PHP_ERRORS']) {
error_reporting(E_ALL);
ini_set('display_errors', 1);
}
}
catch (Exception) {
throw new Exception('Cant populate settings.', 500);
}
}
checkConfig();
/**
* Uguu
*

View File

@ -18,27 +18,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
function checkConfig()
{
if (!file_exists(__DIR__ . '/../config.json')) {
throw new Exception('Cant read settings file.', 500);
}
try {
$settings = json_decode(
file_get_contents(__DIR__ . '/../config.json'),
true,
);
if ($settings['PHP_ERRORS']) {
error_reporting(E_ALL);
ini_set('display_errors', 1);
}
}
catch (Exception) {
throw new Exception('Cant populate settings.', 500);
}
}
checkConfig();
require_once __DIR__ . '/../vendor/autoload.php';
use Pomf\Uguu\Classes\UploadGateway;