franzz/objects
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DB connection not mandatory anymore

Browse Source
This commit is contained in:
Franzz
2019-03-23 21:10:04 +01:00
parent 3ab603d223
commit f86ff58053
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
globalsettings-sample.php
View File

@@ -2,8 +2,5 @@
class GlobalSettings
{
const MAPBOX_KEY = '';
const IGN_FR_KEY = '';
const LINZ_KEY = '';
const LOC_API_KEY = '';
}

13
inc/main.php
View File

@@ -44,14 +44,14 @@ abstract class Main extends PhpObject
* @param ClassManagement $oClassManagement
* @param string $sLang
*/
public function __construct($oClassManagement, $sProcessPage, $asMandatoryClasses=array()/*, $sLang=''*/)
public function __construct($oClassManagement, $sProcessPage, $asMandatoryClasses=array(), $bDb=true/*, $sLang=''*/)
{
parent::__construct(__CLASS__, Settings::DEBUG);
$this->oClassManagement = $oClassManagement;
//Load classes
$asMandatoryClasses[] = array('name'=>'mask', 'project'=>false);
$asMandatoryClasses[] = array('name'=>'db', 'project'=>false);
if($bDb) $asMandatoryClasses[] = array('name'=>'db', 'project'=>false);
foreach($asMandatoryClasses as $asClass) $this->oClassManagement->incClass($asClass['name'], $asClass['project']);
$this->setContext($sProcessPage);
@@ -63,9 +63,11 @@ abstract class Main extends PhpObject
//Init objects
//$this->setLanguage($sLang);
//$this->oTranslator = new Translator($this->getLanguage());
if($bDb) {
$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();
}
}
protected abstract function install();
@@ -132,7 +134,7 @@ abstract class Main extends PhpObject
protected function getPageContent($sPage)
{
return /*utf8_encode(*/file_get_contents(self::MASKS_FOLDER.$sPage.'.html')/*)*/;
return ToolBox::fixEOL(file_get_contents(self::MASKS_FOLDER.$sPage.'.html'));
}
/* DB structure. See Db::__construct */
@@ -171,6 +173,11 @@ abstract class Main extends PhpObject
header('Content-type: application/json');
return json_encode(array('result'=>$bSuccess?self::SUCCESS:self::ERROR, 'desc'=>$sDesc, 'data'=>$asVars));
}
public static function goTo403() {
header('HTTP/1.1 403 Forbidden');
exit;
}
}
?>