";
if (!get_pref($link, "STRIP_IMAGES")) {
- if ($always_display_enclosures || !preg_match("/
";
+ src=\"" .htmlspecialchars($entry["url"]) . "\"/>";
}
}
}
}
- print "
";
-
if (db_num_rows($result) == 1) {
print __("Attachment:") . " ";
} else {
@@ -5428,9 +5519,12 @@
$always_display_enclosures = db_fetch_result($tmp_result, 0, "always_display_enclosures");
if (!get_pref($link, "STRIP_IMAGES")) {
- if ($always_display_enclosures || !preg_match("/img/i", $article_content)) {
+ if ($always_display_enclosures ||
+ !preg_match("/img/i", $article_content)) {
+
foreach ($entries as $entry) {
- if (preg_match("/image/", $entry["type"])) {
+ if (preg_match("/image/", $entry["type"]) ||
+ preg_match("/\.(jpg|png|gif|bmp)/i", $entry["filename"])) {
print "
![\"".htmlspecialchars($entry["filename"])."\"](\"")
";
@@ -5639,6 +5733,22 @@
return $url_path;
}
+ function opml_publish_url($link){
+ $url_path = "";
+
+
+ if ($_SERVER['HTTPS'] != "on") {
+ $url_path = "http://";
+ } else {
+ $url_path = "https://";
+ }
+
+ $url_path .= $_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']);
+ $url_path .= "/opml.php?op=publish&key=" .
+ get_pref($link, "_PREFS_PUBLISH_KEY", $_SESSION["uid"]);
+
+ return $url_path;
+ }
/**
* Purge a feed contents, marked articles excepted.
@@ -5785,13 +5895,6 @@
if($debug) _debug("Feed: " . $line["feed_url"] . ", " . $line["last_updated"]);
- // 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);
- // Cancel the alarm (the update went well)
- if(!$from_http && function_exists('pcntl_alarm')) pcntl_alarm(0);
-
sleep(1); // prevent flood (FIXME make this an option?)
}
@@ -5812,34 +5915,47 @@
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");
- return $filters;
+ 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;
+ }
}
function get_score_pic($score) {
@@ -6127,6 +6243,8 @@
}
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
@@ -6135,12 +6253,19 @@
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;
@@ -6174,6 +6299,13 @@
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;
@@ -6194,6 +6326,12 @@
}
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");
@@ -6483,4 +6621,31 @@
}
+ 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;
+ }
+
?>