Use mask class on every page & add paramaters to translations

This commit is contained in:
2019-10-19 18:26:12 +02:00
parent 734f04dba2
commit 181baffbe3
2 changed files with 20 additions and 3 deletions

View File

@@ -125,7 +125,9 @@ abstract class Main extends PhpObject
$asPages = array_values($this->asMasks);
foreach($asPages as $sPage)
{
$sPageContent = $this->getPageContent($sPage);
//$sPageContent = $this->getPageContent($sPage);
$oMask = new Mask($sPage, $this->oLang);
$sPageContent = $oMask->getMask();
if($sPage!=$sMainPage) $asGlobalVars['consts']['pages'][$sPage] = $sPageContent;
}
@@ -160,7 +162,13 @@ abstract class Main extends PhpObject
public static function getJsonResult($bSuccess, $sDesc, $asVars=array())
{
header('Content-type: application/json');
return json_encode(array('result'=>$bSuccess?self::SUCCESS:self::ERROR, 'desc'=>$sDesc, 'data'=>$asVars));
$asResult = self::getResult($bSuccess, $sDesc, $asVars);
$asResult['result'] = $asResult['result']?self::SUCCESS:self::ERROR;
return json_encode($asResult);
}
public static function getResult($bSuccess, $sDesc, $asVars) {
return array('result'=>$bSuccess, 'desc'=>$sDesc, 'data'=>$asVars);
}
public static function goTo403() {