composer v1
This commit is contained in:
28
inc/main.php
28
inc/main.php
@@ -1,5 +1,8 @@
|
||||
<?php
|
||||
|
||||
namespace Franzz\Objects;
|
||||
use \Settings;
|
||||
|
||||
/**
|
||||
* Main Class
|
||||
* @author franzz
|
||||
@@ -20,12 +23,6 @@ abstract class Main extends PhpObject
|
||||
//Folders
|
||||
const MASKS_FOLDER = 'masks/';
|
||||
|
||||
/**
|
||||
* Class Management
|
||||
* @var ClassManagement
|
||||
*/
|
||||
protected $oClassManagement;
|
||||
|
||||
/**
|
||||
* DB Handle
|
||||
* @var Db
|
||||
@@ -50,24 +47,23 @@ abstract class Main extends PhpObject
|
||||
|
||||
/**
|
||||
* Main constructor
|
||||
* @param ClassManagement $oClassManagement
|
||||
* @param string $sLang
|
||||
*/
|
||||
public function __construct($oClassManagement, $sProcessPage, $asMandatoryClasses=array(), $bDb=true, $sFile=__FILE__, $sTimeZone='')
|
||||
public function __construct($sProcessPage, $bDb=true, $sFile=__FILE__, $sTimeZone='')
|
||||
{
|
||||
parent::__construct($sFile, Settings::DEBUG);
|
||||
$this->oClassManagement = $oClassManagement;
|
||||
|
||||
//Load classes
|
||||
$asMandatoryClasses[] = array('name'=>'mask', 'project'=>false);
|
||||
if($bDb) $asMandatoryClasses[] = array('name'=>'db', 'project'=>false);
|
||||
foreach($asMandatoryClasses as $asClass) $this->oClassManagement->incClass($asClass['name'], $asClass['project']);
|
||||
|
||||
$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);
|
||||
$asConf = array(
|
||||
'server' => Settings::DB_SERVER,
|
||||
'database' => Settings::DB_NAME,
|
||||
'user' => Settings::DB_LOGIN,
|
||||
'pass' => Settings::DB_PASS,
|
||||
'encoding' => Settings::DB_ENC
|
||||
);
|
||||
$this->oDb = new Db($asConf, $this->getSqlOptions());
|
||||
if(in_array($this->oDb->sDbState, array(Db::DB_NO_DATA, Db::DB_NO_TABLE))) $this->install();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user