Add 'system''no_oembed' config option

diff --git a/htconfig.php b/htconfig.php
index 13c065e69796d5050528bc1d0070ac96bce7ed16..5f5c76cbd7863788de6a990d7c06f6630060ff29 100644 (file)
--- a/htconfig.php
+++ b/htconfig.php
@@ -72,4 +72,7 @@ $a->config['system']['rino_encrypt'] = true;
 $a->config['system']['addon'] = 'js_upload';
 
 
- 
\ No newline at end of file
+// Disable oembed embedding
+// This disable the conversion of [embed]$url[/embed] tag in html
+// $a->config['system']['no_oembed'] = true;
+

diff --git a/include/oembed.php b/include/oembed.php
index d9bf9f67cf9fef8107f10cf138eb36e08e9422e1..cec9cf75af4a4516188a1755020394f61d9b608f 100644 (file)
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -10,7 +10,7 @@ function oembed_replacecb($matches){
        if (isset($j->thumbnail_url)) {
          $tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200;
          $th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180;
-         $ret = "<a href='#' onclick='this.innerHTML=unescape(\"".urlencode($j->html)."\").replace(/\+/g,\" \"); return false;' >";
+         $ret = "<a href='".$embedurl."' onclick='this.innerHTML=unescape(\"".urlencode($j->html)."\").replace(/\+/g,\" \"); return false;' >";
          $ret.= "<img width='$tw' height='$th' src='".$j->thumbnail_url."'>";
          $ret.= "</a>";
        } else {
@@ -41,8 +41,9 @@ function oembed_replacecb($matches){
 
 function oembed_bbcode($text){
        $stopoembed = get_config("system","no_oembed");
-       if ($stopoembed == True):
-               return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", "$1" ,$text);
+       if ($stopoembed == true){
+               return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "<!-- oembed $1 --><i>". t('Embedding disabled') ." : $1</i><!-- /oembed $1 -->" ,$text);
+       }
        return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", oembed_replacecb ,$text);
 }
 ?>
\ No newline at end of file