Minor improvements

This commit is contained in:
2020-03-31 21:19:03 +02:00
parent b175fd28ab
commit cd155d17dd
3 changed files with 8 additions and 6 deletions

View File

@@ -63,12 +63,11 @@ abstract class Main extends PhpObject
if($bDb) $asMandatoryClasses[] = array('name'=>'db', 'project'=>false);
foreach($asMandatoryClasses as $asClass) $this->oClassManagement->incClass($asClass['name'], $asClass['project']);
$sTimeZone = ($sTimeZone=='')?Settings::TIMEZONE:$sTimeZone;
$this->setContext($sProcessPage, $sTimeZone);
//Init objects
if($bDb) {
$this->oDb = new Db(Settings::DB_SERVER, Settings::DB_LOGIN, Settings::DB_PASS, Settings::DB_NAME, $this->getSqlOptions() , Settings::DB_ENC, $sTimeZone);
$this->oDb = new Db(Settings::DB_SERVER, Settings::DB_LOGIN, Settings::DB_PASS, Settings::DB_NAME, $this->getSqlOptions() , Settings::DB_ENC);
if(in_array($this->oDb->sDbState, array(Db::DB_NO_DATA, Db::DB_NO_TABLE))) $this->install();
}
}
@@ -82,6 +81,7 @@ abstract class Main extends PhpObject
private function setContext($sProcessPage, $sTimeZone='')
{
//Browser <> PHP <> MySql synchronization
if($sTimeZone=='') $sTimeZone = Settings::TIMEZONE;
date_default_timezone_set($sTimeZone);
ini_set('default_charset', Settings::TEXT_ENC);
header('Content-Type: text/html; charset='.Settings::TEXT_ENC);