}
- 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");
+ foreach ($article_filters as $f) {
+ if ($f[0] == "tag") {
- if ($tag_filter) {
+ $manual_tags = trim_array(split(",", $f[1]));
- $manual_tags = trim_array(split(",", $tag_filter[1]));
-
- foreach ($manual_tags as $tag) {
- if (tag_is_valid($tag)) {
- array_push($entry_tags, $tag);
+ foreach ($manual_tags as $tag) {
+ if (tag_is_valid($tag)) {
+ array_push($entry_tags, $tag);
+ }
}
}
}
$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")) {
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);
}
}
$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;
$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);
}
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);
if ($memcache && $obj = $memcache->get($obj_id)) {
- print_r($obj);
-
return $obj;
} else {
git.wh0rd.org / tt-rss.git / blobdiff