From 17bd39fcd4b28e6475a8a349f136c788202eaff4 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 13 Jul 2014 23:00:03 -0700 Subject: rename friendica_smarty --- include/friendica_smarty.php | 110 ------------------------------------------- include/plugin.php | 4 +- include/smarty.php | 110 +++++++++++++++++++++++++++++++++++++++++++ include/text.php | 2 +- 4 files changed, 114 insertions(+), 112 deletions(-) delete mode 100755 include/friendica_smarty.php create mode 100755 include/smarty.php (limited to 'include') diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php deleted file mode 100755 index c2fcc4097..000000000 --- a/include/friendica_smarty.php +++ /dev/null @@ -1,110 +0,0 @@ - "view/theme/$theme/tpl/"); - if( x($a->theme_info,"extends") ) - $template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/tpl/"); - $template_dirs = $template_dirs + array('base' => 'view/tpl/'); - $this->setTemplateDir($template_dirs); - - $basecompiledir = $a->config['system']['smarty3_folder']; - - $this->setCompileDir($basecompiledir.'/compiled/'); - $this->setConfigDir($basecompiledir.'/config/'); - $this->setCacheDir($basecompiledir.'/cache/'); - - $this->left_delimiter = $a->get_template_ldelim('smarty3'); - $this->right_delimiter = $a->get_template_rdelim('smarty3'); - - // Don't report errors so verbosely - $this->error_reporting = E_ALL & ~E_NOTICE; - } - - function parsed($template = '') { - if($template) { - return $this->fetch('string:' . $template); - } - return $this->fetch('file:' . $this->filename); - } -} - - - -class FriendicaSmartyEngine implements ITemplateEngine { - static $name ="smarty3"; - - public function __construct(){ - $a = get_app(); - $basecompiledir = ((array_key_exists('smarty3_folder',$a->config['system'])) ? $a->config['system']['smarty3_folder'] : ''); - if (!$basecompiledir) $basecompiledir = dirname(__dir__)."/store/[data]/smarty3"; - if (!is_dir($basecompiledir)) { - echo "ERROR: folder $basecompiledir does not exist."; killme(); - } - if(!is_writable($basecompiledir)){ - echo "ERROR: folder $basecompiledir must be writable by webserver."; killme(); - } - $a->config['system']['smarty3_folder'] = $basecompiledir; - } - - // ITemplateEngine interface - public function replace_macros($s, $r) { - $template = ''; - if(gettype($s) === 'string') { - $template = $s; - $s = new FriendicaSmarty(); - } - foreach($r as $key=>$value) { - if($key[0] === '$') { - $key = substr($key, 1); - } - $s->assign($key, $value); - } - return $s->parsed($template); - } - - public function get_markup_template($file, $root=''){ - $template_file = theme_include($file, $root); - if($template_file) { - $template = new FriendicaSmarty(); - $template->filename = $template_file; - - return $template; - } - return ""; - } - - public function get_intltext_template($file, $root='') { - $a = get_app(); - - if(file_exists("view/{$a->language}/$file")) - $template_file = "view/{$a->language}/$file"; - elseif(file_exists("view/en/$file")) - $template_file = "view/en/$file"; - else - $template_file = theme_include($file,$root); - if($template_file) { - $template = new FriendicaSmarty(); - $template->filename = $template_file; - - return $template; - } - return ""; - } - - - -} diff --git a/include/plugin.php b/include/plugin.php index cf058ddeb..c5f57829d 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -5,7 +5,7 @@ * @brief Some functions to handle addons and themes. */ -require_once("include/friendica_smarty.php"); +require_once("include/smarty.php"); /** * @brief unloads an addon. @@ -13,6 +13,7 @@ require_once("include/friendica_smarty.php"); * @param string $plugin name of the addon * @return void */ + function unload_plugin($plugin){ logger("Addons: unloading " . $plugin, LOGGER_DEBUG); @@ -29,6 +30,7 @@ function unload_plugin($plugin){ * @param string $plugin name of the addon * @return bool */ + function uninstall_plugin($plugin) { unload_plugin($plugin); diff --git a/include/smarty.php b/include/smarty.php new file mode 100755 index 000000000..c2fcc4097 --- /dev/null +++ b/include/smarty.php @@ -0,0 +1,110 @@ + "view/theme/$theme/tpl/"); + if( x($a->theme_info,"extends") ) + $template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/tpl/"); + $template_dirs = $template_dirs + array('base' => 'view/tpl/'); + $this->setTemplateDir($template_dirs); + + $basecompiledir = $a->config['system']['smarty3_folder']; + + $this->setCompileDir($basecompiledir.'/compiled/'); + $this->setConfigDir($basecompiledir.'/config/'); + $this->setCacheDir($basecompiledir.'/cache/'); + + $this->left_delimiter = $a->get_template_ldelim('smarty3'); + $this->right_delimiter = $a->get_template_rdelim('smarty3'); + + // Don't report errors so verbosely + $this->error_reporting = E_ALL & ~E_NOTICE; + } + + function parsed($template = '') { + if($template) { + return $this->fetch('string:' . $template); + } + return $this->fetch('file:' . $this->filename); + } +} + + + +class FriendicaSmartyEngine implements ITemplateEngine { + static $name ="smarty3"; + + public function __construct(){ + $a = get_app(); + $basecompiledir = ((array_key_exists('smarty3_folder',$a->config['system'])) ? $a->config['system']['smarty3_folder'] : ''); + if (!$basecompiledir) $basecompiledir = dirname(__dir__)."/store/[data]/smarty3"; + if (!is_dir($basecompiledir)) { + echo "ERROR: folder $basecompiledir does not exist."; killme(); + } + if(!is_writable($basecompiledir)){ + echo "ERROR: folder $basecompiledir must be writable by webserver."; killme(); + } + $a->config['system']['smarty3_folder'] = $basecompiledir; + } + + // ITemplateEngine interface + public function replace_macros($s, $r) { + $template = ''; + if(gettype($s) === 'string') { + $template = $s; + $s = new FriendicaSmarty(); + } + foreach($r as $key=>$value) { + if($key[0] === '$') { + $key = substr($key, 1); + } + $s->assign($key, $value); + } + return $s->parsed($template); + } + + public function get_markup_template($file, $root=''){ + $template_file = theme_include($file, $root); + if($template_file) { + $template = new FriendicaSmarty(); + $template->filename = $template_file; + + return $template; + } + return ""; + } + + public function get_intltext_template($file, $root='') { + $a = get_app(); + + if(file_exists("view/{$a->language}/$file")) + $template_file = "view/{$a->language}/$file"; + elseif(file_exists("view/en/$file")) + $template_file = "view/en/$file"; + else + $template_file = theme_include($file,$root); + if($template_file) { + $template = new FriendicaSmarty(); + $template->filename = $template_file; + + return $template; + } + return ""; + } + + + +} diff --git a/include/text.php b/include/text.php index 61c731167..85c27265f 100755 --- a/include/text.php +++ b/include/text.php @@ -2,7 +2,7 @@ require_once("include/template_processor.php"); -require_once("include/friendica_smarty.php"); +require_once("include/smarty.php"); /** * This is our template processor -- cgit v1.2.3