keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4375 from MrPetovan/task/3878-move-friendica_smarty-to-src

Browse source 
Move include/friendica_smarty to src/
This commit is contained in:
Tobias Diekershoff 2018-02-03 10:32:32 +01:00 committed by GitHub
commit e805350ce4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 117 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/text.php
View file

@ -16,7 +16,6 @@ use Friendica\Model\Profile;
use Friendica\Model\Term; use Friendica\Model\Term;
use Friendica\Util\Map; use Friendica\Util\Map;
require_once "include/friendica_smarty.php";
require_once "mod/proxy.php"; require_once "mod/proxy.php";
require_once "include/conversation.php"; require_once "include/conversation.php";

9
src/App.php
View file

@ -288,12 +288,7 @@ class App
$this->is_friendica_app = ($_SERVER['HTTP_USER_AGENT'] == 'Apache-HttpClient/UNAVAILABLE (java 1.4)'); $this->is_friendica_app = ($_SERVER['HTTP_USER_AGENT'] == 'Apache-HttpClient/UNAVAILABLE (java 1.4)');
// Register template engines // Register template engines
$dc = get_declared_classes(); $this->register_template_engine('Friendica\Render\FriendicaSmartyEngine');
foreach ($dc as $k) {
if (in_array('Friendica\Render\ITemplateEngine', class_implements($k))) {
$this->register_template_engine($k);
}
}
self::$a = $this; self::$a = $this;
} }
@ -602,7 +597,7 @@ class App
$this->template_engines[$name] = $class; $this->template_engines[$name] = $class;
} else { } else {
echo "template engine <tt>$class</tt> cannot be registered without a name.\n"; echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
killme(); die();
} }
} }

152
include/friendica_smarty.php → src/Render/FriendicaSmarty.php
View file

@ -1,96 +1,56 @@
<?php <?php
/**
use Friendica\Core\Addon; * @file src/Render/FriendicaSmarty.php
use Friendica\Render\ITemplateEngine; */
namespace Friendica\Render;
define('SMARTY3_TEMPLATE_FOLDER', 'templates');
use Smarty;
class FriendicaSmarty extends Smarty
{ define('SMARTY3_TEMPLATE_FOLDER', 'templates');
public $filename;
/**
function __construct() * Description of FriendicaSmarty
{ *
parent::__construct(); * @author benlo
*/
$a = get_app(); class FriendicaSmarty extends Smarty
$theme = current_theme(); {
public $filename;
// setTemplateDir can be set to an array, which Smarty will parse in order.
// The order is thus very important here function __construct()
$template_dirs = ['theme' => "view/theme/$theme/" . SMARTY3_TEMPLATE_FOLDER . "/"]; {
if (x($a->theme_info, "extends")) parent::__construct();
$template_dirs = $template_dirs + ['extends' => "view/theme/" . $a->theme_info["extends"] . "/" . SMARTY3_TEMPLATE_FOLDER . "/"];
$template_dirs = $template_dirs + ['base' => "view/" . SMARTY3_TEMPLATE_FOLDER . "/"]; $a = get_app();
$this->setTemplateDir($template_dirs); $theme = current_theme();
$this->setCompileDir('view/smarty3/compiled/'); // setTemplateDir can be set to an array, which Smarty will parse in order.
$this->setConfigDir('view/smarty3/config/'); // The order is thus very important here
$this->setCacheDir('view/smarty3/cache/'); $template_dirs = ['theme' => "view/theme/$theme/" . SMARTY3_TEMPLATE_FOLDER . "/"];
if (x($a->theme_info, "extends")) {
$this->left_delimiter = $a->get_template_ldelim('smarty3'); $template_dirs = $template_dirs + ['extends' => "view/theme/" . $a->theme_info["extends"] . "/" . SMARTY3_TEMPLATE_FOLDER . "/"];
$this->right_delimiter = $a->get_template_rdelim('smarty3'); }
// Don't report errors so verbosely $template_dirs = $template_dirs + ['base' => "view/" . SMARTY3_TEMPLATE_FOLDER . "/"];
$this->error_reporting = E_ALL & ~E_NOTICE; $this->setTemplateDir($template_dirs);
}
$this->setCompileDir('view/smarty3/compiled/');
function parsed($template = '') $this->setConfigDir('view/smarty3/config/');
{ $this->setCacheDir('view/smarty3/cache/');
if ($template) {
return $this->fetch('string:' . $template); $this->left_delimiter = $a->get_template_ldelim('smarty3');
} $this->right_delimiter = $a->get_template_rdelim('smarty3');
return $this->fetch('file:' . $this->filename);
} // Don't report errors so verbosely
$this->error_reporting = E_ALL & ~E_NOTICE;
} }
class FriendicaSmartyEngine implements ITemplateEngine function parsed($template = '')
{ {
static $name = "smarty3"; if ($template) {
return $this->fetch('string:' . $template);
public function __construct() }
{ return $this->fetch('file:' . $this->filename);
if (!is_writable('view/smarty3/')) { }
echo "<b>ERROR:</b> folder <tt>view/smarty3/</tt> must be writable by webserver.";
killme(); }
}
}
// ITemplateEngine interface
public function replaceMacros($s, $r)
{
$template = '';
if (gettype($s) === 'string') {
$template = $s;
$s = new FriendicaSmarty();
}
$r['$APP'] = get_app();
// "middleware": inject variables into templates
$arr = [
"template" => basename($s->filename),
"vars" => $r
];
Addon::callHooks("template_vars", $arr);
$r = $arr['vars'];
foreach ($r as $key => $value) {
if ($key[0] === '$') {
$key = substr($key, 1);
}
$s->assign($key, $value);
}
return $s->parsed($template);
}
public function getTemplateFile($file, $root = '')
{
$a = get_app();
$template_file = get_template_file($a, SMARTY3_TEMPLATE_FOLDER . '/' . $file, $root);
$template = new FriendicaSmarty();
$template->filename = $template_file;
return $template;
}
}

59
src/Render/FriendicaSmartyEngine.php Normal file
View file

@ -0,0 +1,59 @@
<?php
/**
* @file src/Render/FriendicaSmartyEngine.php
*/
namespace Friendica\Render;
use Friendica\Core\Addon;
class FriendicaSmartyEngine implements ITemplateEngine
{
static $name = "smarty3";
public function __construct()
{
if (!is_writable('view/smarty3/')) {
echo "<b>ERROR:</b> folder <tt>view/smarty3/</tt> must be writable by webserver.";
killme();
}
}
// ITemplateEngine interface
public function replaceMacros($s, $r)
{
$template = '';
if (gettype($s) === 'string') {
$template = $s;
$s = new FriendicaSmarty();
}
$r['$APP'] = get_app();
// "middleware": inject variables into templates
$arr = [
"template" => basename($s->filename),
"vars" => $r
];
Addon::callHooks("template_vars", $arr);
$r = $arr['vars'];
foreach ($r as $key => $value) {
if ($key[0] === '$') {
$key = substr($key, 1);
}
$s->assign($key, $value);
}
return $s->parsed($template);
}
public function getTemplateFile($file, $root = '')
{
$a = get_app();
$template_file = get_template_file($a, SMARTY3_TEMPLATE_FOLDER . '/' . $file, $root);
$template = new FriendicaSmarty();
$template->filename = $template_file;
return $template;
}
}