From 0b66879a89c394a18bc36eed37ae7b4cb1422284 Mon Sep 17 00:00:00 2001
From: Franzz <francois@lutran.fr>
Date: Sun, 19 Nov 2023 18:10:54 +0100
Subject: [PATCH] Add default constants to pages default tags

---
 inc/Main.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/inc/Main.php b/inc/Main.php
index d1943f9..921722f 100755
--- a/inc/Main.php
+++ b/inc/Main.php
@@ -114,17 +114,21 @@ abstract class Main extends PhpObject
 
 	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());
 
 		//Masks
 		if(empty($asCachePages)) $asCachePages = array_values($this->asMasks);
-		foreach($asCachePages as $sPage)
-		{
+		foreach($asCachePages as $sPage) {
 			if($sPage != $sMainPage) {
 				$oMask = new Mask($sPage, $this->oLang);
-				$sPageContent = $oMask->getMask();
-				$asGlobalVars['consts']['pages'][$sPage] = $sPageContent;
+				$oMask->setTags($asDefaultConsts);
+				$asGlobalVars['consts']['pages'][$sPage] = $oMask->getMask();
 			}
 		}
 
@@ -135,6 +139,7 @@ abstract class Main extends PhpObject
 
 		$oMainMask = new Mask($sMainPage, $this->oLang);
 		$oMainMask->setTag('GLOBAL_VARS', json_encode($asGlobalVars));
+		$oMainMask->setTags($asDefaultConsts);
 		$oMainMask->setTags($asMainPageTags);
 
 		return $oMainMask->getMask();