]> git.wh0rd.org - tt-rss.git/blobdiff - functions.php
daemon: fallback automatically when pcntl_signal() is not present
[tt-rss.git] / functions.php
index 656cadf7c7c41f22842fea0d552d99c1ff608301..a1aabf9a56296993b374a9c0d5f5af2b225e25a4 100644 (file)
                }
        } // If translations are enabled.
 
+       if (defined('MEMCACHE_SERVER')) {
+               $memcache = new Memcache;
+               $memcache->connect(MEMCACHE_SERVER, 11211);
+       }
+
        require_once 'db-prefs.php';
        require_once 'compat.php';
        require_once 'errors.php';
 
        }
 
-       function update_rss_feed($link, $feed_url, $feed, $ignore_daemon = false) {
+       function update_rss_feed($link, $feed, $ignore_daemon = false) {
+
+               global $memcache;
+
+               /* Update all feeds with the same URL to utilize memcache */
+
+               if ($memcache) {
+                       $result = db_query($link, "SELECT f1.id 
+                               FROM ttrss_feeds AS f1, ttrss_feeds AS f2 
+                               WHERE   f2.feed_url = f1.feed_url AND f2.id = '$feed'");
+
+                       while ($line = db_fetch_assoc($result)) {
+                               update_rss_feed_real($link, $line["id"], $ignore_daemon);
+                       }
+               } else {
+                       update_rss_feed_real($link, $feed, $ignore_daemon);
+               }
+       }
+
+       function update_rss_feed_real($link, $feed, $ignore_daemon = false) {
+
+               global $memcache;
 
                if (!$_REQUEST["daemon"] && !$ignore_daemon) {
                        return false;
                } else {
 
                        $result = db_query($link, "SELECT id,update_interval,auth_login,
-                               auth_pass,cache_images,update_method,last_updated
+                               feed_url,auth_pass,cache_images,update_method,last_updated
                                FROM ttrss_feeds WHERE id = '$feed'");
 
                }
 
                if (db_num_rows($result) == 0) {
                        if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
-                               _debug("update_rss_feed: feed $feed [$feed_url] NOT FOUND/SKIPPED");
+                               _debug("update_rss_feed: feed $feed NOT FOUND/SKIPPED");
                        }               
                        return false;
                }
 
                $update_interval = db_fetch_result($result, 0, "update_interval");
                $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
+               $fetch_url = db_fetch_result($result, 0, "feed_url");
 
                if ($update_interval < 0) { return; }
 
                $feed = db_escape_string($feed);
 
-               $fetch_url = $feed_url;
-
                if ($auth_login && $auth_pass) {
                        $url_parts = array();
                        preg_match("/(^[^:]*):\/\/(.*)/", $fetch_url, $url_parts);
                        error_reporting(0);
                }
 
-               if (!$use_simplepie) {
-                       $rss = fetch_rss($fetch_url);
-               } else {
-                       if (!is_dir(SIMPLEPIE_CACHE_DIR)) {
-                               mkdir(SIMPLEPIE_CACHE_DIR);
-                       }
-
-                       $rss = new SimplePie();
-                       $rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT);
-#                      $rss->set_timeout(10);
-                       $rss->set_feed_url($fetch_url);
-                       $rss->set_output_encoding('UTF-8');
+               $obj_id = md5("FDATA:$fetch_url");
 
-                       if (SIMPLEPIE_CACHE_IMAGES && $cache_images) {
-                               if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
-                                       _debug("enabling image cache");
-                               }
-
-                               $rss->set_image_handler('./image.php', 'i');
-                       }
+               if ($memcache && $obj = $memcache->get($obj_id)) {
 
                        if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
-                               _debug("feed update interval (sec): " .
-                                       get_feed_update_interval($link, $feed)*60);
+                               _debug("update_rss_feed: data found in memcache.");
                        }
 
-                       if (is_dir(SIMPLEPIE_CACHE_DIR)) {
-                               $rss->set_cache_location(SIMPLEPIE_CACHE_DIR);
-                               $rss->set_cache_duration(get_feed_update_interval($link, $feed) * 60);
+                       $rss = $obj;
+
+               } else {
+
+                       if (!$use_simplepie) {
+                               $rss = fetch_rss($fetch_url);
+                       } else {
+                               if (!is_dir(SIMPLEPIE_CACHE_DIR)) {
+                                       mkdir(SIMPLEPIE_CACHE_DIR);
+                               }
+       
+                               $rss = new SimplePie();
+                               $rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT);
+       #                       $rss->set_timeout(10);
+                               $rss->set_feed_url($fetch_url);
+                               $rss->set_output_encoding('UTF-8');
+       
+                               if (SIMPLEPIE_CACHE_IMAGES && $cache_images) {
+                                       if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
+                                               _debug("enabling image cache");
+                                       }
+       
+                                       $rss->set_image_handler('./image.php', 'i');
+                               }
+       
+                               if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
+                                       _debug("feed update interval (sec): " .
+                                               get_feed_update_interval($link, $feed)*60);
+                               }
+       
+                               if (is_dir(SIMPLEPIE_CACHE_DIR)) {
+                                       $rss->set_cache_location(SIMPLEPIE_CACHE_DIR);
+                                       $rss->set_cache_duration(get_feed_update_interval($link, $feed) * 60);
+                               }
+       
+                               $rss->init();
                        }
 
