feedlist: replace a elements with spans

[tt-rss.git] / functions.php

diff --git a/functions.php b/functions.php
index 6a18ffbf3b6f9098528074b8836950771995ce55..a1aabf9a56296993b374a9c0d5f5af2b225e25a4 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -1371,15 +1371,15 @@
 
                                # check for manual tags
 
-                               $tag_filter = find_article_filter($article_filters, "tag"); 
+                               foreach ($article_filters as $f) {
+                                       if ($f[0] == "tag") {
 
-                               if ($tag_filter) {
+                                               $manual_tags = trim_array(split(",", $f[1]));
 
-                                       $manual_tags = trim_array(split(",", $tag_filter[1]));
-
-                                       foreach ($manual_tags as $tag) {
-                                               if (tag_is_valid($tag)) {
-                                                       array_push($entry_tags, $tag);
+                                               foreach ($manual_tags as $tag) {
+                                                       if (tag_is_valid($tag)) {
+                                                               array_push($entry_tags, $tag);
+                                                       }
                                                }
                                        }
                                }
@@ -1657,8 +1657,8 @@
                        $link_title = "Updated: $last_updated";
                }
 
-               $feed = "<a title=\"$link_title\" id=\"FEEDL-$feed_id\" 
-                       href=\"javascript:viewfeed('$feed_id', '', false, '', false, 0);\">$feed_title</a>";
+               $feed = "<span class='feedlink' title=\"$link_title\" id=\"FEEDL-$feed_id\" href=\"#\"
+                       onclick=\"viewfeed('$feed_id');\">$feed_title</span>";
 
 /*             if ($feed_id < -10) {
                        $bg_color = "#00ccff";
@@ -2047,7 +2047,7 @@
 
        function get_user_theme($link) {
 
-               if (get_schema_version($link) >= 63) {
+               if (get_schema_version($link) >= 63 && $_SESSION["uid"]) {
                        $theme_name = get_pref($link, "_THEME_ID");
                        if (is_dir("themes/$theme_name")) {
                                return $theme_name;
@@ -2062,7 +2062,7 @@
 
        function get_user_theme_path($link) {
 
-               if (get_schema_version($link) >= 63) {
+               if (get_schema_version($link) >= 63 && $_SESSION["uid"]) {
                        $theme_name = get_pref($link, "_THEME_ID");
 
                        if ($theme_name && is_dir("themes/$theme_name")) {
@@ -2235,7 +2235,10 @@
        function make_lockfile($filename) {
                $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
 
-               if (flock($fp, LOCK_EX | LOCK_NB)) {            
+               if (flock($fp, LOCK_EX | LOCK_NB)) {
+                       if (function_exists('posix_getpid')) {
+                               fwrite($fp, posix_getpid() . "\n");
+                       }
                        return $fp;
                } else {
                        return false;
@@ -4920,19 +4923,22 @@
                                print "<div class=\"postEnclosures\">";
 
                                if (!get_pref($link, "STRIP_IMAGES")) {
-                                       if ($always_display_enclosures || !preg_match("/<img/i", $article_content)) {
+                                       if ($always_display_enclosures ||
+                                                               !preg_match("/<img/i", $article_content)) {
+                                                                       
                                                foreach ($entries as $entry) {
-                                                       if (preg_match("/image/", $entry["type"])) {
-                                                               print "<p><img 
+
+                                                       if (preg_match("/image/", $entry["type"]) ||
+                                                                       preg_match("/\.(jpg|png|gif|bmp)/i", $entry["filename"])) {
+
+                                                                       print "<p><img
                                                                        alt=\"".htmlspecialchars($entry["filename"])."\"
-                                                                       src=\"" .htmlspecialchars($entry["url"]) . "\"></p>";
+                                                                       src=\"" .htmlspecialchars($entry["url"]) . "\"/></p>";
                                                        }
                                                }
                                        }
                                }
 
-                               print "<div class=\"postEnclosures\">";
-
                                if (db_num_rows($result) == 1) {
                                        print __("Attachment:") . " ";
                                } else {
@@ -5501,9 +5507,12 @@
                                $always_display_enclosures = db_fetch_result($tmp_result, 0, "always_display_enclosures");
 
                                if (!get_pref($link, "STRIP_IMAGES")) {
-                                       if ($always_display_enclosures || !preg_match("/img/i", $article_content)) {
+                                       if ($always_display_enclosures || 
+                                                                       !preg_match("/img/i", $article_content)) {
+
                                                foreach ($entries as $entry) {
-                                                       if (preg_match("/image/", $entry["type"])) {
+                                                       if (preg_match("/image/", $entry["type"]) || 
+                                                               preg_match("/\.(jpg|png|gif|bmp)/i", $entry["filename"])) {
                                                                print "<p><img 
                                                                        alt=\"".htmlspecialchars($entry["filename"])."\"
                                                                        src=\"" .htmlspecialchars($entry["url"]) . "\"></p>";