]> git.wh0rd.org - tt-rss.git/blobdiff - include/functions2.php
move the following to Feeds:
[tt-rss.git] / include / functions2.php
index 6674c77346d9e1c0125a423104d921d3e0f48284..7ebf4a0cfe92a09df35e9a5078c2a44687f1380e 100644 (file)
 
                $params['simple_update'] = defined('SIMPLE_UPDATE_MODE') && SIMPLE_UPDATE_MODE;
 
+               $params["icon_alert"] = base64_img("images/alert.png");
+               $params["icon_information"] = base64_img("images/information.png");
+               $params["icon_cross"] = base64_img("images/cross.png");
+               $params["icon_indicator_white"] = base64_img("images/indicator_white.gif");
+
                return $params;
        }
 
                                                $last_error = db_fetch_result($result, 0, "last_error");
                                                $last_updated = db_fetch_result($result, 0, "last_updated");
                                        } else {
-                                               $feed_title = getFeedTitle($feed);
+                                               $feed_title = Feeds::getFeedTitle($feed);
                                        }
                                }
                        }
                $doc->loadHTML($charset_hack . $res);
                $xpath = new DOMXPath($doc);
 
-               $entries = $xpath->query('(//a[@href]|//img[@src]|//video/source[@src])');
-
                $ttrss_uses_https = parse_url(get_self_url_prefix(), PHP_URL_SCHEME) === 'https';
