DFRN: Improved delivery status handling

[friendica.git] / include / oembed.php

diff --git a/include/oembed.php b/include/oembed.php
index 80b49fbf046c7095c9724a1e550bc75ed890ab91..cb23517cdbabbfc17b44e502437143cd05e3cc8b 100755 (executable)
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -82,11 +82,8 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
                } else {        //save in cache
                        $j = json_decode($txt);
                        if ($j->type != "error") {
-                               q("INSERT INTO `oembed` (`url`, `content`, `created`) VALUES ('%s', '%s', '%s')
-                                       ON DUPLICATE KEY UPDATE `content` = '%s', `created` = '%s'",
-                                       dbesc(normalise_link($embedurl)),
-                                       dbesc($txt), dbesc(datetime_convert()),
-                                       dbesc($txt), dbesc(datetime_convert()));
+                               dba::insert('oembed', array('url' => normalise_link($embedurl),
+                                                       'content' => $txt, 'created' => datetime_convert()), true);
                        }
 
                        Cache::set($a->videowidth.$embedurl, $txt, CACHE_DAY);
@@ -108,7 +105,7 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
        $j->embedurl = $embedurl;
 
        // If fetching information doesn't work, then improve via internal functions
-       if (($j->type == "error") OR ($no_rich_type AND ($j->type == "rich"))) {
+       if (($j->type == "error") || ($no_rich_type && ($j->type == "rich"))) {
                $data = ParseUrl::getSiteinfoCached($embedurl, true, false);
                $j->type = $data["type"];
 
@@ -194,7 +191,7 @@ function oembed_format_object($j){
                        if (isset($j->author_name)) {
                                $ret.=" (".$j->author_name.")";
                        }
-               } elseif (isset($j->provider_name) OR isset($j->author_name)) {
+               } elseif (isset($j->provider_name) || isset($j->author_name)) {
                        $embedlink = "";
                        if (isset($j->provider_name)) {
                                $embedlink .= $j->provider_name;
@@ -304,9 +301,11 @@ function oembed_html2bbcode($text) {
                $entries = $xpath->query("//span[$xattr]");
 
                $xattr = "@rel='oembed'";//oe_build_xpath("rel","oembed");
-               foreach($entries as $e) {
+               foreach ($entries as $e) {
                        $href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue;
-                       if(!is_null($href)) $e->parentNode->replaceChild(new DOMText("[embed]".$href."[/embed]"), $e);
+                       if (!is_null($href)) {
+                               $e->parentNode->replaceChild(new DOMText("[embed]".$href."[/embed]"), $e);
+                       }
                }
                return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) );
        } else {