Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 10:40:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move delimiter props and functions

Browse source 
move left and right delimiter functions and properties to Render class.
This commit is contained in:
Adam Magness 2018-10-31 12:12:15 -04:00
parent 93ccd7bcdb
commit 3f74ba88c2
3 changed files with 44 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/App.php
View file

@ -162,14 +162,6 @@ class App
public $template_engine_instance = [];
public $process_id;
public $queue;
private $ldelim = [
'internal' => '',
'smarty3' => '{{'
];
private $rdelim = [
'internal' => '',
'smarty3' => '}}'
];
private $scheme;
private $hostname;
@ -924,38 +916,6 @@ class App
$this->theme['template_engine'] = $engine;
}
/**
* Gets the right delimiter for a template engine
*
* Currently:
* Internal = ''
* Smarty3 = '{{'
*
* @param string $engine The template engine (default is Smarty3)
*
* @return string the right delimiter
*/
public function getTemplateLeftDelimiter($engine = 'smarty3')
{
return $this->ldelim[$engine];
}
/**
* Gets the left delimiter for a template engine
*
* Currently:
* Internal = ''
* Smarty3 = '}}'
*
* @param string $engine The template engine (default is Smarty3)
*
* @return string the left delimiter
*/
public function getTemplateRightDelimiter($engine = 'smarty3')
{
return $this->rdelim[$engine];
}
/**
* Saves a timestamp for a value - f.e. a call
* Necessary for profiling Friendica

41
src/Core/Renderer.php
View file

@ -15,6 +15,15 @@ use Friendica\Render\FriendicaSmarty;
*/
class Renderer extends BaseObject
{
private static $ldelim = [
'internal' => '',
'smarty3' => '{{'
];
private static $rdelim = [
'internal' => '',
'smarty3' => '}}'
];
/**
* @brief This is our template processor
*
@ -69,4 +78,36 @@ class Renderer extends BaseObject
return $template;
}
/**
* Gets the right delimiter for a template engine
*
* Currently:
* Internal = ''
* Smarty3 = '{{'
*
* @param string $engine The template engine (default is Smarty3)
*
* @return string the right delimiter
*/
public static function getTemplateLeftDelimiter($engine = 'smarty3')
{
return self::$ldelim[$engine];
}
/**
* Gets the left delimiter for a template engine
*
* Currently:
* Internal = ''
* Smarty3 = '}}'
*
* @param string $engine The template engine (default is Smarty3)
*
* @return string the left delimiter
*/
public static function getTemplateRightDelimiter($engine = 'smarty3')
{
return self::$rdelim[$engine];
}
}

5
src/Render/FriendicaSmarty.php
View file

@ -5,6 +5,7 @@
namespace Friendica\Render;
use Smarty;
use Friendica\Core\Renderer;
/**
* Friendica extension of the Smarty3 template engine
@ -38,8 +39,8 @@ class FriendicaSmarty extends Smarty
$this->setConfigDir('view/smarty3/config/');
$this->setCacheDir('view/smarty3/cache/');
$this->left_delimiter = $a->getTemplateLeftDelimiter('smarty3');
$this->right_delimiter = $a->getTemplateRightDelimiter('smarty3');
$this->left_delimiter = Renderer::getTemplateLeftDelimiter('smarty3');
$this->right_delimiter = Renderer::getTemplateRightDelimiter('smarty3');
// Don't report errors so verbosely
$this->error_reporting = E_ALL & ~E_NOTICE;