Review changes

- Add file comment in Content\OEmbed
- Add self where relevant
- Remove useless spaces from the XPath expression

diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index db2c130eaf4d93303f6847b9ecdf222eda90237b..020d3b9b76a06b331e8c82baad2a3f0c875fca45 100644 (file)
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -1,9 +1,7 @@
 <?php\r
 \r
-/*\r
- * To change this license header, choose License Headers in Project Properties.\r
- * To change this template file, choose Tools | Templates\r
- * and open the template in the editor.\r
+/**\r
+ * @file src/Content/OEmbed.php\r
  */\r
 \r
 namespace Friendica\Content;\r
@@ -22,17 +20,22 @@ require_once 'include/dba.php';
 require_once 'mod/proxy.php';\r
 \r
 /**\r
- * Description of OEmbed\r
+ * Handles all OEmbed content fetching and replacement\r
+ *\r
+ * OEmbed is a standard used to allow an embedded representation of a URL on\r
+ * third party sites\r
+ *\r
+ * @see https://oembed.com\r
  *\r
- * @author benlo\r
+ * @author Hypolite Petovan <mrpetovan@gmail.com>\r
  */\r
 class OEmbed\r
 {\r
        public static function replaceCallback($matches)\r
        {\r
                $embedurl = $matches[1];\r
-               $j = OEmbed::fetchURL($embedurl);\r
-               $s = OEmbed::formatObject($j);\r
+               $j = self::fetchURL($embedurl);\r
+               $s = self::formatObject($j);\r
 \r
                return $s;\r
        }\r
@@ -157,7 +160,7 @@ class OEmbed
        public static function formatObject($j)\r
        {\r
                $embedurl = $j->embedurl;\r
-               $jhtml = OEmbed::iframe($j->embedurl, (isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null));\r
+               $jhtml = self::iframe($j->embedurl, (isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null));\r
                $ret = "<span class='oembed " . $j->type . "'>";\r
                switch ($j->type) {\r
                        case "video":\r
@@ -268,7 +271,7 @@ class OEmbed
                        }\r
                        $xpath = new DOMXPath($dom);\r
 \r
-                       $xattr = OEmbed::buildXPath("class", "oembed");\r
+                       $xattr = self::buildXPath("class", "oembed");\r
                        $entries = $xpath->query("//span[$xattr]");\r
 \r
                        $xattr = "@rel='oembed'"; //oe_build_xpath("rel","oembed");\r
@@ -278,7 +281,7 @@ class OEmbed
                                        $e->parentNode->replaceChild(new DOMText("[embed]" . $href . "[/embed]"), $e);\r
                                }\r
                        }\r
-                       return OEmbed::getInnerHTML($dom->getElementsByTagName("body")->item(0));\r
+                       return self::getInnerHTML($dom->getElementsByTagName("body")->item(0));\r
                } else {\r
                        return $text;\r
                }\r
@@ -329,7 +332,7 @@ class OEmbed
        private static function buildXPath($attr, $value)\r
        {\r
                // https://www.westhoffswelt.de/blog/2009/6/9/select-html-elements-with-more-than-one-css-class-using-xpath\r
-               return "contains( normalize-space( @$attr ), ' $value ' ) or substring( normalize-space( @$attr ), 1, string-length( '$value' ) + 1 ) = '$value ' or substring( normalize-space( @$attr ), string-length( @$attr ) - string-length( '$value' ) ) = ' $value' or @$attr = '$value'";\r
+               return "contains(normalize-space(@$attr), ' $value ') or substring(normalize-space(@$attr), 1, string-length('$value') + 1) = '$value ' or substring(normalize-space(@$attr), string-length(@$attr) - string-length('$value')) = ' $value' or @$attr = '$value'";\r
        }\r
 \r
        /**\r