harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't do oembed processing on naked links and smarty lib cleanup. ported from zap.

Browse Source
This commit is contained in:
Mario Vavti 2019-05-13 10:39:40 +02:00
parent 7465c79884
commit d5f59a57bf
3 changed files with 49 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Zotlabs/Render/SmartyInterface.php
View File

@ -2,7 +2,10 @@
namespace Zotlabs\Render; namespace Zotlabs\Render;
class SmartyInterface extends \Smarty { use Smarty;
use App;
class SmartyInterface extends Smarty {
public $filename; public $filename;
@ -16,19 +19,20 @@ class SmartyInterface extends \Smarty {
// The order is thus very important here // The order is thus very important here
$template_dirs = array('theme' => "view/theme/$thname/tpl/"); $template_dirs = array('theme' => "view/theme/$thname/tpl/");
if( x(\App::$theme_info,"extends") ) if ( x(App::$theme_info,"extends") ) {
$template_dirs = $template_dirs + array('extends' => "view/theme/" . \App::$theme_info["extends"] . "/tpl/"); $template_dirs = $template_dirs + array('extends' => "view/theme/" . \App::$theme_info["extends"] . "/tpl/");
}
$template_dirs = $template_dirs + array('base' => 'view/tpl/'); $template_dirs = $template_dirs + array('base' => 'view/tpl/');
$this->setTemplateDir($template_dirs); $this->setTemplateDir($template_dirs);
$basecompiledir = \App::$config['system']['smarty3_folder']; $basecompiledir = App::$config['system']['smarty3_folder'];
$this->setCompileDir($basecompiledir.'/compiled/'); $this->setCompileDir($basecompiledir.'/compiled/');
$this->setConfigDir($basecompiledir.'/config/'); $this->setConfigDir($basecompiledir.'/config/');
$this->setCacheDir($basecompiledir.'/cache/'); $this->setCacheDir($basecompiledir.'/cache/');
$this->left_delimiter = \App::get_template_ldelim('smarty3'); $this->left_delimiter = App::get_template_ldelim('smarty3');
$this->right_delimiter = \App::get_template_rdelim('smarty3'); $this->right_delimiter = App::get_template_rdelim('smarty3');
// Don't report errors so verbosely // Don't report errors so verbosely
$this->error_reporting = E_ALL & (~E_NOTICE); $this->error_reporting = E_ALL & (~E_NOTICE);

33
Zotlabs/Render/SmartyTemplate.php
View File

@ -2,6 +2,9 @@
namespace Zotlabs\Render; namespace Zotlabs\Render;
use App;
class SmartyTemplate implements TemplateEngine { class SmartyTemplate implements TemplateEngine {
static $name ="smarty3"; static $name ="smarty3";
@ -11,9 +14,11 @@ class SmartyTemplate implements TemplateEngine {
// Cannot use get_config() here because it is called during installation when there is no DB. // Cannot use get_config() here because it is called during installation when there is no DB.
// FIXME: this may leak private information such as system pathnames. // FIXME: this may leak private information such as system pathnames.
$basecompiledir = ((array_key_exists('smarty3_folder',\App::$config['system'])) $basecompiledir = ((array_key_exists('smarty3_folder', App::$config['system']))
? \App::$config['system']['smarty3_folder'] : ''); ? App::$config['system']['smarty3_folder'] : '');
if (!$basecompiledir) $basecompiledir = str_replace('Zotlabs','',dirname(__dir__)) . "/" . TEMPLATE_BUILD_PATH; if (! $basecompiledir) {
$basecompiledir = str_replace('Zotlabs','',dirname(__dir__)) . "/" . TEMPLATE_BUILD_PATH;
}
if (! is_dir($basecompiledir)) { if (! is_dir($basecompiledir)) {
@os_mkdir(TEMPLATE_BUILD_PATH, STORAGE_DEFAULT_PERMISSIONS, true); @os_mkdir(TEMPLATE_BUILD_PATH, STORAGE_DEFAULT_PERMISSIONS, true);
if (! is_dir($basecompiledir)) { if (! is_dir($basecompiledir)) {
@ -23,7 +28,7 @@ class SmartyTemplate implements TemplateEngine {
if (! is_writable($basecompiledir)) { if (! is_writable($basecompiledir)) {
echo "<b>ERROR:</b> folder <tt>$basecompiledir</tt> must be writable by webserver."; killme(); echo "<b>ERROR:</b> folder <tt>$basecompiledir</tt> must be writable by webserver."; killme();
} }
\App::$config['system']['smarty3_folder'] = $basecompiledir; App::$config['system']['smarty3_folder'] = $basecompiledir;
} }
// TemplateEngine interface // TemplateEngine interface
@ -31,7 +36,7 @@ class SmartyTemplate implements TemplateEngine {
public function replace_macros($s, $r) { public function replace_macros($s, $r) {
$template = ''; $template = '';
// these are available for use in all templates // macro or macros available for use in all templates
$r['$z_baseurl'] = z_root(); $r['$z_baseurl'] = z_root();
$r['$z_server_role'] = \Zotlabs\Lib\System::get_server_role(); $r['$z_server_role'] = \Zotlabs\Lib\System::get_server_role();
@ -58,23 +63,23 @@ class SmartyTemplate implements TemplateEngine {
return $template; return $template;
} }
return ""; return EMPTY_STR;
} }
public function get_intltext_template($file, $root = '') { public function get_intltext_template($file, $root = '') {
$lang = \App::$language; $lang = App::$language;
if ($root != '' && substr($root,-1) != '/' ) { if ($root != '' && substr($root,-1) != '/' ) {
$root .= '/'; $root .= '/';
} }
foreach (Array( foreach ( [ $root . "view/$lang/$file", $root . "view/en/$file", '' ] as $template_file) {
$root."view/$lang/$file", if (is_file($template_file)) {
$root."view/en/$file", break;
'' }
) as $template_file) { }
if (is_file($template_file)) { break; } if ($template_file == '') {
$template_file = theme_include($file,$root);
} }
if ($template_file=='') {$template_file = theme_include($file,$root);}
if ($template_file) { if ($template_file) {
$template = new SmartyInterface(); $template = new SmartyInterface();
$template->filename = $template_file; $template->filename = $template_file;

7
include/bbcode.php
View File

@ -87,12 +87,11 @@ function nakedoembed($match) {
$strip_url = strip_escaped_zids($url); $strip_url = strip_escaped_zids($url);
$o = oembed_fetch_url($strip_url); // this function no longer performs oembed on naked links
// because they author may have created naked links intentionally.
// Now it just strips zids on naked links.
if ($o['type'] == 'error')
return str_replace($url,$strip_url,$match[0]); return str_replace($url,$strip_url,$match[0]);
return '[embed]' . $strip_url . '[/embed]';
} }
function tryzrlaudio($match) { function tryzrlaudio($match) {