]> git.wh0rd.org - tt-rss.git/blobdiff - functions.php
move runtime-info to JSON, simplify init-params format
[tt-rss.git] / functions.php
index 2d0f406157b0b2be94d592316d336ba8c86299d4..813e3514511045c30914c4ac1f1c14ea2d6ae7f7 100644 (file)
@@ -1,10 +1,7 @@
 <?php
 
        date_default_timezone_set('UTC');
-
-       if ($_REQUEST["debug"]) {
-               define('DEFAULT_ERROR_LEVEL', E_ALL);
-       }
+       error_reporting(E_ALL & ~E_NOTICE);
 
        require_once 'config.php';
 
                }
        }
 
-       function fetch_file_contents($url, $type) {
+       function fetch_file_contents($url, $type = false) {
                if (USE_CURL_FOR_ICONS) {
                        $ch = curl_init($url);
 
                        curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
                        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
-                       $contents = curl_exec($ch);
+                       $contents = @curl_exec($ch);
                        if ($contents === false) {
                                curl_close($ch);
                                return false;
 
                        return $contents;
                } else {
-                       return file_get_contents($url);
+                       return @file_get_contents($url);
                }
 
        }
 
 #              print "FAVICON [$site_url]: $favicon_url\n";
 
-               error_reporting(0);
-
                $icon_file = ICONS_DIR . "/$feed.ico";
 
                if ($favicon_url && !file_exists($icon_file)) {
                                }
                        }
                }
-
-               error_reporting(DEFAULT_ERROR_LEVEL);
-
        }
 
        function update_rss_feed($link, $feed, $ignore_daemon = false) {
                        _debug("update_rss_feed: fetching [$fetch_url]...");
                }
 
-               if (!defined('DAEMON_EXTENDED_DEBUG') && !$_REQUEST['xdebug']) {
-                       error_reporting(0);
-               }
-
                $obj_id = md5("FDATA:$use_simplepie:$fetch_url");
 
                if ($memcache && $obj = $memcache->get($obj_id)) {
                } else {
 
                        if (!$use_simplepie) {
-                               $rss = fetch_rss($fetch_url);
+                               $rss = @fetch_rss($fetch_url);
                        } else {
                                if (!is_dir(SIMPLEPIE_CACHE_DIR)) {
                                        mkdir(SIMPLEPIE_CACHE_DIR);
 
                if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
                        _debug("update_rss_feed: fetch done, parsing...");
-               } else {
-                       error_reporting (DEFAULT_ERROR_LEVEL);
                }
 
                $feed = db_escape_string($feed);
                                                $dupcheck_qpart = "";
                                        }
 
-//                                     error_reporting(0);
-
                                        /* Collect article tags here so we could filter by them: */
 
                                        $article_filters = get_article_filters($filters, $entry_title, 
                                                continue;
                                        }
 
-//                                     error_reporting (DEFAULT_ERROR_LEVEL);
-
                                        $score = calculate_article_score($article_filters);
 
                                        if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
                                                $result = db_query($link,
                                                        "INSERT INTO ttrss_user_entries 
                                                                (ref_id, owner_uid, feed_id, unread, last_read, marked, 
-                                                                       published, score) 
+                                                                       published, score, tag_cache
                                                        VALUES ('$ref_id', '$owner_uid', '$feed', $unread,
-                                                               $last_read_qpart, $marked, $published, '$score')");
+                                                               $last_read_qpart, $marked, $published, '$score', '')");
 
                                                $result = db_query($link, 
                                                        "SELECT int_id FROM ttrss_user_entries WHERE
                                        'BLACKLISTED_TAGS', $owner_uid, ''), 'utf-8')));
 
                                $filtered_tags = array();
+                               $tags_to_cache = array();
 
                                if ($entry_tags && is_array($entry_tags)) {
                                        foreach ($entry_tags as $tag) {
                                        }
                                } 
 
+                               $filtered_tags = array_unique($filtered_tags);
+
                                if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
                                        _debug("update_rss_feed: filtered article tags:");
                                        print_r($filtered_tags);
                                
                                        db_query($link, "BEGIN");
                        