-                       $rss->init();
+                       if ($memcache && $rss) $memcache->add($obj_id, $rss, 0, 300);
                }
 
 //             print_r($rss);
 
                                # check for manual tags
 
-                               $tag_filter = find_article_filter($article_filters, "tag"); 
-
-                               if ($tag_filter) {
+                               foreach ($article_filters as $f) {
+                                       if ($f[0] == "tag") {
 
-                                       $manual_tags = trim_array(split(",", $tag_filter[1]));
+                                               $manual_tags = trim_array(split(",", $f[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);
+                                                       }
                                                }
                                        }
                                }
                        $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";
 
        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;
 
        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")) {
                return $theme_path;
        }
 
+       function get_user_theme_options($link) {
+               $t = get_user_theme_path($link);
+
+               if ($t) {
+                       if (is_file("$t/theme.ini")) {
+                               $ini = parse_ini_file("$t/theme.ini", true);
+                               if ($ini['theme']['version']) {
+                                       return $ini['theme']['options'];
+                               }
+                       }
+               }
+               return false;
+       }
+
+
        function get_all_themes() {
                $themes = glob("themes/*");
 
                                        $entry["name"] = $ini['theme']['name'];
                                        $entry["version"] = $ini['theme']['version'];
                                        $entry["author"] = $ini['theme']['author'];
+                                       $entry["options"] = $ini['theme']['options'];
                                        array_push($rv, $entry);
                                }
                        }
        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;
                                        $cat_qpart = "cat_id IS NULL";
                                }
                                
