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

replace MySqlManager with Db

Browse Source
This commit is contained in:
francois
2018-04-11 20:20:23 +02:00
parent 5c7dd8d4c2
commit 8bb84c1a24
4 changed files with 38 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
inc/main.php
View File

@@ -3,7 +3,7 @@
/**
* Main Class
* @author franzz
* @version 2.1
* @version 2.2
*/
abstract class Main extends PhpObject
{
@@ -23,7 +23,7 @@ abstract class Main extends PhpObject
//Objects
protected $oClassManagement;
protected $oMySql;
protected $oDb;
//private $oTranslator;
//...
@@ -44,27 +44,27 @@ abstract class Main extends PhpObject
* @param ClassManagement $oClassManagement
* @param string $sLang
*/
public function __construct($oClassManagement, $sProcessPage/*, $sLang=''*/)
public function __construct($oClassManagement, $sProcessPage, $asMandatoryClasses=array()/*, $sLang=''*/)
{
parent::__construct(__CLASS__, Settings::DEBUG);
$this->oClassManagement = $oClassManagement;
//Load classes
$this->oClassManagement->incClass('mask');
$asMandatoryClasses[] = array('name'=>'mask', 'project'=>false);
$asMandatoryClasses[] = array('name'=>'db', 'project'=>false);
foreach($asMandatoryClasses as $asClass) $this->oClassManagement->incClass($asClass['name'], $asClass['project']);
$this->setContext($sProcessPage);
//$this->oClassManagement->incClass('translator');
$this->oClassManagement->incClass('mysqlmanager');
//$this->oClassManagement->incClass('auth');
//...
//Init objects
//$this->setLanguage($sLang);
//$this->oTranslator = new Translator($this->getLanguage());
$this->oMySql = new MySqlManager(Settings::DB_SERVER, Settings::DB_LOGIN, Settings::DB_PASS, Settings::DB_NAME, $this->getSqlOptions() , Settings::DB_ENC);
if($this->oMySql->sDbState == MySqlManager::DB_NO_DATA) $this->install();
//...
$this->oDb = new Db(Settings::DB_SERVER, Settings::DB_LOGIN, Settings::DB_PASS, Settings::DB_NAME, $this->getSqlOptions() , Settings::DB_ENC);
if($this->oDb->sDbState == Db::DB_NO_DATA) $this->install();
}
protected abstract function install();
@@ -97,7 +97,7 @@ abstract class Main extends PhpObject
/* Building main pages */
public function getMainPage($asGlobalVars=array(), $sMainPage='index')
public function getMainPage($asGlobalVars=array(), $sMainPage='index', $asMainPageTags=array())
{
$asGlobalVars['consts'] = array('success'=>self::SUCCESS, 'error'=>self::ERROR, 'process_page'=>$this->asContext['process_page']);
@@ -106,11 +106,14 @@ abstract class Main extends PhpObject
foreach($asPages as $sPage)
{
$sPageContent = $this->getPageContent($sPage);
if($sPage==$sMainPage) $sMainPageContent = $sPageContent;
else $asGlobalVars['consts']['pages'][$sPage] = $sPageContent;
if($sPage!=$sMainPage) $asGlobalVars['consts']['pages'][$sPage] = $sPageContent;
}
return str_replace('asGlobalVars', json_encode($asGlobalVars), $sMainPageContent);
$oMainMask = new Mask($sMainPage);
$oMainMask->setTag('GLOBAL_VARS', json_encode($asGlobalVars));
$oMainMask->setTags($asMainPageTags);
return $oMainMask->getMask();
}
protected function getPageContent($sPage)
@@ -118,7 +121,7 @@ abstract class Main extends PhpObject
return /*utf8_encode(*/file_get_contents(self::MASKS_FOLDER.$sPage.'.html')/*)*/;
}
/* DB structure. See MySqlManager::__construct */
/* DB structure. See Db::__construct */
protected abstract function getSqlOptions();