Add default constants to pages default tags

This commit is contained in:
2023-11-19 18:10:54 +01:00
parent 88abac6864
commit 0b66879a89

View File

@@ -114,17 +114,21 @@ abstract class Main extends PhpObject
public function getMainPage($asGlobalVars=array(), $sMainPage='index', $asMainPageTags=array(), $asCachePages=array()) public function getMainPage($asGlobalVars=array(), $sMainPage='index', $asMainPageTags=array(), $asCachePages=array())
{ {
$asDefaultConsts = array('success'=>self::SUCCESS, 'error'=>self::ERROR, 'process_page'=>$this->asContext['process_page']); $asDefaultConsts = array(
'success' => self::SUCCESS,
'error' => self::ERROR,
'process_page' => $this->asContext['process_page'],
'server' => $this->asContext['serv_name']
);
$asGlobalVars['consts'] = array_merge($asDefaultConsts, array_key_exists('consts', $asGlobalVars)?$asGlobalVars['consts']:array()); $asGlobalVars['consts'] = array_merge($asDefaultConsts, array_key_exists('consts', $asGlobalVars)?$asGlobalVars['consts']:array());
//Masks //Masks
if(empty($asCachePages)) $asCachePages = array_values($this->asMasks); if(empty($asCachePages)) $asCachePages = array_values($this->asMasks);
foreach($asCachePages as $sPage) foreach($asCachePages as $sPage) {
{
if($sPage != $sMainPage) { if($sPage != $sMainPage) {
$oMask = new Mask($sPage, $this->oLang); $oMask = new Mask($sPage, $this->oLang);
$sPageContent = $oMask->getMask(); $oMask->setTags($asDefaultConsts);
$asGlobalVars['consts']['pages'][$sPage] = $sPageContent; $asGlobalVars['consts']['pages'][$sPage] = $oMask->getMask();
} }
} }
@@ -135,6 +139,7 @@ abstract class Main extends PhpObject
$oMainMask = new Mask($sMainPage, $this->oLang); $oMainMask = new Mask($sMainPage, $this->oLang);
$oMainMask->setTag('GLOBAL_VARS', json_encode($asGlobalVars)); $oMainMask->setTag('GLOBAL_VARS', json_encode($asGlobalVars));
$oMainMask->setTags($asDefaultConsts);
$oMainMask->setTags($asMainPageTags); $oMainMask->setTags($asMainPageTags);
return $oMainMask->getMask(); return $oMainMask->getMask();