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

3 files changed, 50 insertions, 42 deletions

diff --git a/Zotlabs/Render/SmartyInterface.php b/Zotlabs/Render/SmartyInterface.php
index 9c9a501c0..a40effecf 100755
--- a/Zotlabs/Render/SmartyInterface.php
+++ b/Zotlabs/Render/SmartyInterface.php
@@ -2,7 +2,10 @@
 
 namespace Zotlabs\Render;
 
-class SmartyInterface extends \Smarty {
+use Smarty;
+use App;
+
+class SmartyInterface extends Smarty {
 
 	public $filename;
 
@@ -16,26 +19,27 @@ class SmartyInterface extends \Smarty {
 		// The order is thus very important here
 
 		$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('base' => 'view/tpl/');
 		$this->setTemplateDir($template_dirs);
 
-        $basecompiledir = \App::$config['system']['smarty3_folder'];
+		$basecompiledir = App::$config['system']['smarty3_folder'];
         
 		$this->setCompileDir($basecompiledir.'/compiled/');
 		$this->setConfigDir($basecompiledir.'/config/');
 		$this->setCacheDir($basecompiledir.'/cache/');
 
-		$this->left_delimiter = \App::get_template_ldelim('smarty3');
-		$this->right_delimiter = \App::get_template_rdelim('smarty3');
+		$this->left_delimiter = App::get_template_ldelim('smarty3');
+		$this->right_delimiter = App::get_template_rdelim('smarty3');
 
 		// Don't report errors so verbosely
 		$this->error_reporting = E_ALL & (~E_NOTICE);
 	}
 
 	function parsed($template = '') {
-		if($template) {
+		if ($template) {
 			return $this->fetch('string:' . $template);
 		}
 		return $this->fetch('file:' . $this->filename);
diff --git a/Zotlabs/Render/SmartyTemplate.php b/Zotlabs/Render/SmartyTemplate.php
index f14d63064..61fb72f8a 100755
--- a/Zotlabs/Render/SmartyTemplate.php
+++ b/Zotlabs/Render/SmartyTemplate.php
@@ -2,28 +2,33 @@
 
 namespace Zotlabs\Render;
 
+use App;
+
+
 class SmartyTemplate implements TemplateEngine {
 
 	static $name ="smarty3";
 	
-	public function __construct(){
+	public function __construct() {
 
 		// 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.
 
-        $basecompiledir = ((array_key_exists('smarty3_folder',\App::$config['system'])) 
-			? \App::$config['system']['smarty3_folder'] : '');
-        if (!$basecompiledir) $basecompiledir = str_replace('Zotlabs','',dirname(__dir__)) . "/" . TEMPLATE_BUILD_PATH;
-        if (!is_dir($basecompiledir)) {
+        $basecompiledir = ((array_key_exists('smarty3_folder', App::$config['system'])) 
+			? App::$config['system']['smarty3_folder'] : '');
+        if (! $basecompiledir) {
+			$basecompiledir = str_replace('Zotlabs','',dirname(__dir__)) . "/" . TEMPLATE_BUILD_PATH;
+		}
+        if (! is_dir($basecompiledir)) {
 			@os_mkdir(TEMPLATE_BUILD_PATH, STORAGE_DEFAULT_PERMISSIONS, true);
-	        if (!is_dir($basecompiledir)) {
+	        if (! is_dir($basecompiledir)) {
 				echo "<b>ERROR:</b> folder <tt>$basecompiledir</tt> does not exist."; killme();
 			}
         }
-		if(!is_writable($basecompiledir)){
+		if (! is_writable($basecompiledir)) {
 			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
@@ -31,18 +36,18 @@ class SmartyTemplate implements TemplateEngine {
 	public function replace_macros($s, $r) {
 		$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_server_role'] = \Zotlabs\Lib\System::get_server_role();
 		$r['$z_techlevel']   = get_account_techlevel();
 
-		if(gettype($s) === 'string') {
+		if (gettype($s) === 'string') {
 			$template = $s;
 			$s = new SmartyInterface();
 		}
-		foreach($r as $key=>$value) {
-			if($key[0] === '$') {
+		foreach ($r as $key=>$value) {
+			if ($key[0] === '$') {
 				$key = substr($key, 1);
 			}
 			$s->assign($key, $value);
@@ -50,32 +55,32 @@ class SmartyTemplate implements TemplateEngine {
 		return $s->parsed($template);		
 	}
 	
-	public function get_markup_template($file, $root=''){
+	public function get_markup_template($file, $root = '') {
 		$template_file = theme_include($file, $root);
-		if($template_file) {
+		if ($template_file) {
 			$template = new SmartyInterface();
 			$template->filename = $template_file;
 
 			return $template;
 		}		
-		return "";
+		return EMPTY_STR;
 	}
 
-	public function get_intltext_template($file, $root='') {
-
-		$lang = \App::$language;
-                if ($root != '' && substr($root,-1) != '/' ) {
-                               $root .= '/';
-                }
-                foreach (Array(
-                               $root."view/$lang/$file",
-                               $root."view/en/$file",
-                               ''
-                               ) as $template_file) {
-                        if (is_file($template_file)) { break; }
-                }
-                if ($template_file=='') {$template_file = theme_include($file,$root);}
-		if($template_file) {
+	public function get_intltext_template($file, $root = '') {
+
+		$lang = App::$language;
+		if ($root != '' && substr($root,-1) != '/' ) {
+			$root .= '/';
+		}
+		foreach ( [ $root . "view/$lang/$file", $root . "view/en/$file", '' ] as $template_file) {
+			if (is_file($template_file)) {
+				break;
+			}
+		}
+		if ($template_file == '') {
+			$template_file = theme_include($file,$root);
+		}
+		if ($template_file) {
 			$template = new SmartyInterface();
 			$template->filename = $template_file;
 			return $template;
diff --git a/include/bbcode.php b/include/bbcode.php
index 1c153677d..a675451f1 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -87,12 +87,11 @@ function nakedoembed($match) {
 
 	$strip_url = strip_escaped_zids($url);
 
-	$o = oembed_fetch_url($strip_url);
-
-	if ($o['type'] == 'error')
-		return str_replace($url,$strip_url,$match[0]);
-
-	return '[embed]' . $strip_url . '[/embed]';
+	// 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.
+	
+	return str_replace($url,$strip_url,$match[0]);
 }
 
 function tryzrlaudio($match) {