-
This feed has been exported from diff --git a/classes/api.php b/classes/api.php index 23866072f..730e20ab9 100644 --- a/classes/api.php +++ b/classes/api.php @@ -2,7 +2,7 @@ class API extends Handler { - const API_LEVEL = 7; + const API_LEVEL = 9; const STATUS_OK = 0; const STATUS_ERR = 1; @@ -77,6 +77,7 @@ class API extends Handler { $this->wrap(self::STATUS_OK, array("session_id" => session_id(), "api_level" => self::API_LEVEL)); } else { // else we are not logged in + user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING); $this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR")); } } else { @@ -199,11 +200,15 @@ class API extends Handler { $include_nested = sql_bool_to_bool($_REQUEST["include_nested"]); $sanitize_content = !isset($_REQUEST["sanitize"]) || sql_bool_to_bool($_REQUEST["sanitize"]); + $force_update = sql_bool_to_bool($_REQUEST["force_update"]); $override_order = false; switch ($_REQUEST["order_by"]) { + case "title": + $override_order = "ttrss_entries.title"; + break; case "date_reverse": - $override_order = "date_entered, updated"; + $override_order = "score DESC, date_entered, updated"; break; case "feed_dates": $override_order = "updated DESC"; @@ -218,7 +223,7 @@ class API extends Handler { $headlines = $this->api_get_headlines($feed_id, $limit, $offset, $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $override_order, $include_attachments, $since_id, $search, $search_mode, - $include_nested, $sanitize_content); + $include_nested, $sanitize_content, $force_update); $this->wrap(self::STATUS_OK, $headlines); } else { @@ -309,8 +314,8 @@ class API extends Handler { if ($article_id) { - $query = "SELECT id,title,link,content,cached_content,feed_id,comments,int_id, - marked,unread,published,score, + $query = "SELECT id,title,link,content,feed_id,comments,int_id, + marked,unread,published,score,note,lang, ".SUBSTRING_FOR_DATE."(updated,1,16) as updated, author,(SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title FROM ttrss_entries,ttrss_user_entries @@ -338,11 +343,13 @@ class API extends Handler { "comments" => $line["comments"], "author" => $line["author"], "updated" => (int) strtotime($line["updated"]), - "content" => $line["cached_content"] != "" ? $line["cached_content"] : $line["content"], + "content" => $line["content"], "feed_id" => $line["feed_id"], "attachments" => $attachments, "score" => (int)$line["score"], - "feed_title" => $line["feed_title"] + "feed_title" => $line["feed_title"], + "note" => $line["note"], + "lang" => $line["lang"] ); foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) { @@ -423,14 +430,14 @@ class API extends Handler { $checked = false; foreach ($article_labels as $al) { - if ($al[0] == $line['id']) { + if (feed_to_label_id($al[0]) == $line['id']) { $checked = true; break; } } array_push($rv, array( - "id" => (int)$line['id'], + "id" => (int)label_to_feed_id($line['id']), "caption" => $line['caption'], "fg_color" => $line['fg_color'], "bg_color" => $line['bg_color'], @@ -447,7 +454,7 @@ class API extends Handler { $assign = (bool) $this->dbh->escape_string($_REQUEST['assign']) == "true"; $label = $this->dbh->escape_string(label_find_caption( - $label_id, $_SESSION["uid"])); + feed_to_label_id($label_id), $_SESSION["uid"])); $num_updated = 0; @@ -511,7 +518,7 @@ class API extends Handler { if ($unread || !$unread_only) { $row = array( - "id" => $cv["id"], + "id" => (int) $cv["id"], "title" => $cv["description"], "unread" => $cv["counter"], "cat_id" => -2, @@ -557,7 +564,7 @@ class API extends Handler { if ($unread || !$unread_only) { $row = array( - "id" => $line["id"], + "id" => (int) $line["id"], "title" => $line["title"], "unread" => $unread, "is_cat" => true, @@ -626,7 +633,28 @@ class API extends Handler { $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order, $include_attachments, $since_id, $search = "", $search_mode = "", - $include_nested = false, $sanitize_content = true) { + $include_nested = false, $sanitize_content = true, $force_update = false) { + + if ($force_update && $feed_id > 0 && is_numeric($feed_id)) { + // Update the feed if required with some basic flood control + + $result = db_query( + "SELECT cache_images,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated + FROM ttrss_feeds WHERE id = '$feed_id'"); + + if (db_num_rows($result) != 0) { + $last_updated = strtotime(db_fetch_result($result, 0, "last_updated")); + $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images")); + + if (!$cache_images && time() - $last_updated > 120) { + include "rssfuncs.php"; + update_rss_feed($feed_id, true, true); + } else { + db_query("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01' + WHERE id = '$feed_id'"); + } + } + } $qfh_ret = queryFeedHeadlines($feed_id, $limit, $view_mode, $is_cat, $search, $search_mode, @@ -638,11 +666,31 @@ class API extends Handler { $headlines = array(); while ($line = db_fetch_assoc($result)) { + $line["content_preview"] = truncate_string(strip_tags($line["content"]), 100); + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) { + $line = $p->hook_query_headlines($line, 100, true); + } + $is_updated = ($line["last_read"] == "" && ($line["unread"] != "t" && $line["unread"] != "1")); $tags = explode(",", $line["tag_cache"]); - $labels = json_decode($line["label_cache"], true); + + $label_cache = $line["label_cache"]; + $labels = false; + + if ($label_cache) { + $label_cache = json_decode($label_cache, true); + + if ($label_cache) { + if ($label_cache["no-labels"] == 1) + $labels = array(); + else + $labels = $label_cache; + } + } + + if (!is_array($labels)) $labels = get_article_labels($line["id"]); //if (!$tags) $tags = get_article_tags($line["id"]); //if (!$labels) $labels = get_article_labels($line["id"]); @@ -660,28 +708,22 @@ class API extends Handler { "tags" => $tags, ); - if ($include_attachments) - $headline_row['attachments'] = get_article_enclosures( - $line['id']); + if ($include_attachments) + $headline_row['attachments'] = get_article_enclosures( + $line['id']); - if ($show_excerpt) { - $excerpt = truncate_string(strip_tags($line["content_preview"]), 100); - $headline_row["excerpt"] = $excerpt; - } + if ($show_excerpt) + $headline_row["excerpt"] = $line["content_preview"]; if ($show_content) { - if ($line["cached_content"] != "") { - $line["content_preview"] =& $line["cached_content"]; - } - if ($sanitize_content) { $headline_row["content"] = sanitize( - $line["content_preview"], + $line["content"], sql_bool_to_bool($line['hide_images']), - false, $line["site_url"]); + false, $line["site_url"], false, $line["id"]); } else { - $headline_row["content"] = $line["content_preview"]; + $headline_row["content"] = $line["content"]; } } @@ -699,7 +741,10 @@ class API extends Handler { $headline_row["always_display_attachments"] = sql_bool_to_bool($line["always_display_enclosures"]); $headline_row["author"] = $line["author"]; + $headline_row["score"] = (int)$line["score"]; + $headline_row["note"] = $line["note"]; + $headline_row["lang"] = $line["lang"]; foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) { $headline_row = $p->hook_render_article_api(array("headline" => $headline_row)); diff --git a/classes/article.php b/classes/article.php index 398132d12..9aef107ec 100644 --- a/classes/article.php +++ b/classes/article.php @@ -30,7 +30,6 @@ class Article extends Handler_Protected { $id = $this->dbh->escape_string($_REQUEST["id"]); $cids = explode(",", $this->dbh->escape_string($_REQUEST["cids"])); $mode = $this->dbh->escape_string($_REQUEST["mode"]); - $omode = $this->dbh->escape_string($_REQUEST["omode"]); // in prefetch mode we only output requested cids, main article // just gets marked as read (it already exists in client cache) @@ -108,7 +107,7 @@ class Article extends Handler_Protected { // only check for our user data here, others might have shared this with different content etc $result = db_query("SELECT id FROM ttrss_entries, ttrss_user_entries WHERE - link = '$url' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1"); + guid = '$guid' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1"); if (db_num_rows($result) != 0) { $ref_id = db_fetch_result($result, 0, "id"); diff --git a/classes/db/mysql.php b/classes/db/mysql.php index aab05aca2..d4b45b98c 100644 --- a/classes/db/mysql.php +++ b/classes/db/mysql.php @@ -26,9 +26,12 @@ class Db_Mysql implements IDb { } function query($query, $die_on_error = true) { - $result = mysql_query($query, $this->link); + $result = @mysql_query($query, $this->link); if (!$result) { - user_error("Query $query failed: " . ($this->link ? mysql_error($this->link) : "No connection"), + $error = @mysql_error($this->link); + + @mysql_query("ROLLBACK", $this->link); + user_error("Query $query failed: " . ($this->link ? $error : "No connection"), $die_on_error ? E_USER_ERROR : E_USER_WARNING); } return $result; diff --git a/classes/db/mysqli.php b/classes/db/mysqli.php index a41ebf8ec..c685b75a0 100644 --- a/classes/db/mysqli.php +++ b/classes/db/mysqli.php @@ -24,9 +24,12 @@ class Db_Mysqli implements IDb { } function query($query, $die_on_error = true) { - $result = mysqli_query($this->link, $query); + $result = @mysqli_query($this->link, $query); if (!$result) { - user_error("Query $query failed: " . ($this->link ? mysqli_error($this->link) : "No connection"), + $error = @mysqli_error($this->link); + + @mysqli_query($this->link, "ROLLBACK"); + user_error("Query $query failed: " . ($this->link ? $error : "No connection"), $die_on_error ? E_USER_ERROR : E_USER_WARNING); } diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php index 4d860790b..ba37f83a6 100644 --- a/classes/db/pgsql.php +++ b/classes/db/pgsql.php @@ -35,11 +35,14 @@ class Db_Pgsql implements IDb { } function query($query, $die_on_error = true) { - $result = pg_query($query); + $result = @pg_query($this->link, $query); if (!$result) { + $error = @pg_last_error($this->link); + + @pg_query($this->link, "ROLLBACK"); $query = htmlspecialchars($query); // just in case - user_error("Query $query failed: " . ($this->link ? pg_last_error($this->link) : "No connection"), + user_error("Query $query failed: " . ($this->link ? $error : "No connection"), $die_on_error ? E_USER_ERROR : E_USER_WARNING); } return $result; diff --git a/classes/dlg.php b/classes/dlg.php index cfa960d9a..25a194bed 100644 --- a/classes/dlg.php +++ b/classes/dlg.php @@ -16,7 +16,6 @@ class Dlg extends Handler_Protected { print __("If you have imported labels and/or filters, you might need to reload preferences to see your new data.") . "
"; print "";
- $owner_uid = $_SESSION["uid"];
$this->dbh->query("BEGIN");
@@ -176,7 +175,7 @@ class Dlg extends Handler_Protected {
while ($row = $this->dbh->fetch_assoc($result)) {
$tmp = htmlspecialchars($row["tag_name"]);
- print "";
+ print "";
}
print "";
diff --git a/classes/feedenclosure.php b/classes/feedenclosure.php
index d610dd7c8..64f1a0616 100644
--- a/classes/feedenclosure.php
+++ b/classes/feedenclosure.php
@@ -3,5 +3,8 @@ class FeedEnclosure {
public $link;
public $type;
public $length;
+ public $title;
+ public $height;
+ public $width;
}
?>
diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index 9680748f9..dfac7149f 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -1,5 +1,6 @@
elem->getElementsByTagName("id")->item(0);
@@ -30,6 +31,7 @@ class FeedItem_Atom extends FeedItem_Common {
}
}
+
function get_link() {
$links = $this->elem->getElementsByTagName("link");
@@ -38,8 +40,13 @@ class FeedItem_Atom extends FeedItem_Common {
(!$link->hasAttribute("rel")
|| $link->getAttribute("rel") == "alternate"
|| $link->getAttribute("rel") == "standout")) {
+ $base = $this->xpath->evaluate("string(ancestor-or-self::*[@xml:base][1]/@xml:base)", $link);
+
+ if ($base)
+ return rewrite_relative_url($base, trim($link->getAttribute("href")));
+ else
+ return trim($link->getAttribute("href"));
- return $link->getAttribute("href");
}
}
}
@@ -48,7 +55,7 @@ class FeedItem_Atom extends FeedItem_Common {
$title = $this->elem->getElementsByTagName("title")->item(0);
if ($title) {
- return $title->nodeValue;
+ return trim($title->nodeValue);
}
}
@@ -58,7 +65,13 @@ class FeedItem_Atom extends FeedItem_Common {
if ($content) {
if ($content->hasAttribute('type')) {
if ($content->getAttribute('type') == 'xhtml') {
- return $this->doc->saveXML($content->firstChild->nextSibling);
+ for ($i = 0; $i < $content->childNodes->length; $i++) {
+ $child = $content->childNodes->item($i);
+
+ if ($child->hasChildNodes()) {
+ return $this->doc->saveXML($child);
+ }
+ }
}
}
@@ -72,7 +85,13 @@ class FeedItem_Atom extends FeedItem_Common {
if ($content) {
if ($content->hasAttribute('type')) {
if ($content->getAttribute('type') == 'xhtml') {
- return $this->doc->saveXML($content->firstChild->nextSibling);
+ for ($i = 0; $i < $content->childNodes->length; $i++) {
+ $child = $content->childNodes->item($i);
+
+ if ($child->hasChildNodes()) {
+ return $this->doc->saveXML($child);
+ }
+ }
}
}
@@ -87,13 +106,13 @@ class FeedItem_Atom extends FeedItem_Common {
foreach ($categories as $cat) {
if ($cat->hasAttribute("term"))
- array_push($cats, $cat->getAttribute("term"));
+ array_push($cats, trim($cat->getAttribute("term")));
}
$categories = $this->xpath->query("dc:subject", $this->elem);
foreach ($categories as $cat) {
- array_push($cats, $cat->nodeValue);
+ array_push($cats, trim($cat->nodeValue));
}
return $cats;
@@ -126,6 +145,51 @@ class FeedItem_Atom extends FeedItem_Common {
$enc->type = $enclosure->getAttribute("type");
$enc->link = $enclosure->getAttribute("url");
$enc->length = $enclosure->getAttribute("length");
+ $enc->height = $enclosure->getAttribute("height");
+ $enc->width = $enclosure->getAttribute("width");
+
+ $desc = $this->xpath->query("media:description", $enclosure)->item(0);
+ if ($desc) $enc->title = strip_tags($desc->nodeValue);
+
+ array_push($encs, $enc);
+ }
+
+
+ $enclosures = $this->xpath->query("media:group", $this->elem);
+
+ foreach ($enclosures as $enclosure) {
+ $enc = new FeedEnclosure();
+
+ $content = $this->xpath->query("media:content", $enclosure)->item(0);
+
+ if ($content) {
+ $enc->type = $content->getAttribute("type");
+ $enc->link = $content->getAttribute("url");
+ $enc->length = $content->getAttribute("length");
+ $enc->height = $content->getAttribute("height");
+ $enc->width = $content->getAttribute("width");
+
+ $desc = $this->xpath->query("media:description", $content)->item(0);
+ if ($desc) {
+ $enc->title = strip_tags($desc->nodeValue);
+ } else {
+ $desc = $this->xpath->query("media:description", $enclosure)->item(0);
+ if ($desc) $enc->title = strip_tags($desc->nodeValue);
+ }
+
+ array_push($encs, $enc);
+ }
+ }
+
+ $enclosures = $this->xpath->query("media:thumbnail", $this->elem);
+
+ foreach ($enclosures as $enclosure) {
+ $enc = new FeedEnclosure();
+
+ $enc->type = "image/generic";
+ $enc->link = $enclosure->getAttribute("url");
+ $enc->height = $enclosure->getAttribute("height");
+ $enc->width = $enclosure->getAttribute("width");
array_push($encs, $enc);
}
diff --git a/classes/feeditem/common.php b/classes/feeditem/common.php
index 0787a42cb..80bebf8fb 100644
--- a/classes/feeditem/common.php
+++ b/classes/feeditem/common.php
@@ -8,6 +8,17 @@ abstract class FeedItem_Common extends FeedItem {
$this->elem = $elem;
$this->xpath = $xpath;
$this->doc = $doc;
+
+ try {
+
+ $source = $elem->getElementsByTagName("source")->item(0);
+
+ // we don't need element
+ if ($source)
+ $elem->removeChild($source);
+ } catch (DOMException $e) {
+ //
+ }
}
function get_author() {
@@ -33,13 +44,26 @@ abstract class FeedItem_Common extends FeedItem {
}
}
- // todo
function get_comments_url() {
+ //RSS only. Use a query here to avoid namespace clashes (e.g. with slash).
+ //might give a wrong result if a default namespace was declared (possible with XPath 2.0)
+ $com_url = $this->xpath->query("comments", $this->elem)->item(0);
+
+ if($com_url)
+ return $com_url->nodeValue;
+
+ //Atom Threading Extension (RFC 4685) stuff. Could be used in RSS feeds, so it's in common.
+ //'text/html' for type is too restrictive?
+ $com_url = $this->xpath->query("atom:link[@rel='replies' and contains(@type,'text/html')]/@href", $this->elem)->item(0);
+ if($com_url)
+ return $com_url->nodeValue;
}
function get_comments_count() {
- $comments = $this->xpath->query("slash:comments", $this->elem)->item(0);
+ //also query for ATE stuff here
+ $query = "slash:comments|thread:total|atom:link[@rel='replies']/@thread:count";
+ $comments = $this->xpath->query($query, $this->elem)->item(0);
if ($comments) {
return $comments->nodeValue;
diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index e5960243c..c9a7467cd 100644
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -33,20 +33,20 @@ class FeedItem_RSS extends FeedItem_Common {
|| $link->getAttribute("rel") == "alternate"
|| $link->getAttribute("rel") == "standout")) {
- return $link->getAttribute("href");
+ return trim($link->getAttribute("href"));
}
}
$link = $this->elem->getElementsByTagName("guid")->item(0);
if ($link && $link->hasAttributes() && $link->getAttribute("isPermaLink") == "true") {
- return $link->nodeValue;
+ return trim($link->nodeValue);
}
$link = $this->elem->getElementsByTagName("link")->item(0);
if ($link) {
- return $link->nodeValue;
+ return trim($link->nodeValue);
}
}
@@ -54,21 +54,26 @@ class FeedItem_RSS extends FeedItem_Common {
$title = $this->elem->getElementsByTagName("title")->item(0);
if ($title) {
- return $title->nodeValue;
+ return trim($title->nodeValue);
}
}
function get_content() {
- $content = $this->xpath->query("content:encoded", $this->elem)->item(0);
+ $contentA = $this->xpath->query("content:encoded", $this->elem)->item(0);
+ $contentB = $this->elem->getElementsByTagName("description")->item(0);
- if ($content) {
- return $content->nodeValue;
+ if ($contentA && !$contentB) {
+ return $contentA->nodeValue;
}
- $content = $this->elem->getElementsByTagName("description")->item(0);
- if ($content) {
- return $content->nodeValue;
+ if ($contentB && !$contentA) {
+ return $contentB->nodeValue;
+ }
+
+ if ($contentA && $contentB) {
+ return mb_strlen($contentA->nodeValue) > mb_strlen($contentB->nodeValue) ?
+ $contentA->nodeValue : $contentB->nodeValue;
}
}
@@ -85,13 +90,13 @@ class FeedItem_RSS extends FeedItem_Common {
$cats = array();
foreach ($categories as $cat) {
- array_push($cats, $cat->nodeValue);
+ array_push($cats, trim($cat->nodeValue));
}
$categories = $this->xpath->query("dc:subject", $this->elem);
foreach ($categories as $cat) {
- array_push($cats, $cat->nodeValue);
+ array_push($cats, trim($cat->nodeValue));
}
return $cats;
@@ -108,6 +113,8 @@ class FeedItem_RSS extends FeedItem_Common {
$enc->type = $enclosure->getAttribute("type");
$enc->link = $enclosure->getAttribute("url");
$enc->length = $enclosure->getAttribute("length");
+ $enc->height = $enclosure->getAttribute("height");
+ $enc->width = $enclosure->getAttribute("width");
array_push($encs, $enc);
}
@@ -120,6 +127,51 @@ class FeedItem_RSS extends FeedItem_Common {
$enc->type = $enclosure->getAttribute("type");
$enc->link = $enclosure->getAttribute("url");
$enc->length = $enclosure->getAttribute("length");
+ $enc->height = $enclosure->getAttribute("height");
+ $enc->width = $enclosure->getAttribute("width");
+
+ $desc = $this->xpath->query("media:description", $enclosure)->item(0);
+ if ($desc) $enc->title = strip_tags($desc->nodeValue);
+
+ array_push($encs, $enc);
+ }
+
+
+ $enclosures = $this->xpath->query("media:group", $this->elem);
+
+ foreach ($enclosures as $enclosure) {
+ $enc = new FeedEnclosure();
+
+ $content = $this->xpath->query("media:content", $enclosure)->item(0);
+
+ if ($content) {
+ $enc->type = $content->getAttribute("type");
+ $enc->link = $content->getAttribute("url");
+ $enc->length = $content->getAttribute("length");
+ $enc->height = $content->getAttribute("height");
+ $enc->width = $content->getAttribute("width");
+
+ $desc = $this->xpath->query("media:description", $content)->item(0);
+ if ($desc) {
+ $enc->title = strip_tags($desc->nodeValue);
+ } else {
+ $desc = $this->xpath->query("media:description", $enclosure)->item(0);
+ if ($desc) $enc->title = strip_tags($desc->nodeValue);
+ }
+
+ array_push($encs, $enc);
+ }
+ }
+
+ $enclosures = $this->xpath->query("media:thumbnail", $this->elem);
+
+ foreach ($enclosures as $enclosure) {
+ $enc = new FeedEnclosure();
+
+ $enc->type = "image/generic";
+ $enc->link = $enclosure->getAttribute("url");
+ $enc->height = $enclosure->getAttribute("height");
+ $enc->width = $enclosure->getAttribute("width");
array_push($encs, $enc);
}
diff --git a/classes/feedparser.php b/classes/feedparser.php
index d93c575b2..239fdb7a6 100644
--- a/classes/feedparser.php
+++ b/classes/feedparser.php
@@ -2,6 +2,7 @@
class FeedParser {
private $doc;
private $error;
+ private $libxml_errors = array();
private $items;
private $link;
private $title;
@@ -12,27 +13,75 @@ class FeedParser {
const FEED_RSS = 1;
const FEED_ATOM = 2;
+ function normalize_encoding($data) {
+ if (preg_match('/^(<\?xml[\t\n\r ].*?encoding[\t\n\r ]*=[\t\n\r ]*["\'])(.+?)(["\'].*?\?>)/s', $data, $matches) === 1) {
+ $data = mb_convert_encoding($data, 'UTF-8', $matches[2]);
+
+ $data = preg_replace('/^<\?xml[\t\n\r ].*?\?>/s', $matches[1] . "UTF-8" . $matches[3] , $data);
+ }
+
+ return $data;
+ }
+
function __construct($data) {
libxml_use_internal_errors(true);
libxml_clear_errors();
$this->doc = new DOMDocument();
$this->doc->loadXML($data);
+ mb_substitute_character("none");
+
$error = libxml_get_last_error();
- if ($error && $error->code == 9) {
- libxml_clear_errors();
+ // libxml compiled without iconv?
+ if ($error && $error->code == 32) {
+ $data = $this->normalize_encoding($data);
- // we might want to try guessing input encoding here too
- $data = iconv("UTF-8", "UTF-8//IGNORE", $data);
+ if ($data) {
+ libxml_clear_errors();
- $this->doc = new DOMDocument();
- $this->doc->loadXML($data);
+ $this->doc = new DOMDocument();
+ $this->doc->loadXML($data);
- $error = libxml_get_last_error();
+ $error = libxml_get_last_error();
+ }
}
- $this->error = $this->format_error($error);
+ // some terrible invalid unicode entity?
+ if ($error) {
+ foreach (libxml_get_errors() as $err) {
+ if ($err->code == 9) {
+ // if the source feed is not in utf8, next conversion will fail
+ $data = $this->normalize_encoding($data);
+
+ // remove dangling bytes
+ $data = mb_convert_encoding($data, 'UTF-8', 'UTF-8');
+
+ // apparently not all UTF-8 characters are valid for XML
+ $data = preg_replace('/[^\x{0009}\x{000a}\x{000d}\x{0020}-\x{D7FF}\x{E000}-\x{FFFD}]+/u', ' ', $data);
+
+ if ($data) {
+ libxml_clear_errors();
+
+ $this->doc = new DOMDocument();
+ $this->doc->loadXML($data);
+
+ $error = libxml_get_last_error();
+ }
+ break;
+ }
+ }
+ }
+
+ if ($error) {
+ foreach (libxml_get_errors() as $error) {
+ if ($error->level == LIBXML_ERR_FATAL) {
+ if(!isset($this->error)) //currently only the first error is reported
+ $this->error = $this->format_error($error);
+ $this->libxml_errors [] = $this->format_error($error);
+ }
+ }
+ }
libxml_clear_errors();
$this->items = array();
@@ -48,27 +97,32 @@ class FeedParser {
$xpath->registerNamespace('slash', 'http://purl.org/rss/1.0/modules/slash/');
$xpath->registerNamespace('dc', 'http://purl.org/dc/elements/1.1/');
$xpath->registerNamespace('content', 'http://purl.org/rss/1.0/modules/content/');
+ $xpath->registerNamespace('thread', 'http://purl.org/syndication/thread/1.0');
$this->xpath = $xpath;
- $root = $xpath->query("(//atom03:feed|//atom:feed|//channel|//rdf:rdf|//rdf:RDF)")->item(0);
-
- if ($root) {
- switch (mb_strtolower($root->tagName)) {
- case "rdf:rdf":
- $this->type = $this::FEED_RDF;
- break;
- case "channel":
- $this->type = $this::FEED_RSS;
- break;
- case "feed":
- $this->type = $this::FEED_ATOM;
- break;
- default:
- if( !isset($this->error) ){
- $this->error = "Unknown/unsupported feed type";
+ $root = $xpath->query("(//atom03:feed|//atom:feed|//channel|//rdf:rdf|//rdf:RDF)");
+
+ if ($root && $root->length > 0) {
+ $root = $root->item(0);
+
+ if ($root) {
+ switch (mb_strtolower($root->tagName)) {
+ case "rdf:rdf":
+ $this->type = $this::FEED_RDF;
+ break;
+ case "channel":
+ $this->type = $this::FEED_RSS;
+ break;
+ case "feed":
+ $this->type = $this::FEED_ATOM;
+ break;
+ default:
+ if( !isset($this->error) ){
+ $this->error = "Unknown/unsupported feed type";
+ }
+ return;
}
- return;
}
switch ($this->type) {
@@ -151,6 +205,10 @@ class FeedParser {
break;
}
+
+ if ($this->title) $this->title = trim($this->title);
+ if ($this->link) $this->link = trim($this->link);
+
} else {
if( !isset($this->error) ){
$this->error = "Unknown/unsupported feed type";
@@ -173,6 +231,10 @@ class FeedParser {
return $this->error;
}
+ function errors() {
+ return $this->libxml_errors;
+ }
+
function get_link() {
return $this->link;
}
@@ -194,7 +256,7 @@ class FeedParser {
foreach ($links as $link) {
if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
- array_push($rv, $link->getAttribute('href'));
+ array_push($rv, trim($link->getAttribute('href')));
}
}
break;
@@ -203,7 +265,7 @@ class FeedParser {
foreach ($links as $link) {
if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
- array_push($rv, $link->getAttribute('href'));
+ array_push($rv, trim($link->getAttribute('href')));
}
}
break;
diff --git a/classes/feeds.php b/classes/feeds.php
index 83736925c..5ec109614 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -13,12 +13,6 @@ class Feeds extends Handler_Protected {
$feed_id, $is_cat, $search,
$search_mode, $view_mode, $error, $feed_last_updated) {
- $page_prev_link = "viewFeedGoPage(-1)";
- $page_next_link = "viewFeedGoPage(1)";
- $page_first_link = "viewFeedGoPage(0)";
-
- $catchup_page_link = "catchupPage()";
- $catchup_feed_link = "catchupCurrentFeed()";
$catchup_sel_link = "catchupSelection()";
$archive_sel_link = "archiveSelection()";
@@ -43,14 +37,24 @@ class Feeds extends Handler_Protected {
$search_q = "";
}
+ $reply .= "";
+
$rss_link = htmlspecialchars(get_self_url_prefix() .
"/public.php?op=rss&id=$feed_id$cat_q$search_q");
// right part
- $reply .= "";
- $reply .= "";
- $reply .= "";
+ $error_class = $error ? "error" : "";
+
+ $reply .= "
+
+ ![](\"images/pub_set.png\")
";
+
+
+# $reply .= "";
+ $reply .= "";
if ($feed_site_url) {
$last_updated = T_sprintf("Last updated: %s",
@@ -58,10 +62,11 @@ class Feeds extends Handler_Protected {
$target = "target=\"_blank\"";
$reply .= "".
- truncate_string($feed_title,30)."";
+ truncate_string($feed_title, 30)."";
if ($error) {
- $reply .= " (Error)";
+ $error = htmlspecialchars($error);
+ $reply .= " ![error](images/error.png "\\"$error\\"")
";
}
} else {
@@ -70,17 +75,16 @@ class Feeds extends Handler_Protected {
$reply .= "";
- $reply .= "
-
- ![](\"images/pub_set.svg\")
";
-
$reply .= "";
+# $reply .= "";
+
// left part
- $reply .= __('Select:')."
+ $reply .= "";
+ $reply .= "";
+
+ $reply .= "
".__('All').",
".__('Unread').",
".__('Invert').",
@@ -129,14 +133,14 @@ class Feeds extends Handler_Protected {
$reply .= "";
- //$reply .= "
";
-
//$reply .= "get_hooks(PluginHost::HOOK_HEADLINE_TOOLBAR_BUTTON) as $p) {
- echo $p->hook_headline_toolbar_button($feed_id, $is_cat);
+ $reply .= $p->hook_headline_toolbar_button($feed_id, $is_cat);
}
+ $reply .= "";
+
return $reply;
}
@@ -145,7 +149,7 @@ class Feeds extends Handler_Protected {
$override_order = false, $include_children = false) {
if (isset($_REQUEST["DevForceUpdate"]))
- header("Content-Type: text/plain");
+ header("Content-Type: text/plain; charset=utf-8");
$disable_cache = false;
@@ -244,6 +248,8 @@ class Feeds extends Handler_Protected {
false, 0, $include_children);
}
+ $vfeed_group_enabled = get_pref("VFEED_GROUP_BY_FEED") && $feed != -6;
+
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
$result = $qfh_ret[0];
@@ -252,6 +258,7 @@ class Feeds extends Handler_Protected {
$last_error = $qfh_ret[3];
$last_updated = strpos($qfh_ret[4], '1970-') === FALSE ?
make_local_datetime($qfh_ret[4], false) : __("Never");
+ $highlight_words = $qfh_ret[5];
$vgroup_last_feed = $vgr_last_feed;
@@ -274,6 +281,12 @@ class Feeds extends Handler_Protected {
}
} */
+ if ($offset == 0) {
+ foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HEADLINES_BEFORE) as $p) {
+ $reply['content'] .= $p->hook_headlines_before($feed, $cat_view, $qfh_ret);
+ }
+ }
+
if ($this->dbh->num_rows($result) > 0) {
$lnum = $offset;
@@ -281,13 +294,21 @@ class Feeds extends Handler_Protected {
$num_unread = 0;
$cur_feed_title = '';
- $fresh_intl = get_pref("FRESH_ARTICLE_MAX_AGE") * 60 * 60;
-
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info);
$expand_cdm = get_pref('CDM_EXPANDED');
while ($line = $this->dbh->fetch_assoc($result)) {
+ $line["content_preview"] = "— " . truncate_string(strip_tags($line["content"]), 250);
+
+ foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+ $line = $p->hook_query_headlines($line, 250, false);
+ }
+
+ if (get_pref('SHOW_CONTENT_PREVIEW')) {
+ $content_preview = $line["content_preview"];
+ }
+
$id = $line["id"];
$feed_id = $line["feed_id"];
$label_cache = $line["label_cache"];
@@ -306,7 +327,7 @@ class Feeds extends Handler_Protected {
if (!is_array($labels)) $labels = get_article_labels($id);
- $labels_str = "";
+ $labels_str = "";
$labels_str .= format_article_labels($labels, $id);
$labels_str .= "";
@@ -323,24 +344,24 @@ class Feeds extends Handler_Protected {
if (sql_bool_to_bool($line["marked"])) {
$marked_pic = "";
+
+
+# $reply .= "";
+ $reply .= "";
if ($feed_site_url) {
$last_updated = T_sprintf("Last updated: %s",
@@ -58,10 +62,11 @@ class Feeds extends Handler_Protected {
$target = "target=\"_blank\"";
$reply .= "".
- truncate_string($feed_title,30)."";
+ truncate_string($feed_title, 30)."";
if ($error) {
- $reply .= " (Error)";
+ $error = htmlspecialchars($error);
+ $reply .= " ";
}
} else {
@@ -70,17 +75,16 @@ class Feeds extends Handler_Protected {
$reply .= "";
- $reply .= "
-
- ";
-
$reply .= "";
+# $reply .= "";
+
// left part
- $reply .= __('Select:')."
+ $reply .= "";
+ $reply .= "";
+
+ $reply .= "
".__('All').",
".__('Unread').",
".__('Invert').",
@@ -129,14 +133,14 @@ class Feeds extends Handler_Protected {
$reply .= "";
- //$reply .= "![\"Unstar](\"images/mark_set.svg\")
";
$class .= " marked";
} else {
$marked_pic = "![\"Star](\"images/mark_unset.svg\")
";
}
if (sql_bool_to_bool($line["published"])) {
- $published_pic = "";
$class .= " published";
} else {
- $published_pic = "![\"Publish](\"images/pub_unset.svg\")
";
}
@@ -360,11 +381,6 @@ class Feeds extends Handler_Protected {
$date_entered_fmt = T_sprintf("Imported at %s",
make_local_datetime($line["date_entered"], false));
- if (get_pref('SHOW_CONTENT_PREVIEW')) {
- $content_preview = truncate_string(strip_tags($line["content_preview"]),
- 250);
- }
-
$score = $line["score"];
$score_pic = "images/" . get_score_pic($score);
@@ -377,9 +393,9 @@ class Feeds extends Handler_Protected {
title=\"$score\">";
if ($score > 500) {
- $hlc_suffix = "H";
+ $hlc_suffix = "high";
} else if ($score < -100) {
- $hlc_suffix = "L";
+ $hlc_suffix = "low";
} else {
$hlc_suffix = "";
}
@@ -395,7 +411,7 @@ class Feeds extends Handler_Protected {
if ($has_feed_icon) {
$feed_icon_img = "";
+ $feed_icon_img = "";
}
$entry_site_url = $line["site_url"];
@@ -413,7 +429,7 @@ class Feeds extends Handler_Protected {
if (!get_pref('COMBINED_DISPLAY_MODE')) {
- if (get_pref('VFEED_GROUP_BY_FEED')) {
+ if ($vfeed_group_enabled) {
if ($feed_id != $vgroup_last_feed && $line["feed_title"]) {
$cur_feed_title = $line["feed_title"];
@@ -421,12 +437,12 @@ class Feeds extends Handler_Protected {
$cur_feed_title = htmlspecialchars($cur_feed_title);
- $vf_catchup_link = "(".__('Mark as read').")";
+ $vf_catchup_link = "".__('mark feed as read')."";
- $reply['content'] .= "".
- "
";
+ $reply['content'] .= "$feed_icon_img
".
- "".
- $line["feed_title"]." $vf_catchup_link".
+ "
";
}
}
@@ -434,7 +450,7 @@ class Feeds extends Handler_Protected {
$mouseover_attrs = "onmouseover='postMouseIn(event, $id)'
onmouseout='postMouseOut($id)'";
- $reply['content'] .= "$feed_icon_img
".
+ "". $line["feed_title"]."
+ $vf_catchup_link";
+ $reply['content'] .= "![\"\"](\"images/blank_icon.gif\")
";
}
- $reply['content'] .= "
";
$reply['content'] .= "
";
@@ -502,14 +517,14 @@ class Feeds extends Handler_Protected {
else
$tags = false;
- $line["content"] = sanitize($line["content_preview"],
- sql_bool_to_bool($line['hide_images']), false, $entry_site_url);
+ $line["content"] = sanitize($line["content"],
+ sql_bool_to_bool($line['hide_images']), false, $entry_site_url, $highlight_words, $line["id"]);
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_CDM) as $p) {
$line = $p->hook_render_article_cdm($line);
}
- if (get_pref('VFEED_GROUP_BY_FEED') && $line["feed_title"]) {
+ if ($vfeed_group_enabled && $line["feed_title"]) {
if ($feed_id != $vgroup_last_feed) {
$cur_feed_title = $line["feed_title"];
@@ -517,7 +532,7 @@ class Feeds extends Handler_Protected {
$cur_feed_title = htmlspecialchars($cur_feed_title);
- $vf_catchup_link = "(".__('mark as read').")";
+ $vf_catchup_link = "".__('mark feed as read')."";
$has_feed_icon = feed_has_icon($feed_id);
@@ -527,7 +542,7 @@ class Feeds extends Handler_Protected {
//$feed_icon_img = "";
@@ -448,16 +464,14 @@ class Feeds extends Handler_Protected {
$reply['content'] .= "
";
$reply['content'] .= "";
- $reply['content'] .= "";
+ $reply['content'] .= "" .
truncate_string($line["title"], 200);
if (get_pref('SHOW_CONTENT_PREVIEW')) {
- if ($content_preview) {
- $reply['content'] .= " - $content_preview";
- }
+ $reply['content'] .= "" . $line["content_preview"] . "";
}
$reply['content'] .= "";
@@ -466,17 +480,18 @@ class Feeds extends Handler_Protected {
$reply['content'] .= "
";
- $reply['content'] .= "";
-
- if (!get_pref('VFEED_GROUP_BY_FEED')) {
+ if (!$vfeed_group_enabled) {
if (@$line["feed_title"]) {
$rgba = @$rgba_cache[$feed_id];
- $reply['content'] .= "".
- truncate_string($line["feed_title"],30)."";
+ $reply['content'] .= "".
+ truncate_string($line["feed_title"],30)."";
}
}
+
+ $reply['content'] .= "";
+
$reply['content'] .= "$updated_fmt
";
@@ -484,12 +499,12 @@ class Feeds extends Handler_Protected {
$reply['content'] .= $score_pic;
- if ($line["feed_title"] && !get_pref('VFEED_GROUP_BY_FEED')) {
+ if ($line["feed_title"] && !$vfeed_group_enabled) {
$reply['content'] .= "
- $feed_icon_img";
+ $feed_icon_img";
}
$reply['content'] .= "";
}
- $reply['content'] .= "".
+ $reply['content'] .= "
".
"
";
@@ -539,10 +554,10 @@ class Feeds extends Handler_Protected {
$expanded_class = $expand_cdm ? "expanded" : "expandable";
- $reply['content'] .= "$feed_icon_img
".
"".
$line["feed_title"]." $vf_catchup_link";
+ $reply['content'] .= "
";
@@ -784,8 +811,6 @@ class Feeds extends Handler_Protected {
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("0", $timing_info);
- $omode = $this->dbh->escape_string($_REQUEST["omode"]);
-
$feed = $this->dbh->escape_string($_REQUEST["feed"]);
$method = $this->dbh->escape_string($_REQUEST["m"]);
$view_mode = $this->dbh->escape_string($_REQUEST["view_mode"]);
@@ -863,7 +888,7 @@ class Feeds extends Handler_Protected {
$override_order = "ttrss_entries.title";
break;
case "date_reverse":
- $override_order = "date_entered, updated";
+ $override_order = "score DESC, date_entered, updated";
break;
case "feed_dates":
$override_order = "updated DESC";
@@ -878,7 +903,7 @@ class Feeds extends Handler_Protected {
//$topmost_article_ids = $ret[0];
$headlines_count = $ret[1];
- $returned_feed = $ret[2];
+ /* $returned_feed = $ret[2]; */
$disable_cache = $ret[3];
$vgroup_last_feed = $ret[4];
@@ -959,6 +984,10 @@ class Feeds extends Handler_Protected {
print "";
print "";
+ print "";
- $reply['content'] .= "
"; + $reply['content'] .= "
";
$reply['content'] .= "";
+ $reply['content'] .= "
";
$reply['content'] .= "
";
- $reply['content'] .= "";
$reply['content'] .= " 0)) {
+ foreach ($highlight_words as $word) {
+ $line["title"] = preg_replace("/(\Q$word\E)/i",
+ "$1", $line["title"]);
+ }
+ }
+
$reply['content'] .= "
-
+ ".
$line["title"] .
@@ -574,11 +596,11 @@ class Feeds extends Handler_Protected {
else
$excerpt_hidden = "style=\"display : none\"";
- $reply['content'] .= " - $content_preview";
+ $reply['content'] .= "" . $content_preview . "";
+
$reply['content'] .= "";
- if (!get_pref('VFEED_GROUP_BY_FEED')) {
+ if (!$vfeed_group_enabled) {
if (@$line["feed_title"]) {
$rgba = @$rgba_cache[$feed_id];
@@ -615,7 +637,9 @@ class Feeds extends Handler_Protected {
}
$reply['content'] .= "
";
- $reply['content'] .= "";
+ if (!$line['lang']) $line['lang'] = 'en';
+
+ $reply['content'] .= "
";
$reply['content'] .= "";
if ($line["orig_feed_id"]) {
@@ -638,7 +662,7 @@ class Feeds extends Handler_Protected {
$reply['content'] .= " ";
$reply['content'] .= "";
- $reply['content'] .= "
";
+ $reply['content'] .= "
";
$reply['content'] .= "
";
}
@@ -685,10 +709,13 @@ class Feeds extends Handler_Protected {
} else {
$comments_url = htmlspecialchars($line["link"]);
}
- $entry_comments = "$num_comments comments";
+ $entry_comments = "$num_comments ".
+ _ngettext("comment", "comments", $num_comments)."";
+
} else {
if ($line["comments"] && $line["link"] != $line["comments"]) {
- $entry_comments = "comments";
+ $entry_comments = "".__("comments")."";
}
}
@@ -706,7 +733,7 @@ class Feeds extends Handler_Protected {
$reply['content'] .= "";
+ $reply['content'] .= "";
$reply['content'] .= ""; + $reply['content'] .= "
";
+ print_notice("Provided URL is a HTML page referencing multiple feeds, please select required feed from the dropdown menu below.");
+ print "
";
+
print "".__("Feed or site URL")."
";
print "";
@@ -1054,20 +1083,18 @@ class Feeds extends Handler_Protected {
print " ";
print "
";
- $owner_uid = $_SESSION["uid"];
-
require_once "feedbrowser.php";
print "- ";
- print make_feed_browser($search, 25);
+ print make_feed_browser("", 25);
print "
@@ -1126,9 +1153,9 @@ class Feeds extends Handler_Protected {
print "![](\"plugins/mail/mail.png\")
readTemplateFromFile("templates/email_article_template.txt");
@@ -56,7 +104,7 @@ class Mail extends Plugin {
$tpl->setVariable('USER_EMAIL', $user_email, true);
$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
- $result = db_query("SELECT link, content, title, note
+ $result = db_query("SELECT DISTINCT link, content, title, note
FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
id IN ($param) AND owner_uid = " . $_SESSION["uid"]);
@@ -87,25 +135,20 @@ class Mail extends Plugin {
print "
";
- if (!SPHINX_ENABLED) {
+ if (count(PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEARCH)) == 0) {
print "";
}
diff --git a/classes/handler/public.php b/classes/handler/public.php
index f05beafd2..34d577441 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -3,7 +3,7 @@ class Handler_Public extends Handler {
private function generate_syndicated_feed($owner_uid, $feed, $is_cat,
$limit, $offset, $search, $search_mode,
- $view_mode = false, $format = 'atom', $order = false) {
+ $view_mode = false, $format = 'atom', $order = false, $orig_guid = false, $start_ts = false) {
require_once "lib/MiniTemplator.class.php";
@@ -15,11 +15,15 @@ class Handler_Public extends Handler {
if (!$limit) $limit = 60;
$date_sort_field = "date_entered DESC, updated DESC";
+ $date_check_field = "date_entered";
- if ($feed == -2)
+ if ($feed == -2 && !$is_cat) {
$date_sort_field = "last_published DESC";
- else if ($feed == -1)
+ $date_check_field = "last_published";
+ } else if ($feed == -1 && !$is_cat) {
$date_sort_field = "last_marked DESC";
+ $date_check_field = "last_marked";
+ }
switch ($order) {
case "title":
@@ -33,15 +37,18 @@ class Handler_Public extends Handler {
break;
}
+ //function queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false, $start_ts = false) {
+
$qfh_ret = queryFeedHeadlines($feed,
1, $view_mode, $is_cat, $search, $search_mode,
$date_sort_field, $offset, $owner_uid,
- false, 0, false, true);
+ false, 0, true, true, false, false, $start_ts);
$result = $qfh_ret[0];
if ($this->dbh->num_rows($result) != 0) {
- $ts = strtotime($this->dbh->fetch_result($result, 0, "date_entered"));
+
+ $ts = strtotime($this->dbh->fetch_result($result, 0, $date_check_field));
if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) &&
strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= $ts) {
@@ -56,17 +63,17 @@ class Handler_Public extends Handler {
$qfh_ret = queryFeedHeadlines($feed,
$limit, $view_mode, $is_cat, $search, $search_mode,
$date_sort_field, $offset, $owner_uid,
- false, 0, false, true);
+ false, 0, true, true, false, false, $start_ts);
$result = $qfh_ret[0];
$feed_title = htmlspecialchars($qfh_ret[1]);
$feed_site_url = $qfh_ret[2];
- $last_error = $qfh_ret[3];
+ /* $last_error = $qfh_ret[3]; */
$feed_self_url = get_self_url_prefix() .
- "/public.php?op=rss&id=-2&key=" .
- get_feed_access_key(-2, false, $owner_uid);
+ "/public.php?op=rss&id=$feed&key=" .
+ get_feed_access_key($feed, false, $owner_uid);
if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
@@ -85,16 +92,23 @@ class Handler_Public extends Handler {
}
$tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
-
while ($line = $this->dbh->fetch_assoc($result)) {
+ $line["content_preview"] = truncate_string(strip_tags($line["content"]), 100, '...');
+
+ foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+ $line = $p->hook_query_headlines($line);
+ }
- $tpl->setVariable('ARTICLE_ID', htmlspecialchars($line['link']), true);
+ $tpl->setVariable('ARTICLE_ID',
+ htmlspecialchars($orig_guid ? $line['link'] :
+ get_self_url_prefix() .
+ "/public.php?url=" . urlencode($line['link'])), true);
$tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
$tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
- $tpl->setVariable('ARTICLE_EXCERPT',
- truncate_string(strip_tags($line["content_preview"]), 100, '...'), true);
+ $tpl->setVariable('ARTICLE_EXCERPT', $line["content_preview"], true);
- $content = sanitize($line["content_preview"], false, $owner_uid);
+ $content = sanitize($line["content"], false, $owner_uid,
+ $feed_site_url);
if ($line['note']) {
$content = "Tiny Tiny RSS ";
-
- stylesheet_tag("css/utility.css");
- javascript_tag("lib/prototype.js");
- javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls");
+ print "Tiny Tiny RSS
+
+ ";
+
+ echo stylesheet_tag("css/utility.css");
+ echo stylesheet_tag("css/dijit.css");
+ echo javascript_tag("lib/prototype.js");
+ echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls");
print "
";
@@ -543,6 +580,7 @@ class Handler_Public extends Handler {
}
} else {
$_SESSION["login_error_msg"] = __("Incorrect username or password");
+ user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
}
if ($_REQUEST['return']) {
@@ -553,6 +591,18 @@ class Handler_Public extends Handler {
}
}
+ /* function subtest() {
+ header("Content-type: text/plain; charset=utf-8");
+
+ $url = $_REQUEST["url"];
+
+ print "$url\n\n";
+
+
+ print_r(get_feeds_from_html($url, fetch_file_contents($url)));
+
+ } */
+
function subscribe() {
if (SINGLE_USER_MODE) {
login_sequence();
@@ -568,6 +618,9 @@ class Handler_Public extends Handler {
Tiny Tiny RSS
+
+
+
![](\"images/logo_small.png\")
dbh->escape_string(trim($_REQUEST["feed_url"]));
- $cat_id = $this->dbh->escape_string($_REQUEST["cat_id"]);
- $from = $this->dbh->escape_string($_REQUEST["from"]);
- $feed_urls = array();
-
- /* only read authentication information from POST */
-
- $auth_login = $this->dbh->escape_string(trim($_POST["auth_login"]));
- $auth_pass = $this->dbh->escape_string(trim($_POST["auth_pass"]));
-
- $rc = subscribe_to_feed($feed_url, $cat_id, $auth_login, $auth_pass);
-
- switch ($rc) {
- case 1:
- print_notice(T_sprintf("Subscribed to %s.", $feed_url));
- break;
- case 2:
- print_error(T_sprintf("Could not subscribe to %s.", $feed_url));
- break;
- case 3:
- print_error(T_sprintf("No feeds found in %s.", $feed_url));
- break;
- case 0:
- print_warning(T_sprintf("Already subscribed to %s.", $feed_url));
- break;
- case 4:
- print_notice(__("Multiple feed URLs found."));
- $contents = @fetch_file_contents($url, false, $auth_login, $auth_pass);
- if (is_html($contents)) {
- $feed_urls = get_feeds_from_html($url, $contents);
- }
- break;
- case 5:
- print_error(T_sprintf("Could not subscribe to %s.
Can't download the Feed URL.", $feed_url)); - break; - } - - if ($feed_urls) { - print ""; - } - - $tp_uri = get_self_url_prefix() . "/prefs.php"; - $tt_uri = get_self_url_prefix(); - - if ($rc <= 2){ - $result = $this->dbh->query("SELECT id FROM ttrss_feeds WHERE - feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]); - - $feed_id = $this->dbh->fetch_result($result, 0, "id"); - } else { - $feed_id = 0; - } - - print "Tiny Tiny RSS ";
+ print "Tiny Tiny RSS
+
+ ";
- stylesheet_tag("css/utility.css");
- javascript_tag("lib/prototype.js");
+ echo stylesheet_tag("css/utility.css");
+ echo javascript_tag("lib/prototype.js");
print "
";
@@ -762,8 +732,45 @@ class Handler_Public extends Handler {
@$method = $_POST['method'];
- if (!$method) {
- print_notice(__("You will need to provide valid account name and email. New password will be sent on your email address."));
+ if ($hash) {
+ $login = $_REQUEST["login"];
+
+ if ($login) {
+ $result = $this->dbh->query("SELECT id, resetpass_token FROM ttrss_users
+ WHERE login = '$login'");
+
+ if ($this->dbh->num_rows($result) != 0) {
+ $id = $this->dbh->fetch_result($result, 0, "id");
+ $resetpass_token_full = $this->dbh->fetch_result($result, 0, "resetpass_token");
+ list($timestamp, $resetpass_token) = explode(":", $resetpass_token_full);
+
+ if ($timestamp && $resetpass_token &&
+ $timestamp >= time() - 15*60*60 &&
+ $resetpass_token == $hash) {
+
+ $result = $this->dbh->query("UPDATE ttrss_users SET resetpass_token = NULL
+ WHERE id = $id");
+
+ Pref_Users::resetUserPassword($id, true);
+
+ print "
";
+ }
+
function hook_article_button($line) {
return "Article note: " . $line['note'] . "
" .
@@ -111,6 +125,9 @@ class Handler_Public extends Handler {
$tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
+ $tpl->setVariable('ARTICLE_SOURCE_LINK', htmlspecialchars($line['site_url']), true);
+ $tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title'] ? $line['feed_title'] : $feed_title), true);
+
$tags = get_article_tags($line["id"], $owner_uid);
foreach ($tags as $tag) {
@@ -164,13 +181,17 @@ class Handler_Public extends Handler {
$feed['articles'] = array();
while ($line = $this->dbh->fetch_assoc($result)) {
+ $line["content_preview"] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
+ foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+ $line = $p->hook_query_headlines($line, 100);
+ }
$article = array();
$article['id'] = $line['link'];
$article['link'] = $line['link'];
$article['title'] = $line['title'];
- $article['excerpt'] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
- $article['content'] = sanitize($line["content_preview"], false, $owner_uid);
+ $article['excerpt'] = $line["content_preview"];
+ $article['content'] = sanitize($line["content"], false, $owner_uid);
$article['updated'] = date('c', strtotime($line["updated"]));
if ($line['note']) $article['note'] = $line['note'];
@@ -256,16 +277,22 @@ class Handler_Public extends Handler {
function pubsub() {
$mode = $this->dbh->escape_string($_REQUEST['hub_mode']);
+ if (!$mode) $mode = $this->dbh->escape_string($_REQUEST['hub.mode']);
+
$feed_id = (int) $this->dbh->escape_string($_REQUEST['id']);
$feed_url = $this->dbh->escape_string($_REQUEST['hub_topic']);
+ if (!$feed_url) $feed_url = $this->dbh->escape_string($_REQUEST['hub.topic']);
+
if (!PUBSUBHUBBUB_ENABLED) {
header('HTTP/1.0 404 Not Found');
- echo "404 Not found";
+ echo "404 Not found (Disabled by server)";
return;
}
// TODO: implement hub_verifytoken checking
+ // TODO: store requested rel=self or whatever for verification
+ // (may be different from stored feed url) e.g. http://url/ or http://url
$result = $this->dbh->query("SELECT feed_url FROM ttrss_feeds
WHERE id = '$feed_id'");
@@ -274,7 +301,8 @@ class Handler_Public extends Handler {
$check_feed_url = $this->dbh->fetch_result($result, 0, "feed_url");
- if ($check_feed_url && ($check_feed_url == $feed_url || !$feed_url)) {
+ // ignore url checking for the time being
+ if ($check_feed_url && (true || $check_feed_url == $feed_url || !$feed_url)) {
if ($mode == "subscribe") {
$this->dbh->query("UPDATE ttrss_feeds SET pubsub_state = 2
@@ -303,11 +331,11 @@ class Handler_Public extends Handler {
}
} else {
header('HTTP/1.0 404 Not Found');
- echo "404 Not found";
+ echo "404 Not found (URL check failed)";
}
} else {
header('HTTP/1.0 404 Not Found');
- echo "404 Not found";
+ echo "404 Not found (Feed not found)";
}
}
@@ -342,7 +370,7 @@ class Handler_Public extends Handler {
function rss() {
$feed = $this->dbh->escape_string($_REQUEST["id"]);
$key = $this->dbh->escape_string($_REQUEST["key"]);
- $is_cat = $_REQUEST["is_cat"] != false;
+ $is_cat = sql_bool_to_bool($_REQUEST["is_cat"]);
$limit = (int)$this->dbh->escape_string($_REQUEST["limit"]);
$offset = (int)$this->dbh->escape_string($_REQUEST["offset"]);
@@ -350,8 +378,10 @@ class Handler_Public extends Handler {
$search_mode = $this->dbh->escape_string($_REQUEST["smode"]);
$view_mode = $this->dbh->escape_string($_REQUEST["view-mode"]);
$order = $this->dbh->escape_string($_REQUEST["order"]);
+ $start_ts = $this->dbh->escape_string($_REQUEST["ts"]);
$format = $this->dbh->escape_string($_REQUEST['format']);
+ $orig_guid = sql_bool_to_bool($_REQUEST["orig_guid"]);
if (!$format) $format = 'atom';
@@ -371,20 +401,24 @@ class Handler_Public extends Handler {
if ($owner_id) {
$this->generate_syndicated_feed($owner_id, $feed, $is_cat, $limit,
- $offset, $search, $search_mode, $view_mode, $format, $order);
+ $offset, $search, $search_mode, $view_mode, $format, $order, $orig_guid, $start_ts);
} else {
header('HTTP/1.1 403 Forbidden');
}
}
- function globalUpdateFeeds() {
- include "rssfuncs.php";
- // Update all feeds needing a update.
- update_daemon_common(0, true, false);
- housekeeping_common(false);
+ function updateTask() {
+ PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
+ }
- PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+ function housekeepingTask() {
+ PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", false);
+ }
+
+ function globalUpdateFeeds() {
+ RPC::updaterandomfeed_real($this->dbh);
+ PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
}
function sharepopup() {
@@ -393,11 +427,14 @@ class Handler_Public extends Handler {
}
header('Content-Type: text/html; charset=utf-8');
- print "dbh->escape_string(trim($_REQUEST["feed_url"]));
- $cat_id = $this->dbh->escape_string($_REQUEST["cat_id"]);
- $from = $this->dbh->escape_string($_REQUEST["from"]);
- $feed_urls = array();
-
- /* only read authentication information from POST */
-
- $auth_login = $this->dbh->escape_string(trim($_POST["auth_login"]));
- $auth_pass = $this->dbh->escape_string(trim($_POST["auth_pass"]));
-
- $rc = subscribe_to_feed($feed_url, $cat_id, $auth_login, $auth_pass);
-
- switch ($rc) {
- case 1:
- print_notice(T_sprintf("Subscribed to %s.", $feed_url));
- break;
- case 2:
- print_error(T_sprintf("Could not subscribe to %s.", $feed_url));
- break;
- case 3:
- print_error(T_sprintf("No feeds found in %s.", $feed_url));
- break;
- case 0:
- print_warning(T_sprintf("Already subscribed to %s.", $feed_url));
- break;
- case 4:
- print_notice(__("Multiple feed URLs found."));
- $contents = @fetch_file_contents($url, false, $auth_login, $auth_pass);
- if (is_html($contents)) {
- $feed_urls = get_feeds_from_html($url, $contents);
- }
- break;
- case 5:
- print_error(T_sprintf("Could not subscribe to %s.Can't download the Feed URL.", $feed_url)); - break; - } - - if ($feed_urls) { - print ""; - } - - $tp_uri = get_self_url_prefix() . "/prefs.php"; - $tt_uri = get_self_url_prefix(); - - if ($rc <= 2){ - $result = $this->dbh->query("SELECT id FROM ttrss_feeds WHERE - feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]); - - $feed_id = $this->dbh->fetch_result($result, 0, "id"); - } else { - $feed_id = 0; - } - - print "
"; - - if ($feed_id) { - print "
"; - } - - print ""; - - print ""; - } - function index() { header("Content-Type: text/plain"); print json_encode(array("error" => array("code" => 7))); @@ -747,11 +713,15 @@ class Handler_Public extends Handler { function forgotpass() { startup_gettext(); + @$hash = $_REQUEST["hash"]; + header('Content-Type: text/html; charset=utf-8'); - print ""."Completed."."
"; + + } else { + print_error("Some of the information provided is missing or incorrect."); + } + } else { + print_error("Some of the information provided is missing or incorrect."); + } + } else { + print_error("Some of the information provided is missing or incorrect."); + } + + print ""; + + } else if (!$method) { + print_notice(__("You will need to provide valid account name and email. A password reset link will be sent to your email address.")); print ""; + + print "readTemplateFromFile("templates/email_article_template.txt");
@@ -56,7 +104,7 @@ class Mail extends Plugin {
$tpl->setVariable('USER_EMAIL', $user_email, true);
$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
- $result = db_query("SELECT link, content, title, note
+ $result = db_query("SELECT DISTINCT link, content, title, note
FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
id IN ($param) AND owner_uid = " . $_SESSION["uid"]);
@@ -87,25 +135,20 @@ class Mail extends Plugin {
print "| "; - print __('From:'); - - print " | "; - - print "\">"; - - print " |
| "; + $addresslist = explode(",", $this->host->get($this, "addresslist")); print __('To:'); print " | "; - print ""; + name=\"destination\" id=\"emailArticleDlg_destination\">"; */ + + print_select("destination", "", $addresslist, 'style="width: 30em" dojoType="dijit.form.ComboBox"'); - print ""; +/* print ""; */ print " |
";
@@ -139,8 +182,8 @@ class Mail extends Plugin {
$mail = new ttrssMailer();
- $mail->From = strip_tags($_REQUEST['from_email']);
- $mail->FromName = strip_tags($_REQUEST['from_name']);
+ $mail->AddReplyTo(strip_tags($_REQUEST['from_email']),
+ strip_tags($_REQUEST['from_name']));
//$mail->AddAddress($_REQUEST['destination']);
$addresses = explode(';', $_REQUEST['destination']);
foreach($addresses as $nextaddr)
@@ -155,14 +198,14 @@ class Mail extends Plugin {
if (!$rc) {
$reply['error'] = $mail->ErrorInfo;
} else {
- save_email_address(db_escape_string($destination));
+ //save_email_address(db_escape_string($destination));
$reply['message'] = "UPDATE_COUNTERS";
}
print json_encode($reply);
}
- function completeEmails() {
+ /* function completeEmails() {
$search = db_escape_string($_REQUEST["search"]);
print "
";
} else {
$marked_pic = "";
}
diff --git a/plugins/no_iframes/init.php b/plugins/no_iframes/init.php
new file mode 100644
index 000000000..c66d7abaf
--- /dev/null
+++ b/plugins/no_iframes/init.php
@@ -0,0 +1,29 @@
+host = $host;
+
+ $host->add_hook($host::HOOK_SANITIZE, $this);
+ }
+
+ function hook_sanitize($doc, $site_url, $allowed_elements, $disallowed_attributes) {
+
+ $allowed_elements = array_diff($allowed_elements, array("iframe"));
+
+ return array($doc, $allowed_elements, $disallowed_attributes);
+ }
+
+ function api_version() {
+ return 2;
+ }
+
+}
+?>
diff --git a/plugins/no_title_counters/init.js b/plugins/no_title_counters/init.js
new file mode 100644
index 000000000..9c16856a2
--- /dev/null
+++ b/plugins/no_title_counters/init.js
@@ -0,0 +1,5 @@
+dojo.addOnLoad(function() {
+ updateTitle = function() {
+ document.title = "Tiny Tiny RSS";
+ };
+});
diff --git a/plugins/no_title_counters/init.php b/plugins/no_title_counters/init.php
new file mode 100644
index 000000000..a9f22831d
--- /dev/null
+++ b/plugins/no_title_counters/init.php
@@ -0,0 +1,25 @@
+host = $host;
+
+ }
+
+ function get_js() {
+ return file_get_contents(__DIR__ . "/init.js");
+ }
+
+ function api_version() {
+ return 2;
+ }
+
+}
+?>
diff --git a/plugins/no_url_hashes/init.js b/plugins/no_url_hashes/init.js
new file mode 100644
index 000000000..a437a1f3e
--- /dev/null
+++ b/plugins/no_url_hashes/init.js
@@ -0,0 +1,4 @@
+dojo.addOnLoad(function() {
+ hash_set = function() { };
+ hash_get = function() { };
+});
diff --git a/plugins/no_url_hashes/init.php b/plugins/no_url_hashes/init.php
new file mode 100644
index 000000000..da31267c2
--- /dev/null
+++ b/plugins/no_url_hashes/init.php
@@ -0,0 +1,25 @@
+host = $host;
+
+ }
+
+ function get_js() {
+ return file_get_contents(__DIR__ . "/init.js");
+ }
+
+ function api_version() {
+ return 2;
+ }
+
+}
+?>
diff --git a/plugins/note/note.png b/plugins/note/note.png
index 7f9f3fc3f..244e6ca04 100644
Binary files a/plugins/note/note.png and b/plugins/note/note.png differ
diff --git a/plugins/search_sphinx/init.php b/plugins/search_sphinx/init.php
new file mode 100644
index 000000000..557b2682c
--- /dev/null
+++ b/plugins/search_sphinx/init.php
@@ -0,0 +1,64 @@
+add_hook($host::HOOK_SEARCH, $this);
+
+ if (class_exists("SphinxClient")) {
+ user_error("Your PHP has a separate systemwide Sphinx client installed which conflicts with the client library used by tt-rss. Either remove the system library or disable Sphinx support.");
+ }
+
+ require_once __DIR__ . "/sphinxapi.php";
+ }
+
+ function hook_search($search) {
+ $offset = 0;
+ $limit = 500;
+
+ $sphinxClient = new SphinxClient();
+
+ $sphinxpair = explode(":", SPHINX_SERVER, 2);
+
+ $sphinxClient->SetServer($sphinxpair[0], (int)$sphinxpair[1]);
+ $sphinxClient->SetConnectTimeout(1);
+
+ $sphinxClient->SetFieldWeights(array('title' => 70, 'content' => 30,
+ 'feed_title' => 20));
+
+ $sphinxClient->SetMatchMode(SPH_MATCH_EXTENDED2);
+ $sphinxClient->SetRankingMode(SPH_RANK_PROXIMITY_BM25);
+ $sphinxClient->SetLimits($offset, $limit, 1000);
+ $sphinxClient->SetArrayResult(false);
+ $sphinxClient->SetFilter('owner_uid', array($_SESSION['uid']));
+
+ $result = $sphinxClient->Query($search, SPHINX_INDEX);
+
+ $ids = array();
+
+ if (is_array($result['matches'])) {
+ foreach (array_keys($result['matches']) as $int_id) {
+ $ref_id = $result['matches'][$int_id]['attrs']['ref_id'];
+ array_push($ids, $ref_id);
+ }
+ }
+
+ $ids = join(",", $ids);
+
+ if ($ids)
+ return array("ref_id IN ($ids)", array());
+ else
+ return array("ref_id = -1", array());
+ }
+
+ function api_version() {
+ return 2;
+ }
+}
+?>
diff --git a/lib/sphinxapi.php b/plugins/search_sphinx/sphinxapi.php
similarity index 100%
rename from lib/sphinxapi.php
rename to plugins/search_sphinx/sphinxapi.php
diff --git a/plugins/share/init.php b/plugins/share/init.php
index 72a4d4bf9..899677c32 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -12,14 +12,66 @@ class Share extends Plugin {
$this->host = $host;
$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
+ $host->add_hook($host::HOOK_PREFS_TAB_SECTION, $this);
}
function get_js() {
return file_get_contents(dirname(__FILE__) . "/share.js");
}
+ function get_prefs_js() {
+ return file_get_contents(dirname(__FILE__) . "/share_prefs.js");
+ }
+
+
+ function unshare() {
+ $id = db_escape_string($_REQUEST['id']);
+
+ db_query("UPDATE ttrss_user_entries SET uuid = '' WHERE int_id = '$id'
+ AND owner_uid = " . $_SESSION['uid']);
+
+ print "OK";
+ }
+
+ function hook_prefs_tab_section($id) {
+ if ($id == "prefFeedsPublishedGenerated") {
+
+ print_warning(__("You can disable all articles shared by unique URLs here."));
+
+ print ""; + + print " "; + + print " "; + + } + } + + // Silent + function clearArticleKeys() { + db_query("UPDATE ttrss_user_entries SET uuid = '' WHERE + owner_uid = " . $_SESSION["uid"]); + + return; + } + + + function newkey() { + $id = db_escape_string($_REQUEST['id']); + + $uuid = db_escape_string(uniqid(base_convert(rand(), 10, 36))); + + db_query("UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$id' + AND owner_uid = " . $_SESSION['uid']); + + print json_encode(array("link" => $uuid)); + } + function hook_article_button($line) { - return "![](\"plugins/share/share.png\" "\".__(") ";
@@ -39,7 +91,7 @@ class Share extends Plugin {
$ref_id = db_fetch_result($result, 0, "ref_id");
if (!$uuid) {
- $uuid = db_escape_string(sha1(uniqid(rand(), true)));
+ $uuid = db_escape_string(uniqid(base_convert(rand(), 10, 36)));
db_query("UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$param'
AND owner_uid = " . $_SESSION['uid']);
}
@@ -50,7 +102,7 @@ class Share extends Plugin {
$url_path .= "/public.php?op=share&key=$uuid";
print "";
/* if (!label_find_id(__('Shared'), $_SESSION["uid"]))
@@ -61,6 +113,12 @@ class Share extends Plugin {
print "";
+ print "";
+
+ print "";
+
print "";
diff --git a/plugins/share/notshared.png b/plugins/share/notshared.png
new file mode 100644
index 000000000..523575306
Binary files /dev/null and b/plugins/share/notshared.png differ
diff --git a/plugins/share/share.js b/plugins/share/share.js
index 6752189ea..09c973ed8 100644
--- a/plugins/share/share.js
+++ b/plugins/share/share.js
@@ -9,12 +9,79 @@ function shareArticle(id) {
id: "shareArticleDlg",
title: __("Share article by URL"),
style: "width: 600px",
+ newurl: function() {
+
+ var ok = confirm(__("Generate new share URL for this article?"));
+
+ if (ok) {
+
+ notify_progress("Trying to change URL...", true);
+
+ var query = "op=pluginhandler&plugin=share&method=newkey&id=" + param_escape(id);
+
+ new Ajax.Request("backend.php", {
+ parameters: query,
+ onComplete: function(transport) {
+ var reply = JSON.parse(transport.responseText);
+ var new_link = reply.link;
+
+ var e = $('gen_article_url');
+
+ if (new_link) {
+
+ e.innerHTML = e.innerHTML.replace(/\&key=.*$/,
+ "&key=" + new_link);
+
+ e.href = e.href.replace(/\&key=.*$/,
+ "&key=" + new_link);
+
+ new Effect.Highlight(e);
+
+ var img = $("SHARE-IMG-" + id);
+ if (img) img.src = img.src.replace("notshared.png", "share.png");
+
+ notify('');
+
+ } else {
+ notify_error("Could not change URL.");
+ }
+ } });
+
+ }
+
+ },
+ unshare: function() {
+
+ var ok = confirm(__("Remove sharing for this article?"));
+
+ if (ok) {
+
+ notify_progress("Trying to unshare...", true);
+
+ var query = "op=pluginhandler&plugin=share&method=unshare&id=" + param_escape(id);
+
+ new Ajax.Request("backend.php", {
+ parameters: query,
+ onComplete: function(transport) {
+ notify("Article unshared.");
+
+ var img = $("SHARE-IMG-" + id);
+ if (img) img.src = img.src.replace("share.png", "notshared.png");
+
+ dialog.hide();
+ } });
+ }
+
+ },
href: query});
dialog.show();
+ var img = $("SHARE-IMG-" + id);
+ if (img) img.src = img.src.replace("notshared.png", "share.png");
+
} catch (e) {
- exception_error("emailArticle", e);
+ exception_error("shareArticle", e);
}
}
diff --git a/plugins/share/share.png b/plugins/share/share.png
index 3b6398f4a..25eacb7c2 100644
Binary files a/plugins/share/share.png and b/plugins/share/share.png differ
diff --git a/plugins/share/share_prefs.js b/plugins/share/share_prefs.js
new file mode 100644
index 000000000..9efe291f9
--- /dev/null
+++ b/plugins/share/share_prefs.js
@@ -0,0 +1,21 @@
+function clearArticleAccessKeys() {
+
+ var ok = confirm(__("This will invalidate all previously shared article URLs. Continue?"));
+
+ if (ok) {
+ notify_progress("Clearing URLs...");
+
+ var query = "?op=pluginhandler&plugin=share&method=clearArticleKeys";
+
+ new Ajax.Request("backend.php", {
+ parameters: query,
+ onComplete: function(transport) {
+ notify_info("Shared URLs cleared.");
+ } });
+ }
+
+ return false;
+}
+
+
+
diff --git a/plugins/shorten_expanded/init.css b/plugins/shorten_expanded/init.css
new file mode 100644
index 000000000..5e1bfa8f3
--- /dev/null
+++ b/plugins/shorten_expanded/init.css
@@ -0,0 +1,9 @@
+div.contentSizeWrapper {
+ overflow : hidden;
+ text-overflow: ellipsis;
+ height : 700px;
+}
+
+button.expandPrompt {
+ margin-top : 20px;
+}
diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js
new file mode 100644
index 000000000..ba82b643b
--- /dev/null
+++ b/plugins/shorten_expanded/init.js
@@ -0,0 +1,45 @@
+var _shorten_expanded_threshold = 900; //px, longer than css height so that we would only clip articles significantly longer than limit
+
+function expandSizeWrapper(id) {
+ try {
+ var row = $(id);
+
+ console.log(row);
+
+ if (row) {
+ var content = row.select(".contentSizeWrapper")[0];
+ var link = row.select(".expandPrompt")[0];
+
+ if (content) content.removeClassName("contentSizeWrapper");
+ if (link) Element.hide(link);
+
+ }
+ } catch (e) {
+ exception_error("expandSizeWrapper", e);
+ }
+
+ return false;
+
+}
+
+dojo.addOnLoad(function() {
+ PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function(row) {
+ if (getInitParam('cdm_expanded')) {
+
+ window.setTimeout(function() {
+ if (row) {
+ if (row.offsetHeight >= _shorten_expanded_threshold) {
+ var content = row.select(".cdmContentInner")[0];
+
+ if (content) {
+ content.innerHTML = " "; #pane
diff --git a/plugins/vf_shared/init.php b/plugins/vf_shared/init.php
new file mode 100644
index 000000000..c7eac9659
--- /dev/null
+++ b/plugins/vf_shared/init.php
@@ -0,0 +1,60 @@
+host = $host;
+
+ $host->add_feed(-1, __("Shared articles"), 'plugins/vf_shared/share.png', $this);
+ }
+
+ function api_version() {
+ return 2;
+ }
+
+ function get_unread($feed_id) {
+ $result = db_query("select count(int_id) AS count from ttrss_user_entries where owner_uid = ".$_SESSION["uid"]." and unread = true and uuid != ''");
+
+ return db_fetch_result($result, 0, "count");
+ }
+
+ function get_total($feed_id) {
+ $result = db_query("select count(int_id) AS count from ttrss_user_entries where owner_uid = ".$_SESSION["uid"]." and uuid != ''");
+
+ return db_fetch_result($result, 0, "count");
+ }
+
+ //function queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false) {
+
+ function get_headlines($feed_id, $options) {
+ $qfh_ret = queryFeedHeadlines(-4,
+ $options['limit'],
+ $this->get_unread(-1) > 0 ? "adaptive" : "all_articles",
+ false,
+ $options['search'],
+ $options['search_mode'],
+ $options['override_order'],
+ $options['offset'],
+ $options['owner_uid'],
+ $options['filter'],
+ $options['since_id'],
+ $options['include_children'],
+ false,
+ "uuid != ''",
+ "ttrss_feeds.title AS feed_title,");
+
+ $qfh_ret[1] = __("Shared articles");
+
+ return $qfh_ret;
+ }
+
+}
+?>
diff --git a/plugins/vf_shared/share.png b/plugins/vf_shared/share.png
new file mode 100644
index 000000000..25eacb7c2
Binary files /dev/null and b/plugins/vf_shared/share.png differ
diff --git a/prefs.php b/prefs.php
index fcf21cf2e..cc6267798 100644
--- a/prefs.php
+++ b/prefs.php
@@ -32,15 +32,19 @@
" +
+ content.innerHTML + " ";
+
+ }
+ }
+ }
+ }, 150);
+ }
+ });
+});
diff --git a/plugins/shorten_expanded/init.php b/plugins/shorten_expanded/init.php
new file mode 100644
index 000000000..1d0c99eca
--- /dev/null
+++ b/plugins/shorten_expanded/init.php
@@ -0,0 +1,29 @@
+host = $host;
+
+ }
+
+ function get_css() {
+ return file_get_contents(__DIR__ . "/init.css");
+ }
+
+ function get_js() {
+ return file_get_contents(__DIR__ . "/init.js");
+ }
+
+ function api_version() {
+ return 2;
+ }
+
+}
+?>
diff --git a/plugins/updater/init.php b/plugins/updater/init.php
index fa283c8be..6ee018f74 100644
--- a/plugins/updater/init.php
+++ b/plugins/updater/init.php
@@ -24,6 +24,8 @@ class Updater extends Plugin {
// __FILE__ is in plugins/updater so we need to go one level up
$work_dir = dirname(dirname(dirname(__FILE__)));
$parent_dir = dirname($work_dir);
+ // Set PATH to run "which"
+ putenv('PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"');
$log = array();
if (!is_array($params)) $params = array();
@@ -61,6 +63,20 @@ class Updater extends Plugin {
putenv("PATH=" . getenv("PATH") . PATH_SEPARATOR . "/bin" .
PATH_SEPARATOR . "/usr/bin");
+ array_push($log, "Checking for system() call...");
+
+ $disabled = explode(',', ini_get('disable_functions'));
+ foreach ($disabled as $function) {
+ if ( trim($function) == 'system' ) {
+ array_push($log, "Can not execute commands with PHP's system() function.");
+ $stop = true;
+ }
+ }
+
+ if ( $stop == true ) {
+ break;
+ }
+
array_push($log, "Checking for tar...");
$system_rc = 0;
@@ -234,6 +250,7 @@ class Updater extends Plugin {
CACHE_DIR . "/images",
CACHE_DIR . "/js",
CACHE_DIR . "/simplepie",
+ CACHE_DIR . "/upload",
ICONS_DIR,
LOCK_DIRECTORY);
@@ -339,6 +356,10 @@ class Updater extends Plugin {
} else {
print_notice(__("Your Tiny Tiny RSS installation is up to date."));
+
+ print ""; + } print " |