+               $rewrite_base_url = $site_url ? $site_url : SELF_URL_PATH;
+
+               $entries = $xpath->query('(//a[@href]|//img[@src]|//video/source[@src]|//audio/source[@src])');
 
                foreach ($entries as $entry) {
 
-                       if ($site_url) {
+                       if ($entry->hasAttribute('href')) {
+                               $entry->setAttribute('href',
+                                       rewrite_relative_url($rewrite_base_url, $entry->getAttribute('href')));
+
+                               $entry->setAttribute('rel', 'noopener noreferrer');
+                       }
+
+                       if ($entry->hasAttribute('src')) {
+                               $src = rewrite_relative_url($rewrite_base_url, $entry->getAttribute('src'));
+                               $cached_filename = CACHE_DIR . '/images/' . sha1($src);
+
+                               if (file_exists($cached_filename)) {
+
+                                       // this is strictly cosmetic
+                                       if ($entry->tagName == 'img') {
+                                               $suffix = ".png";
+                                       } else if ($entry->parentNode && $entry->parentNode->tagName == "video") {
+                                               $suffix = ".mp4";
+                                       } else if ($entry->parentNode && $entry->parentNode->tagName == "audio") {
+                                               $suffix = ".ogg";
+                                       } else {
+                                               $suffix = "";
+                                       }
+
+                                       $src = get_self_url_prefix() . '/public.php?op=cached_url&hash=' . sha1($src) . $suffix;
 
-                               if ($entry->hasAttribute('href')) {
-                                       $entry->setAttribute('href',
-                                               rewrite_relative_url($site_url, $entry->getAttribute('href')));
+                                       if ($entry->hasAttribute('srcset')) {
+                                               $entry->removeAttribute('srcset');
+                                       }
 
-                                       $entry->setAttribute('rel', 'noopener noreferrer');
+                                       if ($entry->hasAttribute('sizes')) {
+                                               $entry->removeAttribute('sizes');
+                                       }
                                }
 
-                               if ($entry->hasAttribute('src')) {
-                                       $src = rewrite_relative_url($site_url, $entry->getAttribute('src'));
+                               $entry->setAttribute('src', $src);
+                       }
+
+                       if ($entry->nodeName == 'img') {
 
-                                       $extension = $entry->tagName == 'source' ? '.mp4' : '.png';
-                                       $cached_filename = CACHE_DIR . '/images/' . sha1($src) . $extension;
+                               if ($entry->hasAttribute('src')) {
+                                       $is_https_url = parse_url($entry->getAttribute('src'), PHP_URL_SCHEME) === 'https';
 
-                                       if (file_exists($cached_filename)) {
-                                               $src = SELF_URL_PATH . '/public.php?op=cached_image&hash=' . sha1($src) . $extension;
+                                       if ($ttrss_uses_https && !$is_https_url) {
 
                                                if ($entry->hasAttribute('srcset')) {
                                                        $entry->removeAttribute('srcset');
                                                        $entry->removeAttribute('sizes');
                                                }
                                        }
-
-                                       $entry->setAttribute('src', $src);
                                }
-                               
-                               if ($entry->nodeName == 'img') {
 
-                                       if ($entry->hasAttribute('src')) {
-                                               $is_https_url = parse_url($entry->getAttribute('src'), PHP_URL_SCHEME) === 'https';
+                               if (($owner && get_pref("STRIP_IMAGES", $owner)) ||
+                                               $force_remove_images || $_SESSION["bw_limit"]) {
 
-                                               if ($ttrss_uses_https && !$is_https_url) {
+                                       $p = $doc->createElement('p');
 
-                                                       if ($entry->hasAttribute('srcset')) {
-                                                               $entry->removeAttribute('srcset');
-                                                       }
+                                       $a = $doc->createElement('a');
+                                       $a->setAttribute('href', $entry->getAttribute('src'));
 
-                                                       if ($entry->hasAttribute('sizes')) {
-                                                               $entry->removeAttribute('sizes');
-                                                       }
-                                               }
-                                       }
-
-                                       if (($owner && get_pref("STRIP_IMAGES", $owner)) ||
-                                                       $force_remove_images || $_SESSION["bw_limit"]) {
-
-                                               $p = $doc->createElement('p');
-
-                                               $a = $doc->createElement('a');
-                                               $a->setAttribute('href', $entry->getAttribute('src'));
-
-                                               $a->appendChild(new DOMText($entry->getAttribute('src')));
-                                               $a->setAttribute('target', '_blank');
+                                       $a->appendChild(new DOMText($entry->getAttribute('src')));
+                                       $a->setAttribute('target', '_blank');
+                                       $a->setAttribute('rel', 'noopener noreferrer');
 
-                                               $p->appendChild($a);
+                                       $p->appendChild($a);
 
-                                               $entry->parentNode->replaceChild($p, $entry);
-                                       }
+                                       $entry->parentNode->replaceChild($p, $entry);
                                }
                        }
 
                        if (strtolower($entry->nodeName) == "a") {
                                $entry->setAttribute("target", "_blank");
+                               $entry->setAttribute("rel", "noopener noreferrer");
                        }
                }
 
                }
        }
 
-       function get_article_tags($id, $owner_uid = 0, $tag_cache = false) {
-
-               $a_id = db_escape_string($id);
-
-               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
-
-               $query = "SELECT DISTINCT tag_name,
-                       owner_uid as owner FROM
-                       ttrss_tags WHERE post_int_id = (SELECT int_id FROM ttrss_user_entries WHERE
-                       ref_id = '$a_id' AND owner_uid = '$owner_uid' LIMIT 1) ORDER BY tag_name";
-
-               $tags = array();
-
-               /* check cache first */
-
-               if ($tag_cache === false) {
-                       $result = db_query("SELECT tag_cache FROM ttrss_user_entries
-                               WHERE ref_id = '$id' AND owner_uid = $owner_uid");
-
-                       if (db_num_rows($result) != 0)
-                               $tag_cache = db_fetch_result($result, 0, "tag_cache");
-               }
-
-               if ($tag_cache) {
-                       $tags = explode(",", $tag_cache);
-               } else {
-
-                       /* do it the hard way */
-
-                       $tmp_result = db_query($query);
-
-                       while ($tmp_line = db_fetch_assoc($tmp_result)) {
-                               array_push($tags, $tmp_line["tag_name"]);
-                       }
-
-                       /* update the cache */
-
-                       $tags_str = db_escape_string(join(",", $tags));
-
-                       db_query("UPDATE ttrss_user_entries
-                               SET tag_cache = '$tags_str' WHERE ref_id = '$id'
-                               AND owner_uid = $owner_uid");
-               }
-
-               return $tags;
-       }
-
        function trim_array($array) {
                $tmp = $array;
                array_walk($tmp, 'trim');
                exit;
        }
 
-       function format_warning($msg, $id = "") {
-               return "<div class=\"alert\" id=\"$id\">$msg</div>";
-       }
-
-       function format_notice($msg, $id = "") {
-               return "<div class=\"alert alert-info\" id=\"$id\">$msg</div>";
-       }
-
-       function format_error($msg, $id = "") {
-               return "<div class=\"alert alert-danger\" id=\"$id\">$msg</div>";
-       }
-
-       function print_notice($msg) {
-               return print format_notice($msg);
-       }
-
-       function print_warning($msg) {
-               return print format_warning($msg);
-       }
-
-       function print_error($msg) {
-               return print format_error($msg);
-       }
-
-
        function T_sprintf() {
                $args = func_get_args();
                return vsprintf(__(array_shift($args)), $args);
        }
 
-       function format_inline_player($url, $ctype) {
-
-               $entry = "";
-
-               $url = htmlspecialchars($url);
-
-               if (strpos($ctype, "audio/") === 0) {
-
-                       if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false ||
-                               $_SESSION["hasMp3"])) {
-
-                               $entry .= "<audio preload=\"none\" controls>
-                                       <source type=\"$ctype\" src=\"$url\"/>
-                                       </audio>";
-
-                       } else {
-
-                               $entry .= "<object type=\"application/x-shockwave-flash\"
-                                       data=\"lib/button/musicplayer.swf?song_url=$url\"
-                                       width=\"17\" height=\"17\" style='float : left; margin-right : 5px;'>
-                                       <param name=\"movie\"
-                                               value=\"lib/button/musicplayer.swf?song_url=$url\" />
-                                       </object>";
-                       }
-
-                       if ($entry) $entry .= "&nbsp; <a target=\"_blank\"
-                               href=\"$url\">" . basename($url) . "</a>";
-
-                       return $entry;
-
-               }
-
-               return "";
-
-/*             $filename = substr($url, strrpos($url, "/")+1);
-
-               $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
-                       $filename . " (" . $ctype . ")" . "</a>"; */
-
-       }
-
-       function format_article($id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) {
-               if (!$owner_uid) $owner_uid = $_SESSION["uid"];
-
-               $rv = array();
-
-               $rv['id'] = $id;
-
-               /* we can figure out feed_id from article id anyway, why do we
-                * pass feed_id here? let's ignore the argument :(*/
-
-               $result = db_query("SELECT feed_id FROM ttrss_user_entries
-                       WHERE ref_id = '$id'");
-
-               $feed_id = (int) db_fetch_result($result, 0, "feed_id");
-
-               $rv['feed_id'] = $feed_id;
-
-               //if (!$zoom_mode) { print "<article id='$id'><![CDATA["; };
-
-               if ($mark_as_read) {
-                       $result = db_query("UPDATE ttrss_user_entries
-                               SET unread = false,last_read = NOW()
-                               WHERE ref_id = '$id' AND owner_uid = $owner_uid");
-
-                       ccache_update($feed_id, $owner_uid);
-               }
-
-               $result = db_query("SELECT id,title,link,content,feed_id,comments,int_id,lang,
-                       ".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
-                       (SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url,
-                       (SELECT title FROM ttrss_feeds WHERE id = feed_id) as feed_title,
-                       (SELECT hide_images FROM ttrss_feeds WHERE id = feed_id) as hide_images,
-                       (SELECT always_display_enclosures FROM ttrss_feeds WHERE id = feed_id) as always_display_enclosures,
-                       num_comments,
-                       tag_cache,
-                       author,
-                       guid,
-                       orig_feed_id,
-                       note
-                       FROM ttrss_entries,ttrss_user_entries
-                       WHERE   id = '$id' AND ref_id = id AND owner_uid = $owner_uid");
-
-               if ($result) {
-
-                       $line = db_fetch_assoc($result);
-
-                       $line["tags"] = get_article_tags($id, $owner_uid, $line["tag_cache"]);
-                       unset($line["tag_cache"]);
-
-                       $line["content"] = sanitize($line["content"],
-                               sql_bool_to_bool($line['hide_images']),
-                               $owner_uid, $line["site_url"], false, $line["id"]);
-
-                       foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE) as $p) {
-                               $line = $p->hook_render_article($line);
-                       }
-
-                       $num_comments = (int) $line["num_comments"];
-                       $entry_comments = "";
-
-                       if ($num_comments > 0) {
-                               if ($line["comments"]) {
-                                       $comments_url = htmlspecialchars($line["comments"]);
-                               } else {
-                                       $comments_url = htmlspecialchars($line["link"]);
-                               }
-                               $entry_comments = "<a class=\"postComments\"
-                                       target='_blank' href=\"$comments_url\">$num_comments ".
-                                       _ngettext("comment", "comments", $num_comments)."</a>";
-
-                       } else {
-                               if ($line["comments"] && $line["link"] != $line["comments"]) {
-                                       $entry_comments = "<a class=\"postComments\" target='_blank' href=\"".htmlspecialchars($line["comments"])."\">".__("comments")."</a>";
-                               }
-                       }
-
-                       if ($zoom_mode) {
-                               header("Content-Type: text/html");
-                               $rv['content'] .= "<html><head>
-                                               <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
-                                               <title>Tiny Tiny RSS - ".$line["title"]."</title>".
-                                               stylesheet_tag("css/tt-rss.css").
-                                               stylesheet_tag("css/zoom.css").
-                                               stylesheet_tag("css/dijit.css")."
-
-                                               <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
-                                               <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">
-
-                                       </head><body id=\"ttrssZoom\">";
-                       }
-
-                       $rv['content'] .= "<div class=\"postReply\" id=\"POST-$id\">";
-
-                       $rv['content'] .= "<div class=\"postHeader\" id=\"POSTHDR-$id\">";
-
-                       $entry_author = $line["author"];
-
-                       if ($entry_author) {
-                               $entry_author = __(" - ") . $entry_author;
-                       }
-
-                       $parsed_updated = make_local_datetime($line["updated"], true,
-                               $owner_uid, true);
-
-                       if (!$zoom_mode)
-                               $rv['content'] .= "<div class=\"postDate\">$parsed_updated</div>";
-
-                       if ($line["link"]) {
-                               $rv['content'] .= "<div class='postTitle'><a target='_blank'
-                                       title=\"".htmlspecialchars($line['title'])."\"
-                                       href=\"" .
-                                       htmlspecialchars($line["link"]) . "\">" .
-                                       $line["title"] . "</a>" .
-                                       "<span class='author'>$entry_author</span></div>";
-                       } else {
-                               $rv['content'] .= "<div class='postTitle'>" . $line["title"] . "$entry_author</div>";
-                       }
-
-                       if ($zoom_mode) {
-                               $feed_title = htmlspecialchars($line["feed_title"]);
-
-                               $rv['content'] .= "<div class=\"postFeedTitle\">$feed_title</div>";
-
-                               $rv['content'] .= "<div class=\"postDate\">$parsed_updated</div>";
-                       }
-
-                       $tags_str = format_tags_string($line["tags"], $id);
-                       $tags_str_full = join(", ", $line["tags"]);
-
-                       if (!$tags_str_full) $tags_str_full = __("no tags");
-
-                       if (!$entry_comments) $entry_comments = "&nbsp;"; # placeholder
-
-                       $rv['content'] .= "<div class='postTags' style='float : right'>
-                               <img src='images/tag.png'
-                               class='tagsPic' alt='Tags' title='Tags'>&nbsp;";
-
-                       if (!$zoom_mode) {
-                               $rv['content'] .= "<span id=\"ATSTR-$id\">$tags_str</span>
-                                       <a title=\"".__('Edit tags for this article')."\"
-                                       href=\"#\" onclick=\"editArticleTags($id, $feed_id)\">(+)</a>";
-
-                               $rv['content'] .= "<div dojoType=\"dijit.Tooltip\"
-                                       id=\"ATSTRTIP-$id\" connectId=\"ATSTR-$id\"
-                                       position=\"below\">$tags_str_full</div>";
-
-                               foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) {
-                                       $rv['content'] .= $p->hook_article_button($line);
-                               }
-
-                       } else {
-                               $tags_str = strip_tags($tags_str);
-                               $rv['content'] .= "<span id=\"ATSTR-$id\">$tags_str</span>";
-                       }
-                       $rv['content'] .= "</div>";
-                       $rv['content'] .= "<div clear='both'>";
-
-                       foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
-                               $rv['content'] .= $p->hook_article_left_button($line);
-                       }
-
-                       $rv['content'] .= "$entry_comments</div>";
-
-                       if ($line["orig_feed_id"]) {
-
-                               $tmp_result = db_query("SELECT * FROM ttrss_archived_feeds
-                                       WHERE id = ".$line["orig_feed_id"] . " AND owner_uid = " . $_SESSION["uid"]);
-
-                               if (db_num_rows($tmp_result) != 0) {
-
-                                       $rv['content'] .= "<div clear='both'>";
-                                       $rv['content'] .= __("Originally from:");
-
-                                       $rv['content'] .= "&nbsp;";
-
-                                       $tmp_line = db_fetch_assoc($tmp_result);
-
-                                       $rv['content'] .= "<a target='_blank'
-                                               href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
-                                               $tmp_line['title'] . "</a>";
-
-                                       $rv['content'] .= "&nbsp;";
-
-                                       $rv['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
-                                       $rv['content'] .= "<img title='".__('Feed URL')."' class='tinyFeedIcon' src='images/pub_set.png'></a>";
-
-                                       $rv['content'] .= "</div>";
-                               }
-                       }
-
-                       $rv['content'] .= "</div>";
-
-                       $rv['content'] .= "<div id=\"POSTNOTE-$id\">";
-                               if ($line['note']) {
-                                       $rv['content'] .= format_article_note($id, $line['note'], !$zoom_mode);
-                               }
-                       $rv['content'] .= "</div>";
-
-                       if (!$line['lang']) $line['lang'] = 'en';
-
-                       $rv['content'] .= "<div class=\"postContent\" lang=\"".$line['lang']."\">";
-
-                       $rv['content'] .= $line["content"];
-
-                       if (!$zoom_mode) {
-                               $rv['content'] .= format_article_enclosures($id,
-                                       sql_bool_to_bool($line["always_display_enclosures"]),
-                                       $line["content"],
-                                       sql_bool_to_bool($line["hide_images"]));
-                       }
-
-                       $rv['content'] .= "</div>";
-
-                       $rv['content'] .= "</div>";
-
-               }
-
-               if ($zoom_mode) {
-                       $rv['content'] .= "
-                               <div class='footer'>
-                               <button onclick=\"return window.close()\">".
-                                       __("Close this window")."</button></div>";
-                       $rv['content'] .= "</body></html>";
-               }
-
-               return $rv;
-
-       }
-
        function print_checkpoint($n, $s) {
                $ts = microtime(true);
                echo sprintf("<!-- CP[$n] %.4f seconds -->\n", $ts - $s);
                }
        } // function encrypt_password
 
-       function load_filters($feed_id, $owner_uid, $action_id = false) {
+       function load_filters($feed_id, $owner_uid) {
                $filters = array();
 
                $cat_id = (int)getFeedCategory($feed_id);
                return true;
        }
 
-       function format_tags_string($tags, $id) {
-               if (!is_array($tags) || count($tags) == 0) {
-                       return __("no tags");
-               } else {
-                       $maxtags = min(5, count($tags));
-                       $tags_str = "";
-
-                       for ($i = 0; $i < $maxtags; $i++) {
-                               $tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"viewfeed({feed:'".$tags[$i]."'})\">" . $tags[$i] . "</a>, ";
-                       }
-
-                       $tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str)-2);
-
-                       if (count($tags) > $maxtags)
-                               $tags_str .= ", &hellip;";
-
-                       return $tags_str;
-               }
-       }
-
-       function format_article_labels($labels, $id) {
-
-               if (!is_array($labels)) return '';
-
-               $labels_str = "";
-
-               foreach ($labels as $l) {
-                       $labels_str .= sprintf("<span class='hlLabelRef'
-                               style='color : %s; background-color : %s'>%s</span>",
-                                       $l[2], $l[3], $l[1]);
-                       }
-
-               return $labels_str;
-
-       }
-
-       function format_article_note($id, $note, $allow_edit = true) {
-
-               $str = "<div class='articleNote'        onclick=\"editArticleNote($id)\">
-                       <div class='noteEdit' onclick=\"editArticleNote($id)\">".
-                       ($allow_edit ? __('(edit note)') : "")."</div>$note</div>";
-
-               return $str;
-       }
-
-
-       function get_feed_category($feed_cat, $parent_cat_id = false) {
-               if ($parent_cat_id) {
-                       $parent_qpart = "parent_cat = '$parent_cat_id'";
-                       $parent_insert = "'$parent_cat_id'";
-               } else {
-                       $parent_qpart = "parent_cat IS NULL";
-                       $parent_insert = "NULL";
-               }
-
-               $result = db_query(
-                       "SELECT id FROM ttrss_feed_categories
-                       WHERE $parent_qpart AND title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]);
-
-               if (db_num_rows($result) == 0) {
-                       return false;
-               } else {
-                       return db_fetch_result($result, 0, "id");
-               }
-       }
-
        function add_feed_category($feed_cat, $parent_cat_id = false) {
 
                if (!$feed_cat) return false;
                return false;
        }
 
-       function getArticleFeed($id) {
-               $result = db_query("SELECT feed_id FROM ttrss_user_entries
-                       WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
-
-               if (db_num_rows($result) != 0) {
-                       return db_fetch_result($result, 0, "feed_id");
-               } else {
-                       return 0;
-               }
-       }
-
        /**
         * Fixes incomplete URLs by prepending "http://".
         * Also replaces feed:// with http://, and
 
        }
 
-       function get_article_enclosures($id) {
-
-               $query = "SELECT * FROM ttrss_enclosures
-                       WHERE post_id = '$id' AND content_url != ''";
-
-               $rv = array();
-
-               $result = db_query($query);
-
-               if (db_num_rows($result) > 0) {
-                       while ($line = db_fetch_assoc($result)) {
-                               array_push($rv, $line);
-                       }
-               }
-
-               return $rv;
-       }
-
        /* function save_email_address($email) {
                // FIXME: implement persistent storage of emails
 
                return is_html(fetch_file_contents($url, false, $login, $pass));
        }
 
-       function print_label_select($name, $value, $attributes = "") {
-
-               $result = db_query("SELECT caption FROM ttrss_labels2
-                       WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY caption");
-
-               print "<select default=\"$value\" name=\"" . htmlspecialchars($name) .
-                       "\" $attributes onchange=\"labelSelectOnChange(this)\" >";
-
-               while ($line = db_fetch_assoc($result)) {
-
-                       $issel = ($line["caption"] == $value) ? "selected=\"1\"" : "";
-
-                       print "<option value=\"".htmlspecialchars($line["caption"])."\"
-                               $issel>" . htmlspecialchars($line["caption"]) . "</option>";
-
-               }
-
-#              print "<option value=\"ADD_LABEL\">" .__("Add label...") . "</option>";
-
-               print "</select>";
-
-
-       }
-
-       function format_article_enclosures($id, $always_display_enclosures,
-                                       $article_content, $hide_images = false) {
-
-               $result = get_article_enclosures($id);
-               $rv = '';
-
-               foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ENCLOSURES) as $plugin) {
-                       $retval = $plugin->hook_format_enclosures($rv, $result, $id, $always_display_enclosures, $article_content, $hide_images);
-                       if (is_array($retval)) {
-                               $rv = $retval[0];
-                               $result = $retval[1];
-                       } else {
-                               $rv = $retval;
-                       }
-               }
-               unset($retval); // Unset to prevent breaking render if there are no HOOK_RENDER_ENCLOSURE hooks below.
-
-               if ($rv === '' && !empty($result)) {
-                       $entries_html = array();
-                       $entries = array();
-                       $entries_inline = array();
-
-                       foreach ($result as $line) {
-
-                               $url = $line["content_url"];
-                               $ctype = $line["content_type"];
-                               $title = $line["title"];
-                               $width = $line["width"];
-                               $height = $line["height"];
-
-                               if (!$ctype) $ctype = __("unknown type");
-
-                               //$filename = substr($url, strrpos($url, "/")+1);
-                               $filename = basename($url);
-
-                               $player = format_inline_player($url, $ctype);
-
-                               if ($player) array_push($entries_inline, $player);
-
-#                              $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
-#                                      $filename . " (" . $ctype . ")" . "</a>";
-
-                               $entry = "<div onclick=\"openUrlPopup('".htmlspecialchars($url)."')\"
-                                       dojoType=\"dijit.MenuItem\">$filename ($ctype)</div>";
-
-                               array_push($entries_html, $entry);
-
-                               $entry = array();
-
-                               $entry["type"] = $ctype;
-                               $entry["filename"] = $filename;
-                               $entry["url"] = $url;
-                               $entry["title"] = $title;
-                               $entry["width"] = $width;
-                               $entry["height"] = $height;
-
-                               array_push($entries, $entry);
-                       }
-
-                       if ($_SESSION['uid'] && !get_pref("STRIP_IMAGES") && !$_SESSION["bw_limit"]) {
-                               if ($always_display_enclosures ||
-                                                       !preg_match("/<img/i", $article_content)) {
-
-                                       foreach ($entries as $entry) {
-
-                                       foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ENCLOSURE) as $plugin)
-                                               $retval = $plugin->hook_render_enclosure($entry, $hide_images);
-
-
-                                               if ($retval) {
-                                                       $rv .= $retval;
-                                               } else {
-
-                                                       if (preg_match("/image/", $entry["type"]) ||
-                                                                       preg_match("/\.(jpg|png|gif|bmp)/i", $entry["filename"])) {
-
-                                                                       if (!$hide_images) {
-                                                                               $encsize = '';
-                                                                               if ($entry['height'] > 0)
-                                                                                       $encsize .= ' height="' . intval($entry['height']) . '"';
-                                                                               if ($entry['width'] > 0)
-                                                                                       $encsize .= ' width="' . intval($entry['width']) . '"';
-                                                                               $rv .= "<p><img
-                                                                               alt=\"".htmlspecialchars($entry["filename"])."\"
-                                                                               src=\"" .htmlspecialchars($entry["url"]) . "\"
-                                                                               " . $encsize . " /></p>";
-                                                                       } else {
-                                                                               $rv .= "<p><a target=\"_blank\"
-                                                                               href=\"".htmlspecialchars($entry["url"])."\"
-                                                                               >" .htmlspecialchars($entry["url"]) . "</a></p>";
-                                                                       }
-
-                                                                       if ($entry['title']) {
-                                                                               $rv.= "<div class=\"enclosure_title\">${entry['title']}</div>";
-                                                                       }
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-
-                       if (count($entries_inline) > 0) {
-                               $rv .= "<hr clear='both'/>";
-                               foreach ($entries_inline as $entry) { $rv .= $entry; };
-                               $rv .= "<hr clear='both'/>";
-                       }
-
-                       $rv .= "<div class=\"attachments\" dojoType=\"dijit.form.DropDownButton\">".
-                               "<span>" . __('Attachments')."</span>";
-
-                       $rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-
-                       foreach ($entries as $entry) {
-                               if ($entry["title"])
-                                       $title = " &mdash; " . truncate_string($entry["title"], 30);
-                               else
-                                       $title = "";
-
-                               if ($entry["filename"])
-                                       $filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
-                               else
-                                       $filename = "";
-
-                               $rv .= "<div onclick='openUrlPopup(\"".htmlspecialchars($entry["url"])."\")'
-                                       dojoType=\"dijit.MenuItem\">".$filename . $title."</div>";
-
-                       };
-
-                       $rv .= "</div>";
-                       $rv .= "</div>";
-               }
-
-               return $rv;
-       }
-
        function getLastArticleId() {
                $result = db_query("SELECT ref_id AS id FROM ttrss_user_entries
                        WHERE owner_uid = " . $_SESSION["uid"] . " ORDER BY ref_id DESC LIMIT 1");
                return $parts['scheme'] . "://" . $parts['host'] . $parts['path'];
        }
 
+       function cleanup_url_path($path) {
+               $path = str_replace("/./", "/", $path);
+               $path = str_replace("//", "/", $path);
+
+               return $path;
+       }
+
        /**
         * Converts a (possibly) relative URL to a absolute one.
         *
                } else if (strpos($rel_url, "/") === 0) {
                        $parts = parse_url($url);
                        $parts['path'] = $rel_url;
+                       $parts['path'] = cleanup_url_path($parts['path']);
 
                        return build_url($parts);
 
                                $dir !== '/' && $dir .= '/';
                        }
                        $parts['path'] = $dir . $rel_url;
+                       $parts['path'] = cleanup_url_path($parts['path']);
 
                        return build_url($parts);
                }
                return null;
        }
 
-       function tmpdirname($path, $prefix) {
-               // Use PHP's tmpfile function to create a temporary
-               // directory name. Delete the file and keep the name.
-               $tempname = tempnam($path,$prefix);
-               if (!$tempname)
-                       return false;
-
-               if (!unlink($tempname))
-                       return false;
-
-       return $tempname;
-       }
-
        function getFeedCategory($feed) {
                $result = db_query("SELECT cat_id FROM ttrss_feeds
                        WHERE id = '$feed'");
                return $rv;
        }
 
-       function stylesheet_tag($filename) {
-               $timestamp = filemtime($filename);
-
-               return "<link rel=\"stylesheet\" type=\"text/css\" href=\"$filename?$timestamp\"/>\n";
-       }
-
-       function javascript_tag($filename) {
-               $query = "";
-
-               if (!(strpos($filename, "?") === FALSE)) {
-                       $query = substr($filename, strpos($filename, "?")+1);
-                       $filename = substr($filename, 0, strpos($filename, "?"));
-               }
-
-               $timestamp = filemtime($filename);
-
-               if ($query) $timestamp .= "&$query";
-
-               return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
-       }
-
        function calculate_dep_timestamp() {
                $files = array_merge(glob("js/*.js"), glob("css/*.css"));
 
                return false;
        }
 
+       /**
+        * @SuppressWarnings(unused)
+        */
        function error_json($code) {
                require_once "errors.php";
 
 
                return $errors[$code];
        }
-?>
+
+       function base64_img($filename) {
+               if (file_exists($filename)) {
+                        $ext = pathinfo($filename, PATHINFO_EXTENSION);
+
+                       return "data:image/$ext;base64," . base64_encode(file_get_contents($filename));
+               } else {
+                       return "";
+               }
+       }
+