flashii/uiharu
3
0
Fork 0
Code Issues Pull requests1 Releases Activity

Switched Uiharu config to Syokuhou format.

Browse source
This commit is contained in:
flash 2023-12-15 01:39:11 +00:00
parent 4089efbbdf
commit d74457a140
6 changed files with 17 additions and 45 deletions

22
uiharu.php
View file

@ -2,8 +2,8 @@
namespace Uiharu;
use Index\Environment;
use Index\Data\ConnectionFailedException;
use Index\Data\DbTools;
use Syokuhou\SharpConfig;
define('UIH_STARTUP', microtime(true));
define('UIH_ROOT', __DIR__);
@ -11,7 +11,7 @@ define('UIH_DEBUG', is_file(UIH_ROOT . '/.debug'));
define('UIH_PUBLIC', UIH_ROOT . '/public');
define('UIH_SOURCE', UIH_ROOT . '/src');
define('UIH_LIBRARY', UIH_ROOT . '/lib');
define('UIH_VERSION', '20231021');
define('UIH_VERSION', '20231215');
require_once UIH_ROOT . '/vendor/autoload.php';
@ -20,19 +20,9 @@ Environment::setDebug(UIH_DEBUG);
mb_internal_encoding('utf-8');
date_default_timezone_set('utc');
$configPath = UIH_ROOT . '/config.ini';
if(!is_file($configPath))
die('Uiharu configuration is missing.');
$cfg = SharpConfig::fromFile(UIH_ROOT . '/uiharu.cfg');
Config::load($configPath);
if(!Config::has('Database', 'dsn'))
die('Uiharu database is not configured.');
$db = DbTools::create($cfg->getString('database:dsn', 'null:'));
$db->execute('SET SESSION time_zone = \'+00:00\', sql_mode = \'STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION\';');
try {
$db = DbTools::create(Config::get('Database', 'dsn'));
} catch(ConnectionFailedException $ex) {
echo '<h3>Unable to connect to database</h3>';
die($ex->getMessage());
}
$ctx = new UihContext($db);
$ctx = new UihContext($db, $cfg);