-                                               foreach ($filtered_tags as $tag) {
+                                       foreach ($filtered_tags as $tag) {
 
-                                                       $tag = sanitize_tag($tag);
-                                                       $tag = db_escape_string($tag);
+                                               $tag = sanitize_tag($tag);
+                                               $tag = db_escape_string($tag);
+
+                                               if (!tag_is_valid($tag)) continue;
+                                               
+                                               $result = db_query($link, "SELECT id FROM ttrss_tags            
+                                                       WHERE tag_name = '$tag' AND post_int_id = '$entry_int_id' AND 
+                                                       owner_uid = '$owner_uid' LIMIT 1");
 
-                                                       if (!tag_is_valid($tag)) continue;
-                                                       
-                                                       $result = db_query($link, "SELECT id FROM ttrss_tags            
-                                                               WHERE tag_name = '$tag' AND post_int_id = '$entry_int_id' AND 
-                                                               owner_uid = '$owner_uid' LIMIT 1");
-       
                                                        if ($result && db_num_rows($result) == 0) {
                                                                
                                                                db_query($link, "INSERT INTO ttrss_tags 
                                                                        (owner_uid,tag_name,post_int_id)
                                                                        VALUES ('$owner_uid','$tag', '$entry_int_id')");
-                                                       }                                                       
-                                               }
+                                                       }
+
+                                               array_push($tags_to_cache, $tag);
+                                       }
+
+                                       /* update the cache */
+                                                       
+                                       $tags_to_cache = array_unique($tags_to_cache);
+               
+                                       $tags_str = db_escape_string(join(",", $tags_to_cache));
+
+                                       db_query($link, "UPDATE ttrss_user_entries 
+                                               SET tag_cache = '$tags_str' WHERE ref_id = '$entry_ref_id'
+                                               AND owner_uid = $owner_uid");
 
                                        db_query($link, "COMMIT");
                                } 
 
        function sanity_check($link) {
 
-               error_reporting(0);
-
                $error_code = 0;
                $schema_version = get_schema_version($link);
 
                        $error_code = 12;
                }
 
-               error_reporting (DEFAULT_ERROR_LEVEL);
-
                if ($error_code != 0) {
                        print_error_xml($error_code);
                        return false;
 
        function file_is_locked($filename) {
                if (function_exists('flock')) {
-                       error_reporting(0);
-                       $fp = fopen(LOCK_DIRECTORY . "/$filename", "r");
-                       error_reporting(DEFAULT_ERROR_LEVEL);
+                       $fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
                        if ($fp) {
                                if (flock($fp, LOCK_EX | LOCK_NB)) {
                                        flock($fp, LOCK_UN);
 
                                } else if ($feed > 0) {
 
-                                       $tmp_result = db_query($link, "SELECT id 
-                                               FROM ttrss_feeds WHERE parent_feed = '$feed'
-                                               ORDER BY cat_id,title");
-
-                                       $parent_ids = array();
-
-                                       if (db_num_rows($tmp_result) > 0) {
-                                               while ($p = db_fetch_assoc($tmp_result)) {
-                                                       array_push($parent_ids, "feed_id = " . $p["id"]);
-                                               }
-
-                                               $children_qpart = implode(" OR ", $parent_ids);
-                                               
-                                               db_query($link, "UPDATE ttrss_user_entries 
-                                                       SET unread = false,last_read = NOW() 
-                                                       WHERE (feed_id = '$feed' OR $children_qpart) 
-                                                       AND owner_uid = $owner_uid");
-
-                                       } else {                                                
-                                               db_query($link, "UPDATE ttrss_user_entries 
+                                       db_query($link, "UPDATE ttrss_user_entries 
                                                        SET unread = false,last_read = NOW() 
                                                        WHERE feed_id = '$feed' AND owner_uid = $owner_uid");
-                                       }
-                                               
+                                       
                                } else if ($feed < 0 && $feed > -10) { // special, like starred
 
                                        if ($feed == -1) {
                        $match_part = "true";
                } else if ($n_feed >= 0) {
 
-                       $result = db_query($link, "SELECT id FROM ttrss_feeds 
-                                       WHERE parent_feed = '$n_feed'
-                                       AND owner_uid = " . $owner_uid);
-
-                       if (db_num_rows($result) > 0) {
-
-                               $linked_feeds = array();
-                               while ($line = db_fetch_assoc($result)) {
-                                       array_push($linked_feeds, "feed_id = " . $line["id"]);
-                               }
-
-                               array_push($linked_feeds, "feed_id = $n_feed");
-                               
-                               $match_part = implode(" OR ", $linked_feeds);
-
-                               $tmp_result = db_query($link, "SELECT COUNT(int_id) AS unread 
-                                       FROM ttrss_user_entries,ttrss_entries
-                                       WHERE   $unread_qpart AND
-                                       ttrss_user_entries.ref_id = ttrss_entries.id AND
-                                       $age_qpart AND
-                                       ($match_part) AND
-                                       owner_uid = " . $owner_uid);
-
-                               $unread = 0;
-
-                               # this needs to be rewritten
-                               while ($line = db_fetch_assoc($tmp_result)) {
-                                       $unread += $line["unread"];
-                               }
-
-                               return $unread;
-
+                       if ($n_feed != 0) {
+                               $match_part = "feed_id = '$n_feed'";
                        } else {
-                               if ($n_feed != 0) {
-                                       $match_part = "feed_id = '$n_feed'";
-                               } else {
-                                       $match_part = "feed_id IS NULL";
-                               }
+                               $match_part = "feed_id IS NULL";
                        }
+
                } else if ($feed < -10) {
 
                        $label_id = -$feed - 11;
                                last_error, value AS count
                        FROM ttrss_feeds, ttrss_counters_cache
                        WHERE ttrss_feeds.owner_uid = ".$_SESSION["uid"]."  
-                               AND parent_feed IS NULL 
                                AND ttrss_counters_cache.feed_id = id";
 
                $result = db_query($link, $query);
 
                        $has_img = feed_has_icon($id);
 
-                       $tmp_result = db_query($link,
-                               "SELECT SUM(value) AS unread FROM ttrss_feeds, ttrss_counters_cache 
-                                       WHERE parent_feed = '$id' AND feed_id = id");
-
-                       $count += db_fetch_result($tmp_result, 0, "unread");
-
                        $cv = array("id" => $id,
                                "updated" => $last_updated,
                                "counter" => $count,
         *                 0 - OK, Feed already exists
         *                 1 - OK, Feed added
         *                 2 - Invalid URL
-        *                 3 - URL content is HTML, not a feed
+        *                 3 - URL content is HTML, no feeds available
+        *                 4 - URL content is HTML which contains multiple feeds.
+        *                     Here you should call extractfeedurls in rpc-backend
+        *                     to get all possible feeds.
+        *                 5 - Couldn't download the URL content.
         */
        function subscribe_to_feed($link, $url, $cat_id = 0, 
                        $auth_login = '', $auth_pass = '') {
 
                $url = fix_url($url);
                if (!validate_feed_url($url)) return 2;
+               if (!fetch_file_contents($url)) return 5;
+
+               if (url_is_html($url)) {
+                       $feedUrls = get_feeds_from_html($url);
+                       if (count($feedUrls) == 0) {
+                               return 3;
+                       } else if (count($feedUrls) > 1) {
+                               return 4;
+                       }
+                       //use feed url as new URL
+                       $url = key($feedUrls);
+               }
 
                if ($cat_id == "0" || !$cat_id) {
                        $cat_qpart = "NULL";
                        WHERE feed_url = '$url' AND owner_uid = ".$_SESSION["uid"]);
        
                if (db_num_rows($result) == 0) {
-                       if (url_is_html($url)) {
-                               $feedUrls = get_feeds_from_html($url);
-                               if (count($feedUrls) != 1) {
-                                       return 3;
-                               }
-                               //use feed url as new URL
-                               $url = key($feedUrls);
-                       }
-                       
                        $result = db_query($link,
                                "INSERT INTO ttrss_feeds 
                                        (owner_uid,feed_url,title,cat_id, auth_login,auth_pass) 
        function make_init_params($link) {
                $params = array();
 
-               array_push($params, make_init_param("theme", get_user_theme($link)));
-               array_push($params, make_init_param("theme_options", get_user_theme_options($link)));
-               array_push($params, make_init_param("daemon_enabled", ENABLE_UPDATE_DAEMON));
-               array_push($params, make_init_param("feeds_frame_refresh", FEEDS_FRAME_REFRESH));
-
-               array_push($params, make_init_param("sign_progress", 
-                       theme_image($link, "images/indicator_white.gif")));
-
-               array_push($params, make_init_param("sign_progress_tiny", 
-                       theme_image($link, "images/indicator_tiny.gif")));
-
-               array_push($params, make_init_param("sign_excl", 
-                       theme_image($link, "images/sign_excl.png")));
+               $params["theme"] = get_user_theme($link);
+               $params["theme_options"] = get_user_theme_options($link);
+               $params["daemon_enabled"] = ENABLE_UPDATE_DAEMON;
+               $params["feeds_frame_refresh"] = FEEDS_FRAME_REFRESH;
 
-               array_push($params, make_init_param("sign_info", 
-                       theme_image($link, "images/sign_info.png")));
+               $params["sign_progress"] = theme_image($link, "images/indicator_white.gif");
+               $params["sign_progress_tiny"] = theme_image($link, "images/indicator_tiny.gif");
+               $params["sign_excl"] = theme_image($link, "images/sign_excl.png");
+               $params["sign_info"] = theme_image($link, "images/sign_info.png");
 
                foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
                        "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
                        "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE", 
                        "HIDE_READ_SHOWS_SPECIAL", "HIDE_FEEDLIST") as $param) {
 
-                                array_push($params, make_init_param(strtolower($param), 
-                                        (int) get_pref($link, $param)));
+                                $params[strtolower($param)] = (int) get_pref($link, $param);
                 }
 
-               array_push($params, make_init_param("icons_url", ICONS_URL));
-
-               array_push($params, make_init_param("cookie_lifetime", SESSION_COOKIE_LIFETIME));
-
-               array_push($params, make_init_param("default_view_mode", 
-                       get_pref($link, "_DEFAULT_VIEW_MODE")));
-
-               array_push($params, make_init_param("default_view_limit", 
-                       (int) get_pref($link, "_DEFAULT_VIEW_LIMIT")));
-
-               array_push($params, make_init_param("default_view_order_by", 
-                       get_pref($link, "_DEFAULT_VIEW_ORDER_BY")));
-
-               array_push($params, make_init_param("prefs_active_tab", 
-                       get_pref($link, "_PREFS_ACTIVE_TAB")));
-
-               array_push($params, make_init_param("infobox_disable_overlay", 
-                       get_pref($link, "_INFOBOX_DISABLE_OVERLAY")));
-
-               array_push($params, make_init_param("bw_limit", 
-                       (int) $_SESSION["bw_limit"]));
-
-               array_push($params, make_init_param("offline_enabled", 
-                       (int) get_pref($link, "ENABLE_OFFLINE_READING")));
+               $params["icons_url"] = ICONS_URL;
+               $params["cookie_lifetime"] = SESSION_COOKIE_LIFETIME;
+               $params["default_view_mode"] = get_pref($link, "_DEFAULT_VIEW_MODE");
+               $params["default_view_limit"] = (int) get_pref($link, "_DEFAULT_VIEW_LIMIT");
+               $params["default_view_order_by"] = get_pref($link, "_DEFAULT_VIEW_ORDER_BY");
+               $params["prefs_active_tab"] = get_pref($link, "_PREFS_ACTIVE_TAB");
+               $params["infobox_disable_overlay"] = get_pref($link, "_INFOBOX_DISABLE_OVERLAY");
+               $params["bw_limit"] = (int) $_SESSION["bw_limit"];
+               $params["offline_enabled"] = (int) get_pref($link, "ENABLE_OFFLINE_READING");
 
                $result = db_query($link, "SELECT COUNT(*) AS cf FROM
                        ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
 
                $num_feeds = db_fetch_result($result, 0, "cf");
 
-               array_push($params, make_init_param("num_feeds", 
-                       (int) $num_feeds));
-
-               array_push($params, make_init_param("collapsed_feedlist", 
-                       (int) get_pref($link, "_COLLAPSED_FEEDLIST")));
+               $params["num_feeds"] = (int) $num_feeds;
+               $params["collapsed_feedlist"] = (int) get_pref($link, "_COLLAPSED_FEEDLIST");
 
                return $params;
        }
 
        function print_runtime_info($link) {
-               print "<runtime-info>";
+               print "<runtime-info><![CDATA[";
+               print json_encode(make_runtime_info($link));
+               print "]]></runtime-info>";
+       }
 
+       function make_runtime_info($link) {
                $result = db_query($link, "SELECT COUNT(*) AS cf FROM
                        ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
 
                $num_feeds = db_fetch_result($result, 0, "cf");
 
-               print "<param key=\"num_feeds\" value=\"".
-                       (int)$num_feeds. "\"/>";
+               $data = array();
+
+               $data['num_feeds'] = (int) $num_feeds;
 
                if (ENABLE_UPDATE_DAEMON) {
-                       print "<param key=\"daemon_is_running\" value=\"".
-                               (int) file_is_locked("update_daemon.lock") . "\"/>";
+
+                       $data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock");
 
                        if (time() - $_SESSION["daemon_stamp_check"] > 30) {
 
-                               $stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
+                               $stamp = (int) @file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
 
                                if ($stamp) {
                                        $stamp_delta = time() - $stamp;
                                                $_SESSION["daemon_stamp_check"] = time();
                                        }
 
-                                       print "<param key=\"daemon_stamp_ok\" value=\"$stamp_check\"/>";
+                                       $data['daemon_stamp_ok'] = $stamp_check;
 
                                        $stamp_fmt = date("Y.m.d, G:i", $stamp);
 
-                                       print "<param key=\"daemon_stamp\" value=\"$stamp_fmt\"/>";
+                                       $data['daemon_stamp'] = $stamp_fmt;
                                }
                        }
                }
                if (CHECK_FOR_NEW_VERSION && $_SESSION["access_level"] >= 10) {
                        
                        if ($_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
-                               $new_version_details = check_for_update($link);
+                               $new_version_details = @check_for_update($link);
 
                                print "<param key=\"new_version_available\" value=\"".
                                        sprintf("%d", $new_version_details != ""). "\"/>";
 
 //             print "<param key=\"new_version_available\" value=\"1\"/>";
 
-               print "</runtime-info>";
+               return $data;
        }
 
        function getSearchSql($search, $match_on) {
                                        $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
 
                                } else {                
-                                       $tmp_result = db_query($link, "SELECT id 
-                                               FROM ttrss_feeds WHERE parent_feed = '$feed'
-                                               ORDER BY cat_id,title");
-               
-                                       $parent_ids = array();
-               
-                                       if (db_num_rows($tmp_result) > 0) {
-                                               while ($p = db_fetch_assoc($tmp_result)) {
-                                                       array_push($parent_ids, "feed_id = " . $p["id"]);
-                                               }
-               
-                                               $query_strategy_part = sprintf("(feed_id = %d OR %s)", 
-                                                       $feed, implode(" OR ", $parent_ids));
-               
-                                               $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-                                       } else {
-                                               $query_strategy_part = "feed_id = '$feed'";
-                                       }
+                                       $query_strategy_part = "feed_id = '$feed'";
                                }
                        } else if ($feed == 0 && !$cat_view) { // archive virtual feed
                                $query_strategy_part = "feed_id IS NULL";
                                $query_strategy_part = "id > 0"; // dumb
                        }
 
+                       if (get_pref($link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) {
+                               $date_sort_field = "updated";
+                       } else {
+                               $date_sort_field = "date_entered";
+                       }
+
                        if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
-                               $order_by = "date_entered";
+                               $order_by = "$date_sort_field";
                        } else {        
-                               $order_by = "date_entered DESC";
+                               $order_by = "$date_sort_field DESC";
                        }
 
                        if ($view_mode != "noscores") {
 
                if (!$limit) $limit = 30;
 
+               if (get_pref($link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) {
+                       $date_sort_field = "updated";
+               } else {
+                       $date_sort_field = "date_entered";
+               }
+
                $qfh_ret = queryFeedHeadlines($link, $feed, 
                        $limit, $view_mode, $is_cat, $search, $search_mode, 
-                       $match_on, "date_entered DESC", 0, $owner_uid);
+                       $match_on, "$date_sort_field DESC", 0, $owner_uid);
 
                $result = $qfh_ret[0];
                $feed_title = htmlspecialchars($qfh_ret[1]);
                        return;
                }
 
-               error_reporting(0);
                if (DEFAULT_UPDATE_METHOD == "1") {
                        $rss = new SimplePie();
                        $rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT);
-//                     $rss->set_timeout(MAGPIE_FETCH_TIME_OUT);
                        $rss->set_feed_url($fetch_url);
                        $rss->set_output_encoding('UTF-8');
                        $rss->init();
                } else {
                        $rss = fetch_rss($releases_feed);
                }
-               error_reporting (DEFAULT_ERROR_LEVEL);
 
                if ($rss) {
 
                                        ON
                                                (ttrss_feeds.id = feed_id)
                                WHERE 
-                                       ttrss_feeds.owner_uid = '$owner_uid' AND parent_feed IS NULL
+                                       ttrss_feeds.owner_uid = '$owner_uid'
                                ORDER BY $order_by_qpart"; 
 
                        $result = db_query($link, $query);
                                        $rtl_tag = "";
                                }
 
-                               $tmp_result = db_query($link,
-                                       "SELECT SUM(value) AS unread FROM ttrss_feeds, ttrss_counters_cache 
-                                               WHERE parent_feed = '$feed_id' AND feed_id = id");
-
-                               $unread += db_fetch_result($tmp_result, 0, "unread");
-       
                                $cat_id = $line["cat_id"];
 
                                $tmp_category = $line["category"];
                if ($memcache && $obj = $memcache->get($obj_id)) {
                        $tags = $obj;
                } else {
-                       $tmp_result = db_query($link, $query);
+                       /* check cache first */
+
+                       $result = db_query($link, "SELECT tag_cache FROM ttrss_user_entries
+                               WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+
+                       $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($link, $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));
 
-                       while ($tmp_line = db_fetch_assoc($tmp_result)) {
-                               array_push($tags, $tmp_line["tag_name"]);                               
+                               db_query($link, "UPDATE ttrss_user_entries 
+                                       SET tag_cache = '$tags_str' WHERE ref_id = '$id'
+                                       AND owner_uid = " . $_SESSION["uid"]);
                        }
 
                        if ($memcache) $memcache->add($obj_id, $tags, 0, 3600);
 
                        print $article_content;
 
-//                     $result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
-//                             post_id = '$id' AND content_url != ''");
-
-                       $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)) {
-                               foreach ($result as $line) {
-
-                                       $url = $line["content_url"];
-                                       $ctype = $line["content_type"];
-
-                                       if (!$ctype) $ctype = __("unknown type");
-
-                                       $filename = substr($url, strrpos($url, "/")+1);
-
-                                       $entry = format_inline_player($link, $url, $ctype);
-
-                                       $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
-                                               $filename . " (" . $ctype . ")" . "</a>";
-
-                                       array_push($entries_html, $entry);
-
-                                       $entry = array();
-
-                                       $entry["type"] = $ctype;
-                                       $entry["filename"] = $filename;
-                                       $entry["url"] = $url;
-
-                                       array_push($entries, $entry);
-                               }
-
-                               print "<div class=\"postEnclosures\">";
-
-                               if (!get_pref($link, "STRIP_IMAGES")) {
-                                       if ($always_display_enclosures ||
-                                                               !preg_match("/<img/i", $article_content)) {
-                                                                       
-                                               foreach ($entries as $entry) {
-
-                                                       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>";
-                                                       }
-                                               }
-                                       }
-                               }
-
-                               if (db_num_rows($result) == 1) {
-                                       print __("Attachment:") . " ";
-                               } else {
-                                       print __("Attachments:") . " ";
-                               }
+                       print_article_enclosures($link, $id, $always_display_enclosures, 
+                               $article_content);
 
-                               print join(", ", $entries_html);
-
-                               print "</div>";
-                       }
-               
                        print "</div>";
-                       
+
                        print "</div>";
 
                }
                        catchupArticlesById($link, $ids, $cmode);
                }
 
-               if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0) {
+               if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0 && !$cat_view) {
                        update_generic_feed($link, $feed, $cat_view, true);
                }
 
 
                        $lnum = $limit*$offset;
 
-                       error_reporting (DEFAULT_ERROR_LEVEL);
-       
                        $num_unread = 0;
                        $cur_feed_title = '';
 
                                        }       
 
                                        $expand_cdm = get_pref($link, 'CDM_EXPANDED');
-                                       $show_excerpt = false;
-
-                                       if ($expand_cdm && $score >= -100) {
-                                               $cdm_cstyle = "";
-                                               $show_excerpt = false;
-                                       } else {
-                                               $cdm_cstyle = "style=\"display : none\"";
-                                               $show_excerpt = true;
-                                       }
 
                                        $mouseover_attrs = "onmouseover='postMouseIn($id)' 
                                                onmouseout='postMouseOut($id)'";
 
-                                       print "<div class=\"cdmArticle$add_class\" 
+                                       print "<div class=\"$class\" 
                                                id=\"RROW-$id\"                                         
                                                $mouseover_attrs'>";
 
                                        print "<div class=\"cdmHeader\">";
 
-                                       if (!get_pref($link, "VFEED_GROUP_BY_FEED") || !$line["feed_title"]) {
-                                               $cdm_feed_icon = "<span style=\"cursor : pointer\" onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
-                                       }
+                                       print "<div style='float : right'>";
+                                       print "<span class='updated'>$updated_fmt</span>";
+                                       print "$marked_pic";
+                                       print "$published_pic";
+                                       print "$score_pic";
 
-                                       print "<div class=\"articleUpdated\">$updated_fmt $score_pic $cdm_feed_icon
-                                               </div>";
+                                       if (!get_pref($link, "VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
+                                               print "<span style=\"cursor : pointer\" 
+                                                       title=\"".htmlspecialchars($line["feed_title"])."\"
+                                                       onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
+                                       }
+                                       print "</div>";
+       
+                                       print "<input type=\"checkbox\" onclick=\"toggleSelectRowById(this, 
+                                                       'RROW-$id')\" class=\"feedCheckBox\" id=\"RCHK-$id\"/>";
 
-                                       print "<span id=\"RTITLE-$id\" class=\"titleWrap$hlc_suffix\"><a class=\"title\" 
-                                               onclick=\"javascript:toggleUnread($id, 0)\"
+                                       print "<span id=\"RTITLE-$id\" 
+                                               onclick=\"return cdmExpandArticle($id)\"
+                                               class=\"titleWrap$hlc_suffix\">
+                                               <a class=\"title\"
                                                target=\"_blank\" href=\"".$line["link"]."\">".$line["title"]."</a>
-                                               ";
-
-                                       print $entry_author;
-
-/*                                     if (!$expand_cdm || $score < -100) {
-                                               print "&nbsp;<a id=\"CICH-$id\" 
-                                                       href=\"javascript:cdmExpandArticle($id)\">
-                                                       (".__('Show article').")</a>";
-                                       } */
+                                               </span>";
 
                                        print $labels_str;
 
-                                       if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
-                                               if ($line["feed_title"]) {      
-                                                       print "&nbsp;(<a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a>)";
-                                               }
-                                       }
+                                       if (!$expand_cdm)
+                                               $content_hidden = "style=\"display : none\"";
+                                       else
+                                               $excerpt_hidden = "style=\"display : none\"";
 
-                                       print "</span></div>";
+                                       print "<span $excerpt_hidden
+                                               onclick=\"return cdmExpandArticle($id)\"
+                                               id=\"CEXC-$id\" class=\"cdmExcerpt\"> - $content_preview</span>";
 
-                                       if ($show_excerpt) {
-                                               print "<div class=\"cdmExcerpt\" id=\"CEXC-$id\"
-                                                       onclick=\"cdmExpandArticle($id)\"
-                                                       title=\"".__('Click to expand article')."\">";
+                                       print "</div>";
 
-                                               $content_preview = trim(truncate_string(strip_tags($line["content_preview"]), 100));
+                                       print "<div class=\"cdmContent\" $content_hidden
+                                               title=\"".__("Click to select article")."\"
+                                               onclick=\"toggleSelected($id);\"
+                                               id=\"CICD-$id\">";
 
-                                               if (strlen($content_preview) != 0) {
-                                                       print $content_preview;
-                                               } else {
-                                                       print __('Click to expand article');
-                                               }
-                                               print "</div>";
-                                       }
-       
-                                       print "<div class=\"cdmContent\" 
-                                               onclick=\"cdmClicked($id)\"
-                                               id=\"CICD-$id\" $cdm_cstyle>";
+                                       print "<div class=\"cdmContentInner\">";
 
-                                       if ($line["orig_feed_id"]) {
+                       if ($line["orig_feed_id"]) {
 
-                                               $tmp_result = db_query($link, "SELECT * FROM ttrss_archived_feeds
-                                               WHERE id = ".$line["orig_feed_id"]);
+                               $tmp_result = db_query($link, "SELECT * FROM ttrss_archived_feeds
+                                       WHERE id = ".$line["orig_feed_id"]);
 
                                                if (db_num_rows($tmp_result) != 0) {
-
-                                               print "<div clear='both'>";
-                                               print __("Originally from:");
-
-                                               print "&nbsp;";
-
-                                               $tmp_line = db_fetch_assoc($tmp_result);
-
-                                               print "<a target='_blank' 
-                                                       href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
-                                                       $tmp_line['title'] . "</a>";
-
-                                               print "&nbsp;";
-
-                                               print "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
-                                               print "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.gif'></a>";
-
-                                               print "</div>";
+               
+                                                       print "<div clear='both'>";
+                                                       print __("Originally from:");
+               
+                                                       print "&nbsp;";
+               
+                                                       $tmp_line = db_fetch_assoc($tmp_result);
+               
+                                                       print "<a target='_blank' 
+                                                               href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
+                                                               $tmp_line['title'] . "</a>";
+               
+                                                       print "&nbsp;";
+               
+                                                       print "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
+                                                       print "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.gif'></a>";
+               
+                                                       print "</div>";
+                                               }
                                        }
-                               }
 
-//                                     print "<div class=\"cdmInnerContent\" id=\"CICD-$id\" $cdm_cstyle>";
+                                       $article_content = sanitize_rss($link, $line["content_preview"]);
 
                                        print "<div id=\"POSTNOTE-$id\">";
                                        if ($line['note']) {
                                        }
                                        print "</div>";
 
-                                       print sanitize_rss($link, $line["content_preview"]);
-
-                                       $article_content = $line["content_preview"];
-
-                                       $e_result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
-                                               post_id = '$id' AND content_url != ''");
-
-                                       if (db_num_rows($e_result) > 0) {
-
-                               $entries_html = array();
-                               $entries = array();
-
-                               while ($e_line = db_fetch_assoc($e_result)) {
-
-                                       $url = $e_line["content_url"];
-                                       $ctype = $e_line["content_type"];
-                                       if (!$ctype) $ctype = __("unknown type");
-
-                                       $filename = substr($url, strrpos($url, "/")+1);
-
-                                       $entry = format_inline_player($link, $url, $ctype);
+                                       print $article_content;
 
-                                       $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
-                                               $filename . " (" . $ctype . ")" . "</a>";
-
-                                       array_push($entries_html, $entry);
-
-                                       $entry = array();
-
-                                       $entry["type"] = $ctype;
-                                       $entry["filename"] = $filename;
-                                       $entry["url"] = $url;
-
-                                       array_push($entries, $entry);
-                               }
-
-                               $tmp_result = db_query($link, "SELECT always_display_enclosures FROM
-                                       ttrss_feeds WHERE id = ".
+                                       $tmp_result = db_query($link, "SELECT always_display_enclosures FROM
+                                               ttrss_feeds WHERE id = ".
                                                (($line['feed_id'] == null) ? $line['orig_feed_id'] : 
                                                                $line['feed_id'])." AND owner_uid = ".$_SESSION["uid"]);
 
-                               $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)) {
-
-                                               foreach ($entries as $entry) {
-                                                       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>";
-                                                       }
-                                               }
-                                       }
-                               }
-
-                               print "<div class=\"cdmEnclosures\">";
-
-                               if (db_num_rows($e_result) == 1) {
-                                       print __("Attachment:") . " ";
-                               } else {
-                                       print __("Attachments:") . " ";
-                               }
+                                       $always_display_enclosures = sql_bool_to_bool(db_fetch_result($tmp_result, 
+                                               0, "always_display_enclosures"));
 
-                               print join(", ", $entries_html);
-
-                               print "</div>";
-                       }
-
-
-                                       print "<br clear='both'>";
-//                                     print "</div>";
-
-/*                                     if (!$expand_cdm) {
-                                               print "<a id=\"CICH-$id\" 
-                                                       href=\"javascript:cdmExpandArticle($id)\">
-                                                       Show article</a>";
-                                       } */
+                                       print_article_enclosures($link, $id, $always_display_enclosures,
+                                               $article_content);
 
                                        print "</div>";
 
-                                       print "<div class=\"cdmFooter\"><span class='s0'>";
+                                       print "<div class=\"cdmFooter\">";
+
+                                       $tags_str = format_tags_string(get_article_tags($link, $id), $id);
 
-                                       /* print "<div class=\"markedPic\">Star it: $marked_pic</div>"; */
+                                       print "<img src='".theme_image($link,
+                                                       'images/tag.png')."' alt='Tags' title='Tags'>
+                                               <span id=\"ATSTR-$id\">$tags_str</span>
+                                               <a title=\"".__('Edit tags for this article')."\" 
+                                               href=\"javascript:editArticleTags($id, $feed_id, true)\">(+)</a>";
 
-                                       print __("Select:").
-                                                       " <input type=\"checkbox\" onclick=\"toggleSelectRowById(this, 
-                                                       'RROW-$id')\" class=\"feedCheckBox\" id=\"RCHK-$id\">";
+                                       print "<div style=\"float : right\">";
 
-                                       print "</span><span class='s1'>$marked_pic&nbsp;";
-                                       print "$published_pic&nbsp;";
-                                       print "<img src=\"images/art-zoom.png\" class='tagsPic' 
+                                       print "<img src=\"images/art-zoom.png\" 
                                                onclick=\"zoomToArticle($id)\"
                                                style=\"cursor : pointer\"
                                                alt='Zoom' 
-                                               title='".__('Show article summary in new window')."'>&nbsp;";
+                                               title='".__('Show article summary in new window')."'>";
+
+                                       if (DIGEST_ENABLE) {
+                                               print "<img src=\"".theme_image($link, 'images/art-email.png')."\" 
+                                                       style=\"cursor : pointer\"
+                                                       onclick=\"emailArticle($id)\"
+                                                       alt='Zoom' title='".__('Forward by email')."'>";
+                                       }
 
                                        $note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
 
-                                       print "<img src=\"images/art-pub-note.png\" class='tagsPic' 
+                                       print "<img src=\"images/art-pub-note.png\"
                                                style=\"cursor : pointer\" style=\"cursor : pointer\"
                                                onclick=\"publishWithNote($id, '$note_escaped')\"
                                                alt='PubNote' title='".__('Publish article with a note')."'>";
 
-                                       print "</span>";
-
-                                       $tags_str = format_tags_string(get_article_tags($link, $id), $id);
-
-                                       print "<span class='s1'>
-                                               <img class='tagsPic' src='".theme_image($link,
-                                                       'images/tag.png')."' alt='Tags' title='Tags'>
-                                               <span id=\"ATSTR-$id\">$tags_str</span>
-                                               <a title=\"".__('Edit tags for this article')."\" 
-                                               href=\"javascript:editArticleTags($id, $feed_id, true)\">(+)</a>";
+                                       print "<img src=\"images/digest_checkbox.png\"
+                                               style=\"cursor : pointer\" style=\"cursor : pointer\"
+                                               onclick=\"cdmDismissArticle($id)\"
+                                               alt='Dismiss' title='".__('Dismiss article')."'>";
 
-                                       print "</span>";
+                                       print "</div>";
+                                       print "</div>";
 
-                                       print "<span class='s2'><a class=\"cdmToggleLink\"
-                                                       href=\"javascript:toggleUnread($id)\">
-                                                       ".__('toggle unread')."</a></span>";
+                                       print "</div>";
 
                                        print "</div>";
-                                       print "</div>"; 
 
-                               }                               
+                               } 
        
                                ++$lnum;
-                       }
+                       } 
 
                        if (!get_pref($link, 'COMBINED_DISPLAY_MODE') && !$offset) {                    
                                print "</table>";
                $url     = fix_url($url);
                $baseUrl = substr($url, 0, strrpos($url, '/') + 1);
 
+               libxml_use_internal_errors(true);
+
                $doc = new DOMDocument();
                $doc->loadHTMLFile($url);
                $xpath = new DOMXPath($doc);
 
                return true;
        }
+
+       function print_label_select($link, $name, $value, $style = "") {
+
+               $result = db_query($link, "SELECT caption FROM ttrss_labels2
+                       WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY caption");
+
+               print "<select default=\"$value\" name=\"" . htmlspecialchars($name) . 
+                       "\" style=\"$style\" onchange=\"labelSelectOnChange(this)\" >";
+
+               while ($line = db_fetch_assoc($result)) {
+
+                       $issel = ($line["caption"] == $value) ? "selected=\"1\"" : "";
+
+                       print "<option $issel>" . htmlspecialchars($line["caption"]) . "</option>";
+
+               }
+
+               print "<option value=\"ADD_LABEL\">" .__("Add label...") . "</option>";
+
+               print "</select>";
+
+
+       }
+
+       function print_article_enclosures($link, $id, $always_display_enclosures, 
+                                       $article_content) {
+
+               $result = get_article_enclosures($link, $id);
+       
+               if (count($result) > 0) {
+       
+                       $entries_html = array();
+                       $entries = array();
+       
+                       foreach ($result as $line) {
+       
+                               $url = $line["content_url"];
+                               $ctype = $line["content_type"];
+       
+                               if (!$ctype) $ctype = __("unknown type");
+       
+                               $filename = substr($url, strrpos($url, "/")+1);
+       
+                               $entry = format_inline_player($link, $url, $ctype);
+       
+                               $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
+                                       $filename . " (" . $ctype . ")" . "</a>";
+       
+                               array_push($entries_html, $entry);
+       
+                               $entry = array();
+       
+                               $entry["type"] = $ctype;
+                               $entry["filename"] = $filename;
+                               $entry["url"] = $url;
+       
+                               array_push($entries, $entry);
+                       }
+       
+                       print "<div class=\"postEnclosures\">";
+       
+                       if (!get_pref($link, "STRIP_IMAGES")) {
+                               if ($always_display_enclosures ||
+                                                       !preg_match("/<img/i", $article_content)) {
+                                                               
+                                       foreach ($entries as $entry) {
+       
+                                               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>";
+                                               }
+                                       }
+                               }
+                       }
+       
+                       if (db_num_rows($result) == 1) {
+                               print __("Attachment:") . " ";
+                       } else {
+                               print __("Attachments:") . " ";
+                       }
+       
+                       print join(", ", $entries_html);
+       
+                       print "</div>";
+               }
+       }
+
 ?>