-                               $tmp_result = db_query($link, "SELECT id,feed_url FROM ttrss_feeds
+                               $tmp_result = db_query($link, "SELECT id FROM ttrss_feeds
                                        WHERE $cat_qpart AND owner_uid = " . $_SESSION["uid"]);
 
                                while ($tmp_line = db_fetch_assoc($tmp_result)) {                                       
-                                       $feed_url = $tmp_line["feed_url"];
                                        $feed_id = $tmp_line["id"];
-                                       update_rss_feed($link, $feed_url, $feed_id, $force_update);
+                                       update_rss_feed($link, $feed_id, $force_update);
                                }
 
                        } else {
-                               $tmp_result = db_query($link, "SELECT feed_url FROM ttrss_feeds
-                                       WHERE id = '$feed'");
-                               $feed_url = db_fetch_result($tmp_result, 0, "feed_url");                                
-                               update_rss_feed($link, $feed_url, $feed, $force_update);
+                               update_rss_feed($link, $feed, $force_update);
                        }
        }
 
                getVirtCounters($link);
 
                if (strchr($omode, "l")) getLabelCounters($link);
-               if (strchr($omode, "f")) getFeedCounters($link, SMART_RPC_COUNTERS, $active_feed);
+               if (strchr($omode, "f")) getFeedCounters($link, $active_feed);
                if (strchr($omode, "t")) getTagCounters($link);
                if (strchr($omode, "c")) {                      
                        if (get_pref($link, 'ENABLE_FEED_CATS')) {
                return db_fetch_result($result, 0, "fn");
        }
 
-       function getTagCounters($link, $smart_mode = SMART_RPC_COUNTERS) {
-
-               if ($smart_mode) {
-                       if (!$_SESSION["tctr_last_value"]) {
-                               $_SESSION["tctr_last_value"] = array();
-                       }
-               }
-
-               $old_counters = $_SESSION["tctr_last_value"];
-
-               $tctrs_modified = false;
+       function getTagCounters($link) {
 
                $age_qpart = getMaxAgeSubquery();
 
 
                foreach (array_keys($tags) as $tag) {
                        $unread = $tags[$tag];                  
-
                        $tag = htmlspecialchars($tag);
-
-                       if (!$smart_mode || $old_counters[$tag] != $unread) {                   
-                               $old_counters[$tag] = $unread;
-                               $tctrs_modified = true;
-                               print "<counter type=\"tag\" id=\"$tag\" counter=\"$unread\"/>";
-                       }
-
+                       print "<counter type=\"tag\" id=\"$tag\" counter=\"$unread\"/>";
                } 
-
-               if ($smart_mode && $tctrs_modified) {
-                       $_SESSION["tctr_last_value"] = $old_counters;
-               }
-
        }
 
-       function getVirtCounters($link, $smart_mode = SMART_RPC_COUNTERS, $ret_mode = false) {
+       function getVirtCounters($link, $ret_mode = false) {
 
                $ret_arr = array();
 
                return $ret_arr;
        }
 
-       function getLabelCounters($link, $smart_mode = SMART_RPC_COUNTERS, $ret_mode = false) {
+       function getLabelCounters($link, $ret_mode = false) {
 
                $age_qpart = getMaxAgeSubquery();
 
-               if ($smart_mode) {
-                       if (!$_SESSION["lctr_last_value"]) {
-                               $_SESSION["lctr_last_value"] = array();
-                       }
-               }
-
-               $old_counters = $_SESSION["lctr_last_value"];
-               $lctrs_modified = false;
+               $owner_uid = $_SESSION["uid"];
 
+               $result = db_query($link, "SELECT id, caption FROM ttrss_labels2
+                       WHERE owner_uid = '$owner_uid'");
+       
+               while ($line = db_fetch_assoc($result)) {
 
-                       $owner_uid = $_SESSION["uid"];
+                       $id = -$line["id"] - 11;
 
-                       $result = db_query($link, "SELECT id, caption FROM ttrss_labels2
-                               WHERE owner_uid = '$owner_uid'");
-               
-                       while ($line = db_fetch_assoc($result)) {
-       
-                               $id = -$line["id"] - 11;
-       
-                               $label_name = $line["caption"];
-                               $count = getFeedUnread($link, $id);
-               
-                               if (!$smart_mode || $old_counters[$id] != $count) {     
-                                       $old_counters[$id] = $count;
-                                       $lctrs_modified = true;
-                                       if (!$ret_mode) {
-       
-                                               if (get_pref($link, 'EXTENDED_FEEDLIST')) {
-                                                       $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
-                                               } else {
-                                                       $xmsg_part = "";
-                                               }
+                       $label_name = $line["caption"];
+                       $count = getFeedUnread($link, $id);
        
-                                               print "<counter type=\"label\" id=\"$id\" counter=\"$count\" $xmsg_part/>";
-                                       } else {
-                                               $ret_arr[$id]["counter"] = $count;
-                                               $ret_arr[$id]["description"] = $label_name;
-                                       }
+                       if (!$ret_mode) {
+
+                               if (get_pref($link, 'EXTENDED_FEEDLIST')) {
+                                       $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
+                               } else {
+                                       $xmsg_part = "";
                                }
-       
-                               error_reporting (DEFAULT_ERROR_LEVEL);
-                       }
 
-               if ($smart_mode && $lctrs_modified) {
-                       $_SESSION["lctr_last_value"] = $old_counters;
-               }
+                               print "<counter type=\"label\" id=\"$id\" counter=\"$count\" $xmsg_part/>";
 
+                       } else {
+                               $ret_arr[$id]["counter"] = $count;
+                               $ret_arr[$id]["description"] = $label_name;
+                       }
+               }
+       
                return $ret_arr;
        }
 
-       function getFeedCounters($link, $smart_mode = SMART_RPC_COUNTERS, $active_feed = false) {
+       function getFeedCounters($link, $active_feed = false) {
 
                $age_qpart = getMaxAgeSubquery();
 
-               if ($smart_mode) {
-                       if (!$_SESSION["fctr_last_value"]) {
-                               $_SESSION["fctr_last_value"] = array();
-                       }
-               }
-
-               $old_counters = $_SESSION["fctr_last_value"];
-
                $query = "SELECT ttrss_feeds.id,
                                ttrss_feeds.title,
                                ".SUBSTRING_FOR_DATE."(ttrss_feeds.last_updated,1,19) AS last_updated, 
 
                        $count += db_fetch_result($tmp_result, 0, "unread");
 
-                       if (!$smart_mode || $old_counters[$id] != $count) {
-                               $old_counters[$id] = $count;
-                               $fctrs_modified = true;
-
-                               if ($last_error) {
-                                       $error_part = "error=\"$last_error\"";
-                               } else {
-                                       $error_part = "";
-                               }
-
-                               if ($has_img) {
-                                       $has_img_part = "hi=\"$has_img\"";
-                               } else {
-                                       $has_img_part = "";
-                               }                               
+                       if ($last_error) {
+                               $error_part = "error=\"$last_error\"";
+                       } else {
+                               $error_part = "";
+                       }
 
-                               if ($active_feed && $id == $active_feed) {
-                                       $has_title_part = "title=\"" . htmlspecialchars($line["title"]) . "\"";
-                               } else {
-                                       $has_title_part = "";
-                               }
+                       if ($has_img) {
+                               $has_img_part = "hi=\"$has_img\"";
+                       } else {
+                               $has_img_part = "";
+                       }                               
 
-                               if (get_pref($link, 'EXTENDED_FEEDLIST')) {
-                                       $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
-                               }
+                       if ($active_feed && $id == $active_feed) {
+                               $has_title_part = "title=\"" . htmlspecialchars($line["title"]) . "\"";
+                       } else {
+                               $has_title_part = "";
+                       }
 
-                               print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" $has_img_part $error_part updated=\"$last_updated\" $xmsg_part $has_title_part/>";
+                       if (get_pref($link, 'EXTENDED_FEEDLIST')) {
+                               $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
                        }
-               }
 
-               if ($smart_mode && $fctrs_modified) {
-                       $_SESSION["fctr_last_value"] = $old_counters;
+                       print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" $has_img_part $error_part updated=\"$last_updated\" $xmsg_part $has_title_part/>";
                }
        }
 
                        $feed_id = db_fetch_result($result, 0, "id");
        
                        if ($feed_id) {
-                               update_rss_feed($link, $url, $feed_id, true);
+                               update_rss_feed($link, $feed_id, true);
                        }
 
                        return 1;
                }
 
                print "<param key=\"theme\" value=\"".get_user_theme($link)."\"/>";
+               print "<param key=\"theme_options\" value=\"".get_user_theme_options($link)."\"/>";
                print "<param key=\"daemon_enabled\" value=\"" . ENABLE_UPDATE_DAEMON . "\"/>";
                print "<param key=\"feeds_frame_refresh\" value=\"" . FEEDS_FRAME_REFRESH . "\"/>";
                print "<param key=\"daemon_refresh_only\" value=\"true\"/>";
                print "<param key=\"sign_progress\" value=\"".
                        theme_image($link, "images/indicator_white.gif")."\"/>";
 
+               print "<param key=\"sign_progress_tiny\" value=\"".
+                       theme_image($link, "images/indicator_tiny.gif")."\"/>";
+
                print "<param key=\"sign_excl\" value=\"".
                        theme_image($link, "images/sign_excl.png")."\"/>";
 
                if ($match_on == "both") {
 
                        foreach ($keywords as $k) {
-                               array_push($query_keywords, "(UPPER(ttrss_entries.title) LIKE UPPER('%$k%')
-                                       OR UPPER(ttrss_entries.content) LIKE UPPER('%$k%'))");
+                               if (strpos($k, "-") === 0) {
+                                       $k = substr($k, 1);
+                                       $not = "NOT";
+                               } else {
+                                       $not = "";
+                               }
+
+                               array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+                                       OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
                        }
 
                        $search_query_part = implode("AND", $query_keywords) . " AND ";
                } else if ($match_on == "title") {
 
                        foreach ($keywords as $k) {
-                               array_push($query_keywords, "(UPPER(ttrss_entries.title) LIKE UPPER('%$k%'))");
+                               if (strpos($k, "-") === 0) {
+                                       $k = substr($k, 1);
+                                       $not = "NOT";
+                               } else {
+                                       $not = "";
+                               }
+
+                               array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%'))");
                        }
 
                        $search_query_part = implode("AND", $query_keywords) . " AND ";
                } else if ($match_on == "content") {
 
                        foreach ($keywords as $k) {
-                               array_push($query_keywords, "(UPPER(ttrss_entries.content) LIKE UPPER('%$k%'))");
+                               if (strpos($k, "-") === 0) {
+                                       $k = substr($k, 1);
+                                       $not = "NOT";
+                               } else {
+                                       $not = "";
+                               }
+
+                               array_push($query_keywords, "(UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
                        }
                }
 
                        $res = preg_replace('/<img[^>]+>/is', '', $res);
                }
 
-               if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
+               if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW', $owner)) {
                        $res = preg_replace("/href=/i", "target=\"_blank\" href=", $res);
                }
 
 
        function get_article_tags($link, $id, $owner_uid = 0) {
 
+               global $memcache;
+
                $a_id = db_escape_string($id);
 
                if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-               $tmp_result = db_query($link, "SELECT DISTINCT tag_name, 
+               $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");
+                       ref_id = '$a_id' AND owner_uid = '$owner_uid' LIMIT 1) ORDER BY tag_name";
 
+               $obj_id = md5("TAGS:$owner_uid:$id");
                $tags = array();        
-       
-               while ($tmp_line = db_fetch_assoc($tmp_result)) {
-                       array_push($tags, $tmp_line["tag_name"]);                               
+
+               if ($memcache && $obj = $memcache->get($obj_id)) {
+                       $tags = $obj;
+               } else {
+                       $tmp_result = db_query($link, $query);
+
+                       while ($tmp_line = db_fetch_assoc($tmp_result)) {
+                               array_push($tags, $tmp_line["tag_name"]);                               
+                       }
+
+                       if ($memcache) $memcache->add($obj_id, $tags, 0, 3600);
                }
 
                return $tags;
 
                        print $article_content;
 
-                       $result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
-                               post_id = '$id' AND content_url != ''");
+//                     $result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
+//                             post_id = '$id' AND content_url != ''");
 
-                       if (db_num_rows($result) > 0) {
+                       $result = get_article_enclosures($link, $id);
+
+//                     if (db_num_rows($result) > 0) {
+
+                       if (count($result) > 0) {
 
                                $entries_html = array();
                                $entries = array();
 
-                               while ($line = db_fetch_assoc($result)) {
+                               //while ($line = db_fetch_assoc($result)) {
+                               foreach ($result as $line) {
 
                                        $url = $line["content_url"];
                                        $ctype = $line["content_type"];
                                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 {
                                $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>";
                        // We setup a alarm to alert if the feed take more than 300s to update.
                        // => HANG alarm.
                        if(!$from_http && function_exists('pcntl_alarm')) pcntl_alarm(300);
-                       update_rss_feed($link, $line["feed_url"], $line["id"], true);
+                       update_rss_feed($link, $line["id"], true);
                        // Cancel the alarm (the update went well)
                        if(!$from_http && function_exists('pcntl_alarm')) pcntl_alarm(0);
 
        function load_filters($link, $feed, $owner_uid, $action_id = false) {
                $filters = array();
 
-               if ($action_id) $ftype_query_part = "action_id = '$action_id' AND";
-
-               $result = db_query($link, "SELECT reg_exp,
-                       ttrss_filter_types.name AS name,
-                       ttrss_filter_actions.name AS action,
-                       inverse,
-                       action_param,
-                       filter_param
-                       FROM ttrss_filters,ttrss_filter_types,ttrss_filter_actions WHERE                                        
-                               enabled = true AND
-                               $ftype_query_part
-                               owner_uid = $owner_uid AND
-                               ttrss_filter_types.id = filter_type AND
-                               ttrss_filter_actions.id = action_id AND
-                               (feed_id IS NULL OR feed_id = '$feed') ORDER BY reg_exp");
+               global $memcache;
 
-               while ($line = db_fetch_assoc($result)) {
-                       if (!$filters[$line["name"]]) $filters[$line["name"]] = array();
-                               $filter["reg_exp"] = $line["reg_exp"];
-                               $filter["action"] = $line["action"];
-                               $filter["action_param"] = $line["action_param"];
-                               $filter["filter_param"] = $line["filter_param"];
-                               $filter["inverse"] = sql_bool_to_bool($line["inverse"]);
-                       
-                               array_push($filters[$line["name"]], $filter);
-                       }
+               $obj_id = md5("FILTER:$feed:$owner_uid:$action_id");
+
+               if ($memcache && $obj = $memcache->get($obj_id)) {
+
+                       return $obj;
+
+               } else {
+
+                       if ($action_id) $ftype_query_part = "action_id = '$action_id' AND";
+       
+                       $result = db_query($link, "SELECT reg_exp,
+                               ttrss_filter_types.name AS name,
+                               ttrss_filter_actions.name AS action,
+                               inverse,
+                               action_param,
+                               filter_param
+                               FROM ttrss_filters,ttrss_filter_types,ttrss_filter_actions WHERE                                        
+                                       enabled = true AND
+                                       $ftype_query_part
+                                       owner_uid = $owner_uid AND
+                                       ttrss_filter_types.id = filter_type AND
+                                       ttrss_filter_actions.id = action_id AND
+                                       (feed_id IS NULL OR feed_id = '$feed') ORDER BY reg_exp");
+       
+                       while ($line = db_fetch_assoc($result)) {
+                               if (!$filters[$line["name"]]) $filters[$line["name"]] = array();
+                                       $filter["reg_exp"] = $line["reg_exp"];
+                                       $filter["action"] = $line["action"];
+                                       $filter["action_param"] = $line["action_param"];
+                                       $filter["filter_param"] = $line["filter_param"];
+                                       $filter["inverse"] = sql_bool_to_bool($line["inverse"]);
+                               
+                                       array_push($filters[$line["name"]], $filter);
+                               }
+
+                       if ($memcache) $memcache->add($obj_id, $filters, 0, 3600*8);
 
-               return $filters;
+                       return $filters;
+               }
        }
 
        function get_score_pic($score) {
        }
 
        function get_article_labels($link, $id) {
+               global $memcache;
+
                $result = db_query($link, 
                        "SELECT DISTINCT label_id,caption,fg_color,bg_color 
                                FROM ttrss_labels2, ttrss_user_labels2 
                                AND owner_uid = ".$_SESSION["uid"] . "
                        ORDER BY caption");
 
+               $obj_id = md5("LABELS:$id:" . $_SESSION["uid"]);
+
                $rv = array();
 
-               while ($line = db_fetch_assoc($result)) {
-                       $rk = array($line["label_id"], $line["caption"], $line["fg_color"],
-                               $line["bg_color"]);
-                       array_push($rv, $rk);
+               if ($memcache && $obj = $memcache->get($obj_id)) {
+                       return $obj;
+               } else {
+                       while ($line = db_fetch_assoc($result)) {
+                               $rk = array($line["label_id"], $line["caption"], $line["fg_color"],
+                                       $line["bg_color"]);
+                               array_push($rv, $rk);
+                       }
+                       if ($memcache) $memcache->add($obj_id, $rv, 0, 3600);
                }
 
                return $rv;
 
        function label_add_article($link, $id, $label, $owner_uid) {
 
+               global $memcache;
+
+               if ($memcache) {
+                       $obj_id = md5("LABELS:$id:$owner_uid");
+                       $memcache->delete($obj_id);
+               }
+
                $label_id = label_find_id($link, $label, $owner_uid);
 
                if (!$label_id) return;
        }
 
        function label_remove($link, $id, $owner_uid) {
+               global $memcache;
+
+               if ($memcache) {
+                       $obj_id = md5("LABELS:$id:$owner_uid");
+                       $memcache->delete($obj_id);
+               }
 
                db_query($link, "BEGIN");
 
 
        }
 
+       function get_article_enclosures($link, $id) {
+
+               global $memcache;
+
+               $query = "SELECT * FROM ttrss_enclosures 
+                       WHERE post_id = '$id' AND content_url != ''";
+
+               $obj_id = md5("ENCLOSURES:$id");
+
+               $rv = array();
+
+               if ($memcache && $obj = $memcache->get($obj_id)) {
+                       $rv = $obj;
+               } else {
+                       $result = db_query($link, $query);
+
+                       if (db_num_rows($result) > 0) {
+                               while ($line = db_fetch_assoc($result)) {
+                                       array_push($rv, $line);
+                               }
+                               if ($memcache) $memcache->add($obj_id, $rv, 0, 3600);
+                       }
+               }
+
+               return $rv;
+       }
+
 ?>