/**
* Return available translations names.
- *
+ *
* @access public
* @return array A array of available translations.
*/
function get_translations() {
$tr = array(
- "auto" => "Detect automatically",
+ "auto" => "Detect automatically",
"ca_CA" => "Català",
"en_US" => "English",
"es_ES" => "Español",
return $tr;
}
- if (ENABLE_TRANSLATIONS == true) { // If translations are enabled.
- require_once "lib/accept-to-gettext.php";
- require_once "lib/gettext/gettext.inc";
-
- function startup_gettext() {
-
- # Get locale from Accept-Language header
- $lang = al2gt(array_keys(get_translations()), "text/html");
+ require_once "lib/accept-to-gettext.php";
+ require_once "lib/gettext/gettext.inc";
- if (defined('_TRANSLATION_OVERRIDE_DEFAULT')) {
- $lang = _TRANSLATION_OVERRIDE_DEFAULT;
- }
+ function startup_gettext() {
- if ($_COOKIE["ttrss_lang"] && $_COOKIE["ttrss_lang"] != "auto") {
- $lang = $_COOKIE["ttrss_lang"];
- }
+ # Get locale from Accept-Language header
+ $lang = al2gt(array_keys(get_translations()), "text/html");
- /* In login action of mobile version */
- if ($_POST["language"] && defined('MOBILE_VERSION')) {
- $lang = $_POST["language"];
- $_COOKIE["ttrss_lang"] = $lang;
- }
+ if (defined('_TRANSLATION_OVERRIDE_DEFAULT')) {
+ $lang = _TRANSLATION_OVERRIDE_DEFAULT;
+ }
- if ($lang) {
- if (defined('LC_MESSAGES')) {
- _setlocale(LC_MESSAGES, $lang);
- } else if (defined('LC_ALL')) {
- _setlocale(LC_ALL, $lang);
- } else {
- die("can't setlocale(): please set ENABLE_TRANSLATIONS to false in config.php");
- }
+ if ($_COOKIE["ttrss_lang"] && $_COOKIE["ttrss_lang"] != "auto") {
+ $lang = $_COOKIE["ttrss_lang"];
+ }
- if (defined('MOBILE_VERSION')) {
- _bindtextdomain("messages", "../locale");
- } else {
- _bindtextdomain("messages", "locale");
- }
+ /* In login action of mobile version */
+ if ($_POST["language"] && defined('MOBILE_VERSION')) {
+ $lang = $_POST["language"];
+ $_COOKIE["ttrss_lang"] = $lang;
+ }
- _textdomain("messages");
- _bind_textdomain_codeset("messages", "UTF-8");
+ if ($lang) {
+ if (defined('LC_MESSAGES')) {
+ _setlocale(LC_MESSAGES, $lang);
+ } else if (defined('LC_ALL')) {
+ _setlocale(LC_ALL, $lang);
}
- }
- startup_gettext();
+ if (defined('MOBILE_VERSION')) {
+ _bindtextdomain("messages", "../locale");
+ } else {
+ _bindtextdomain("messages", "locale");
+ }
- } else { // If translations are enabled.
- function __($msg) {
- return $msg;
- }
- function startup_gettext() {
- // no-op
- return true;
+ _textdomain("messages");
+ _bind_textdomain_codeset("messages", "UTF-8");
}
- } // If translations are enabled.
+ }
+
+ startup_gettext();
if (defined('MEMCACHE_SERVER')) {
$memcache = new Memcache;
}
require_once 'db-prefs.php';
- require_once 'compat.php';
require_once 'errors.php';
require_once 'version.php';
require_once 'lib/phpmailer/class.phpmailer.php';
require_once 'lib/sphinxapi.php';
+ require_once 'lib/tmhoauth/tmhOAuth.php';
//define('MAGPIE_USER_AGENT_EXT', ' (Tiny Tiny RSS/' . VERSION . ')');
define('MAGPIE_OUTPUT_ENCODING', 'UTF-8');
- define('MAGPIE_CACHE_AGE', 60*15); // 15 minutes
define('SELF_USER_AGENT', 'Tiny Tiny RSS/' . VERSION . ' (http://tt-rss.org/)');
define('MAGPIE_USER_AGENT', SELF_USER_AGENT);
require_once "lib/magpierss/rss_fetch.inc";
require_once 'lib/magpierss/rss_utils.inc';
require_once 'lib/htmlpurifier/library/HTMLPurifier.auto.php';
+ require_once 'lib/pubsubhubbub/publisher.php';
+ require_once 'lib/pubsubhubbub/subscriber.php';
$config = HTMLPurifier_Config::createDefault();
- $allowed = "p,a[href],i,em,b,strong,code,pre,blockquote,br,img[src|alt|title],ul,ol,li,h1,h2,h3,h4";
+ $allowed = "p,a[href],i,em,b,strong,code,pre,blockquote,br,img[src|alt|title],ul,ol,li,h1,h2,h3,h4,s,object[classid|type|id|name|width|height|codebase],param[name|value]";
+ $config->set('HTML.SafeObject', true);
$config->set('HTML', 'Allowed', $allowed);
+ $config->set('Output.FlashCompat', true);
+ $config->set('Attr.EnableID', true);
+
$purifier = new HTMLPurifier($config);
/**
* Print a timestamped debug message.
- *
+ *
* @param string $msg The debug message.
* @return void
*/
/**
* Purge a feed old posts.
- *
+ *
* @param mixed $link A database connection.
* @param mixed $feed_id The id of the purged feed.
* @param mixed $purge_interval Olderness of purged posts.
function purge_feed($link, $feed_id, $purge_interval, $debug = false) {
if (!$purge_interval) $purge_interval = feed_purge_interval($link, $feed_id);
-
+
$rows = -1;
- $result = db_query($link,
+ $result = db_query($link,
"SELECT owner_uid FROM ttrss_feeds WHERE id = '$feed_id'");
$owner_uid = false;
if (preg_match("/^7\./", $pg_version) || preg_match("/^8\.0/", $pg_version)) {
- $result = db_query($link, "DELETE FROM ttrss_user_entries WHERE
- ttrss_entries.id = ref_id AND
- marked = false AND
- feed_id = '$feed_id' AND
+ $result = db_query($link, "DELETE FROM ttrss_user_entries WHERE
+ ttrss_entries.id = ref_id AND
+ marked = false AND
+ feed_id = '$feed_id' AND
$query_limit
ttrss_entries.date_updated < NOW() - INTERVAL '$purge_interval days'");
} else {
- $result = db_query($link, "DELETE FROM ttrss_user_entries
- USING ttrss_entries
- WHERE ttrss_entries.id = ref_id AND
- marked = false AND
- feed_id = '$feed_id' AND
+ $result = db_query($link, "DELETE FROM ttrss_user_entries
+ USING ttrss_entries
+ WHERE ttrss_entries.id = ref_id AND
+ marked = false AND
+ feed_id = '$feed_id' AND
$query_limit
ttrss_entries.date_updated < NOW() - INTERVAL '$purge_interval days'");
}
$rows = pg_affected_rows($result);
-
+
} else {
-
+
/* $result = db_query($link, "DELETE FROM ttrss_user_entries WHERE
marked = false AND feed_id = '$feed_id' AND
- (SELECT date_updated FROM ttrss_entries WHERE
+ (SELECT date_updated FROM ttrss_entries WHERE
id = ref_id) < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)"); */
- $result = db_query($link, "DELETE FROM ttrss_user_entries
- USING ttrss_user_entries, ttrss_entries
- WHERE ttrss_entries.id = ref_id AND
- marked = false AND
- feed_id = '$feed_id' AND
+ $result = db_query($link, "DELETE FROM ttrss_user_entries
+ USING ttrss_user_entries, ttrss_entries
+ WHERE ttrss_entries.id = ref_id AND
+ marked = false AND
+ feed_id = '$feed_id' AND
$query_limit
ttrss_entries.date_updated < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)");
-
+
$rows = mysql_affected_rows($link);
}
/**
* Purge old posts from old feeds. Not used anymore, purging is done after feed update.
- *
+ *
* @param mixed $link A database connection
* @param boolean $do_output Set to true to enable printed output, false by default.
* @param integer $limit The maximal number of removed posts.
} else {
$limit_qpart = "";
}
-
- $result = db_query($link,
- "SELECT id,purge_interval,owner_uid FROM ttrss_feeds
+
+ $result = db_query($link,
+ "SELECT id,purge_interval,owner_uid FROM ttrss_feeds
ORDER BY $random_qpart $limit_qpart");
while ($line = db_fetch_assoc($result)) {
$owner_uid = $line["owner_uid"];
if ($purge_interval == 0) {
-
- $tmp_result = db_query($link,
+
+ $tmp_result = db_query($link,
"SELECT value FROM ttrss_user_prefs WHERE
pref_name = 'PURGE_OLD_DAYS' AND owner_uid = '$owner_uid'");
- if (db_num_rows($tmp_result) != 0) {
+ if (db_num_rows($tmp_result) != 0) {
$purge_interval = db_fetch_result($tmp_result, 0, "value");
}
}
if ($purge_interval > 0 || FORCE_ARTICLE_PURGE) {
purge_feed($link, $feed_id, $purge_interval, $do_output);
}
- }
+ }
purge_orphans($link, $do_output);
function feed_purge_interval($link, $feed_id) {
- $result = db_query($link, "SELECT purge_interval, owner_uid FROM ttrss_feeds
+ $result = db_query($link, "SELECT purge_interval, owner_uid FROM ttrss_feeds
WHERE id = '$feed_id'");
if (db_num_rows($result) == 1) {
$purge_interval = db_fetch_result($result, 0, "purge_interval");
$owner_uid = db_fetch_result($result, 0, "owner_uid");
- if ($purge_interval == 0) $purge_interval = get_pref($link,
+ if ($purge_interval == 0) $purge_interval = get_pref($link,
'PURGE_OLD_DAYS', $owner_uid);
return $purge_interval;
function purge_old_posts($link) {
$user_id = $_SESSION["uid"];
-
- $result = db_query($link, "SELECT id,purge_interval FROM ttrss_feeds
+
+ $result = db_query($link, "SELECT id,purge_interval FROM ttrss_feeds
WHERE owner_uid = '$user_id'");
while ($line = db_fetch_assoc($result)) {
if ($purge_interval > 0) {
purge_feed($link, $feed_id, $purge_interval);
}
- }
+ }
purge_orphans($link);
}
function purge_orphans($link, $do_output = false) {
// purge orphaned posts in main content table
- $result = db_query($link, "DELETE FROM ttrss_entries WHERE
+ $result = db_query($link, "DELETE FROM ttrss_entries WHERE
(SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
if ($do_output) {
}
}
- function fetch_file_contents($url, $type = false) {
- if (USE_CURL_FOR_ICONS) {
+ function fetch_file_contents($url, $type = false, $login = false, $pass = false) {
+ $login = urlencode($login);
+ $pass = urlencode($pass);
+
+ if (function_exists('curl_init')) {
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
curl_setopt($ch, CURLOPT_MAXREDIRS, 20);
curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+ curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+
+ if ($login && $pass)
+ curl_setopt($ch, CURLOPT_USERPWD, "$login:$pass");
$contents = @curl_exec($ch);
if ($contents === false) {
return false;
}
+ $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
curl_close($ch);
- if ($type && strpos($content_type, "$type") === false) {
+ if ($http_code != 200 || $type && strpos($content_type, "$type") === false) {
return false;
}
return $contents;
} else {
+ if ($login && $pass && $updated != 3) {
+ $url_parts = array();
+
+ preg_match("/(^[^:]*):\/\/(.*)/", $url, $url_parts);
+
+ if ($url_parts[1] && $url_parts[2]) {
+ $url = $url_parts[1] . "://$login:$pass@" . $url_parts[2];
+ }
+ }
+
return @file_get_contents($url);
}
* Try to determine the favicon URL for a feed.
* adapted from wordpress favicon plugin by Jeff Minard (http://thecodepro.com/)
* http://dev.wp-plugins.org/file/favatars/trunk/favatars.php
- *
+ *
* @param string $url A feed or page URL
* @access public
* @return mixed The favicon URL, or false if none was found.
$doc = new DOMDocument();
$doc->loadHTML($html);
$xpath = new DOMXPath($doc);
- $entries = $xpath->query('/html/head/link[@rel="shortcut icon"]');
+ $base = $xpath->query('/html/head/base');
+ foreach ($base as $b) {
+ $url = $b->getAttribute("href");
+ break;
+ }
+
+ $entries = $xpath->query('/html/head/link[@rel="shortcut icon" or @rel="icon"]');
if (count($entries) > 0) {
foreach ($entries as $entry) {
$favicon_url = rewrite_relative_url($url, $entry->getAttribute("href"));
break;
}
- }
+ }
}
if (!$favicon_url)
$favicon_url = rewrite_relative_url($url, "/favicon.ico");
- // Run a test to see if what we have attempted to get actually exists.
- if(USE_CURL_FOR_ICONS || url_validate($favicon_url)) {
- return $favicon_url;
- } else {
- return false;
- }
+ return $favicon_url;
} // function get_favicon_url
- /**
- * Check if a link is a valid and working URL.
- *
- * @param mixed $link A URL to check
- * @access public
- * @return boolean True if the URL is valid, false otherwise.
- */
- function url_validate($link) {
-
- $url_parts = @parse_url($link);
-
- if ( empty( $url_parts["host"] ) )
- return false;
-
- if ( !empty( $url_parts["path"] ) ) {
- $documentpath = $url_parts["path"];
- } else {
- $documentpath = "/";
- }
-
- if ( !empty( $url_parts["query"] ) )
- $documentpath .= "?" . $url_parts["query"];
-
- $host = $url_parts["host"];
- $port = $url_parts["port"];
-
- if ( empty($port) )
- $port = "80";
-
- $socket = @fsockopen( $host, $port, $errno, $errstr, 30 );
-
- if ( !$socket )
- return false;
-
- fwrite ($socket, "HEAD ".$documentpath." HTTP/1.0\r\nHost: $host\r\n\r\n");
-
- $http_response = fgets( $socket, 22 );
-
- $responses = "/(200 OK)|(30[123])/";
- if ( preg_match($responses, $http_response) ) {
- fclose($socket);
- return true;
- } else {
- return false;
- }
-
- } // function url_validate
-
function check_feed_favicon($site_url, $feed, $link) {
$favicon_url = get_favicon_url($site_url);
if ($favicon_url && !file_exists($icon_file)) {
$contents = fetch_file_contents($favicon_url, "image");
-
if ($contents) {
$fp = fopen($icon_file, "w");
}
}
- function update_rss_feed($link, $feed, $ignore_daemon = false) {
+ function update_rss_feed($link, $feed, $ignore_daemon = false, $no_cache = 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
+ $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);
+ update_rss_feed_real($link, $line["id"], $ignore_daemon, $no_cache);
}
} else {
- update_rss_feed_real($link, $feed, $ignore_daemon);
+ update_rss_feed_real($link, $feed, $ignore_daemon, $no_cache);
}
}
- function update_rss_feed_real($link, $feed, $ignore_daemon = false) {
+ function update_rss_feed_real($link, $feed, $ignore_daemon = false, $no_cache = false) {
global $memcache;
$updstart_thresh_qpart = "(ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '120 seconds')";
} else {
$updstart_thresh_qpart = "(ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 120 SECOND))";
- }
-
+ }
+
$result = db_query($link, "SELECT id,update_interval,auth_login,
auth_pass,cache_images,update_method
FROM ttrss_feeds WHERE id = '$feed' AND $updstart_thresh_qpart");
} else {
$result = db_query($link, "SELECT id,update_interval,auth_login,
- feed_url,auth_pass,cache_images,update_method,last_updated
+ feed_url,auth_pass,cache_images,update_method,last_updated,
+ mark_unread_on_update, owner_uid, update_on_checksum_change,
+ pubsub_state
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 NOT FOUND/SKIPPED");
- }
+ }
return false;
}
$update_method = db_fetch_result($result, 0, "update_method");
$last_updated = db_fetch_result($result, 0, "last_updated");
+ $owner_uid = db_fetch_result($result, 0, "owner_uid");
+ $mark_unread_on_update = sql_bool_to_bool(db_fetch_result($result,
+ 0, "mark_unread_on_update"));
+ $update_on_checksum_change = sql_bool_to_bool(db_fetch_result($result,
+ 0, "update_on_checksum_change"));
+ $pubsub_state = db_fetch_result($result, 0, "pubsub_state");
db_query($link, "UPDATE ttrss_feeds SET last_update_started = NOW()
WHERE id = '$feed'");
$auth_login = db_fetch_result($result, 0, "auth_login");
$auth_pass = db_fetch_result($result, 0, "auth_pass");
- if (DEFAULT_UPDATE_METHOD == "1") {
- $use_simplepie = $update_method != 1;
- } else {
- $use_simplepie = $update_method == 2;
- }
+ if ($update_method == 0)
+ $update_method = DEFAULT_UPDATE_METHOD + 1;
+
+ // 1 - Magpie
+ // 2 - SimplePie
+ // 3 - Twitter OAuth
+
+ if ($update_method == 2)
+ $use_simplepie = true;
+ else
+ $use_simplepie = false;
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
- _debug("use simplepie: $use_simplepie (feed setting: $update_method)\n");
+ _debug("update method: $update_method (feed setting: $update_method) (use simplepie: $use_simplepie)\n");
}
- if (!$use_simplepie) {
+ if ($update_method == 1) {
$auth_login = urlencode($auth_login);
$auth_pass = urlencode($auth_pass);
}
$feed = db_escape_string($feed);
- if ($auth_login && $auth_pass) {
+ if ($auth_login && $auth_pass && $updated != 3) {
$url_parts = array();
preg_match("/(^[^:]*):\/\/(.*)/", $fetch_url, $url_parts);
} else {
- if (!$use_simplepie) {
+ if ($update_method == 3) {
+ $rss = fetch_twitter_rss($link, $fetch_url, $owner_uid);
+ } else if ($update_method == 1) {
+
+ define('MAGPIE_CACHE_AGE', get_feed_update_interval($link, $feed) * 60);
+ define('MAGPIE_CACHE_ON', !$no_cache);
+
$rss = @fetch_rss($fetch_url);
} else {
if (!is_dir(SIMPLEPIE_CACHE_DIR)) {
mkdir(SIMPLEPIE_CACHE_DIR);
}
-
+
$rss = new SimplePie();
$rss->set_useragent(SELF_USER_AGENT);
# $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');
+
+ $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->enable_cache(!$no_cache);
+
+ if (!$no_cache) {
$rss->set_cache_location(SIMPLEPIE_CACHE_DIR);
$rss->set_cache_duration(get_feed_update_interval($link, $feed) * 60);
}
-
+
$rss->init();
}
$feed = db_escape_string($feed);
- if ($use_simplepie) {
+ if ($update_method == 2) {
$fetch_ok = !$rss->error();
} else {
$fetch_ok = !!$rss;
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
_debug("update_rss_feed: registering title: $feed_title");
}
-
- db_query($link, "UPDATE ttrss_feeds SET
+
+ db_query($link, "UPDATE ttrss_feeds SET
title = '$feed_title' WHERE id = '$feed'");
}
}
if ($site_url && $orig_site_url != db_escape_string($site_url)) {
- db_query($link, "UPDATE ttrss_feeds SET
+ db_query($link, "UPDATE ttrss_feeds SET
site_url = '$site_url' WHERE id = '$feed'");
}
$icon_url = substr($icon_url, 0, 250);
- if ($icon_url && $orig_icon_url != $icon_url) {
- if (USE_CURL_FOR_ICONS || url_validate($icon_url)) {
- db_query($link, "UPDATE ttrss_feeds SET icon_url = '$icon_url' WHERE id = '$feed'");
- }
+ if ($icon_url && $orig_icon_url != $icon_url) {
+ db_query($link, "UPDATE ttrss_feeds SET icon_url = '$icon_url' WHERE id = '$feed'");
}
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
$filters = load_filters($link, $feed, $owner_uid);
+ if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug'] == 2) {
+ print_r($filters);
+ }
+
if ($use_simplepie) {
$iterator = $rss->get_items();
} else {
}
if (!is_array($iterator)) {
- /* db_query($link, "UPDATE ttrss_feeds
+ /* db_query($link, "UPDATE ttrss_feeds
SET last_error = 'Parse error: can\'t find any articles.'
WHERE id = '$feed'"); */
_debug("update_rss_feed: entry iterator is not an array, no articles?");
}
- db_query($link, "UPDATE ttrss_feeds
+ db_query($link, "UPDATE ttrss_feeds
SET last_updated = NOW(), last_error = '' WHERE id = '$feed'");
return; // no articles
}
+ if ($pubsub_state != 2) {
+
+ $feed_hub_url = false;
+ if ($use_simplepie) {
+ $links = $rss->get_links('hub');
+
+ if ($links && is_array($links)) {
+ foreach ($links as $l) {
+ $feed_hub_url = $l;
+ break;
+ }
+ }
+
+ } else {
+ $atom = $rss->channel['atom'];
+
+ if ($atom) {
+ if ($atom['link@rel'] == 'hub') {
+ $feed_hub_url = $atom['link@href'];
+ }
+
+ if (!$feed_hub_url && $atom['link#'] > 1) {
+ for ($i = 2; $i <= $atom['link#']; $i++) {
+ if ($atom["link#$i@rel"] == 'hub') {
+ $feed_hub_url = $atom["link#$i@href"];
+ break;
+ }
+ }
+ }
+ } else {
+ $feed_hub_url = $rss->channel['link_hub'];
+ }
+ }
+
+ if ($feed_hub_url && function_exists('curl_init')) {
+ $callback_url = get_self_url_prefix() .
+ "/backend.php?op=pubsub&id=$feed";
+
+ $s = new Subscriber($feed_hub_url, $callback_url);
+
+ $s->subscribe($fetch_url);
+
+ db_query($link, "UPDATE ttrss_feeds SET pubsub_state = 1
+ WHERE id = '$feed'");
+ }
+ }
+
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
_debug("update_rss_feed: processing articles...");
}
$entry_guid = $item["id"];
if (!$entry_guid) $entry_guid = $item["guid"];
+ if (!$entry_guid) $entry_guid = $item["about"];
if (!$entry_guid) $entry_guid = $item["link"];
if (!$entry_guid) $entry_guid = make_guid_from_title($item["title"]);
}
if (!$entry_content) $entry_content = $item["atom_content"];
if (!$entry_content) $entry_content = $item["summary"];
- if (!$entry_content ||
+ if (!$entry_content ||
strlen($entry_content) < strlen($item["description"])) {
$entry_content = $item["description"];
};
if (is_array($entry_content)) {
$entry_content = $entry_content["encoded"];
if (!$entry_content) $entry_content = $entry_content["escaped"];
- }
+ }
}
if ($_REQUEST["xdebug"] == 2) {
}
} else {
$entry_comments = strip_tags($item["comments"]);
-
+
$entry_author = db_escape_string(strip_tags($item['dc']['creator']));
if ($item['author']) {
-
+
if (is_array($item['author'])) {
-
+
if (!$entry_author) {
$entry_author = db_escape_string(strip_tags($item['author']['name']));
}
-
+
if (!$entry_author) {
$entry_author = db_escape_string(strip_tags($item['author']['email']));
}
}
-
+
if (!$entry_author) {
$entry_author = db_escape_string(strip_tags($item['author']));
}
$entry_guid = db_escape_string(strip_tags($entry_guid));
$entry_guid = mb_substr($entry_guid, 0, 250);
- $result = db_query($link, "SELECT id FROM ttrss_entries
+ $result = db_query($link, "SELECT id FROM ttrss_entries
WHERE guid = '$entry_guid'");
- $entry_content = db_escape_string($entry_content);
+ $entry_content = db_escape_string($entry_content, false);
$content_hash = "SHA1:" . sha1(strip_tags($entry_content));
if ($use_simplepie) {
$additional_tags_src = $item->get_categories();
-
+
if (is_array($additional_tags_src)) {
foreach ($additional_tags_src as $tobj) {
array_push($additional_tags, $tobj->get_term());
}
}
}
-
+
// parse <dc:subject> elements
-
+
$t_ctr = $item['dc']['subject#'];
-
+
if ($t_ctr > 0) {
array_push($additional_tags, $item['dc']['subject']);
}
# sanitize content
-
+
$entry_content = sanitize_article_content($entry_content);
$entry_title = sanitize_article_content($entry_title);
// base post entry does not exist, create it
$result = db_query($link,
- "INSERT INTO ttrss_entries
+ "INSERT INTO ttrss_entries
(title,
guid,
link,
num_comments,
author)
VALUES
- ('$entry_title',
- '$entry_guid',
+ ('$entry_title',
+ '$entry_guid',
'$entry_link',
- '$entry_timestamp_fmt',
- '$entry_content',
+ '$entry_timestamp_fmt',
+ '$entry_content',
'$content_hash',
- $no_orig_date,
+ $no_orig_date,
NOW(),
NOW(),
'$entry_comments',
// now it should exist, if not - bad luck then
- $result = db_query($link, "SELECT
+ $result = db_query($link, "SELECT
id,content_hash,no_orig_date,title,
".SUBSTRING_FOR_DATE."(date_updated,1,19) as date_updated,
".SUBSTRING_FOR_DATE."(updated,1,19) as updated,
num_comments
- FROM
- ttrss_entries
+ FROM
+ ttrss_entries
WHERE guid = '$entry_guid'");
$entry_ref_id = 0;
$orig_content_hash = db_fetch_result($result, 0, "content_hash");
$orig_title = db_fetch_result($result, 0, "title");
$orig_num_comments = db_fetch_result($result, 0, "num_comments");
- $orig_date_updated = strtotime(db_fetch_result($result,
+ $orig_date_updated = strtotime(db_fetch_result($result,
0, "date_updated"));
$ref_id = db_fetch_result($result, 0, "id");
// do we allow duplicate posts with same GUID in different feeds?
if (get_pref($link, "ALLOW_DUPLICATE_POSTS", $owner_uid, false)) {
$dupcheck_qpart = "AND (feed_id = '$feed' OR feed_id IS NULL)";
- } else {
+ } else {
$dupcheck_qpart = "";
}
/* Collect article tags here so we could filter by them: */
- $article_filters = get_article_filters($filters, $entry_title,
- $entry_content, $entry_link, $entry_timestamp, $entry_author,
+ $article_filters = get_article_filters($filters, $entry_title,
+ $entry_content, $entry_link, $entry_timestamp, $entry_author,
$entry_tags);
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
} else {
$unread = 'false';
$last_read_qpart = 'NOW()';
- }
+ }
if (find_article_filter($article_filters, 'mark') || $score > 1000) {
$marked = 'true';
}
$result = db_query($link,
- "INSERT INTO ttrss_user_entries
- (ref_id, owner_uid, feed_id, unread, last_read, marked,
- published, score, tag_cache, label_cache)
+ "INSERT INTO ttrss_user_entries
+ (ref_id, owner_uid, feed_id, unread, last_read, marked,
+ published, score, tag_cache, label_cache)
VALUES ('$ref_id', '$owner_uid', '$feed', $unread,
$last_read_qpart, $marked, $published, '$score', '', '')");
- $result = db_query($link,
+ if (PUBSUBHUBBUB_HUB && $published == 'true') {
+ $rss_link = get_self_url_prefix() .
+ "/backend.php?op=rss&id=-2&key=" .
+ get_feed_access_key($link, -2, false, $owner_uid);
+
+ $p = new Publisher(PUBSUBHUBBUB_HUB);
+
+ $pubsub_result = $p->publish_update($rss_link);
+ }
+
+ $result = db_query($link,
"SELECT int_id FROM ttrss_user_entries WHERE
ref_id = '$ref_id' AND owner_uid = '$owner_uid' AND
feed_id = '$feed' LIMIT 1");
$post_needs_update = false;
- if (get_pref($link, "UPDATE_POST_ON_CHECKSUM_CHANGE", $owner_uid, false) &&
- ($content_hash != $orig_content_hash)) {
+ if ($content_hash != $orig_content_hash) {
// print "<!-- [$entry_title] $content_hash vs $orig_content_hash -->";
$post_needs_update = true;
}
// $post_needs_update = true;
// }
- // if post needs update, update it and mark all user entries
- // linking to this post as updated
+ // if post needs update, update it and mark all user entries
+ // linking to this post as updated
if ($post_needs_update) {
if (defined('DAEMON_EXTENDED_DEBUG')) {
// print "<!-- post $orig_title needs update : $post_needs_update -->";
- db_query($link, "UPDATE ttrss_entries
+ db_query($link, "UPDATE ttrss_entries
SET title = '$entry_title', content = '$entry_content',
content_hash = '$content_hash',
+ updated = '$entry_timestamp_fmt',
num_comments = '$num_comments'
WHERE id = '$ref_id'");
- if (get_pref($link, "MARK_UNREAD_ON_UPDATE", $owner_uid, false)) {
- db_query($link, "UPDATE ttrss_user_entries
+ if ($mark_unread_on_update) {
+ db_query($link, "UPDATE ttrss_user_entries
SET last_read = null, unread = true WHERE ref_id = '$ref_id'");
- } else {
- db_query($link, "UPDATE ttrss_user_entries
+ } else if ($update_on_checksum_change) {
+ db_query($link, "UPDATE ttrss_user_entries
SET last_read = null WHERE ref_id = '$ref_id' AND unread = false");
}
foreach ($encs as $e) {
$e_item = array(
$e->link, $e->type, $e->length);
-
+
array_push($enclosures, $e_item);
}
}
// Skip boring tags
- $boring_tags = trim_array(split(",", mb_strtolower(get_pref($link,
+ $boring_tags = trim_array(split(",", mb_strtolower(get_pref($link,
'BLACKLISTED_TAGS', $owner_uid, ''), 'utf-8')));
$filtered_tags = array();
array_push($filtered_tags, $tag);
}
}
- }
+ }
$filtered_tags = array_unique($filtered_tags);
// Save article tags in the database
if (count($filtered_tags) > 0) {
-
+
db_query($link, "BEGIN");
-
+
foreach ($filtered_tags as $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
+
+ $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
+
+ db_query($link, "INSERT INTO ttrss_tags
(owner_uid,tag_name,post_int_id)
VALUES ('$owner_uid','$tag', '$entry_int_id')");
}
}
/* 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
+ 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");
- }
+ }
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
_debug("update_rss_feed: article processed");
}
- }
+ }
if (!$last_updated) {
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
purge_feed($link, $feed, 0);
- db_query($link, "UPDATE ttrss_feeds
+ db_query($link, "UPDATE ttrss_feeds
SET last_updated = NOW(), last_error = '' WHERE id = '$feed'");
// db_query($link, "COMMIT");
$error_msg = db_escape_string($error_msg);
- db_query($link,
- "UPDATE ttrss_feeds SET last_error = '$error_msg',
+ db_query($link,
+ "UPDATE ttrss_feeds SET last_error = '$error_msg',
last_updated = NOW() WHERE id = '$feed'");
}
$sel = "selected=\"1\"";
else
$sel = "";
-
+
print "<option value=\"$v\" $sel>$v</option>";
}
print "</select>";
$sel = 'selected="selected"';
else
$sel = "";
-
+
print "<option $sel value=\"$v\">".$values[$v]."</option>";
}
if ($filters["title"]) {
foreach ($filters["title"] as $filter) {
- $reg_exp = $filter["reg_exp"];
- $inverse = $filter["inverse"];
- if ((!$inverse && @preg_match("/$reg_exp/i", $title)) ||
+ $reg_exp = $filter["reg_exp"];
+ $inverse = $filter["inverse"];
+ if ((!$inverse && @preg_match("/$reg_exp/i", $title)) ||
($inverse && !@preg_match("/$reg_exp/i", $title))) {
array_push($matches, array($filter["action"], $filter["action_param"]));
$reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"];
- if ((!$inverse && @preg_match("/$reg_exp/i", $content)) ||
+ if ((!$inverse && @preg_match("/$reg_exp/i", $content)) ||
($inverse && !@preg_match("/$reg_exp/i", $content))) {
array_push($matches, array($filter["action"], $filter["action_param"]));
- }
+ }
}
}
if ($filters["both"]) {
- foreach ($filters["both"] as $filter) {
- $reg_exp = $filter["reg_exp"];
+ foreach ($filters["both"] as $filter) {
+ $reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"];
if ($inverse) {
$reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"];
- if ((!$inverse && @preg_match("/$reg_exp/i", $link)) ||
+ if ((!$inverse && @preg_match("/$reg_exp/i", $link)) ||
($inverse && !@preg_match("/$reg_exp/i", $link))) {
-
+
array_push($matches, array($filter["action"], $filter["action_param"]));
}
}
}
}
}
- }
+ }
if ($filters["author"]) {
foreach ($filters["author"] as $filter) {
- $reg_exp = $filter["reg_exp"];
- $inverse = $filter["inverse"];
- if ((!$inverse && @preg_match("/$reg_exp/i", $author)) ||
+ $reg_exp = $filter["reg_exp"];
+ $inverse = $filter["inverse"];
+ if ((!$inverse && @preg_match("/$reg_exp/i", $author)) ||
($inverse && !@preg_match("/$reg_exp/i", $author))) {
array_push($matches, array($filter["action"], $filter["action_param"]));
$reg_exp = $filter["reg_exp"];
$inverse = $filter["inverse"];
- if ((!$inverse && @preg_match("/$reg_exp/i", $tag_string)) ||
+ if ((!$inverse && @preg_match("/$reg_exp/i", $tag_string)) ||
($inverse && !@preg_match("/$reg_exp/i", $tag_string))) {
array_push($matches, array($filter["action"], $filter["action_param"]));
- }
+ }
}
}
function print_radio($id, $default, $true_is, $values, $attributes = "") {
foreach ($values as $v) {
-
+
if ($v == $default)
$sel = "checked";
else
} else {
$sel .= " value=\"0\"";
}
-
- print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\"
+
+ print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\"
type=\"radio\" $sel $attributes name=\"$id\"> $v ";
}
db_query($link, "BEGIN");
$result = db_query($link, "SELECT pref_name,def_value FROM ttrss_prefs");
-
- $u_result = db_query($link, "SELECT pref_name
+
+ $u_result = db_query($link, "SELECT pref_name
FROM ttrss_user_prefs WHERE owner_uid = '$uid' $profile_qpart");
$active_prefs = array();
while ($line = db_fetch_assoc($u_result)) {
- array_push($active_prefs, $line["pref_name"]);
+ array_push($active_prefs, $line["pref_name"]);
}
while ($line = db_fetch_assoc($result)) {
if (get_schema_version($link) < 63) {
db_query($link, "INSERT INTO ttrss_user_prefs
- (owner_uid,pref_name,value) VALUES
+ (owner_uid,pref_name,value) VALUES
('$uid', '".$line["pref_name"]."','".$line["def_value"]."')");
} else {
db_query($link, "INSERT INTO ttrss_user_prefs
- (owner_uid,pref_name,value, profile) VALUES
+ (owner_uid,pref_name,value, profile) VALUES
('$uid', '".$line["pref_name"]."','".$line["def_value"]."', $profile)");
}
function lookup_user_id($link, $user) {
- $result = db_query($link, "SELECT id FROM ttrss_users WHERE
+ $result = db_query($link, "SELECT id FROM ttrss_users WHERE
login = '$login'");
if (db_num_rows($result) == 1) {
header('WWW-Authenticate: Basic realm="Tiny Tiny RSS RSSGen"');
header('HTTP/1.0 401 Unauthorized');
exit;
-
+
} else {
- $auth_result = authenticate_user($link,
+ $auth_result = authenticate_user($link,
$_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"]);
if (!$auth_result) {
return true;
}
+ function get_ssl_certificate_id() {
+ if ($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"]) {
+ return sha1($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"] .
+ $_SERVER["REDIRECT_SSL_CLIENT_V_START"] .
+ $_SERVER["REDIRECT_SSL_CLIENT_V_END"] .
+ $_SERVER["REDIRECT_SSL_CLIENT_S_DN"]);
+ }
+ return "";
+ }
+
+ function get_login_by_ssl_certificate($link) {
+
+ $cert_serial = db_escape_string(get_ssl_certificate_id());
+
+ if ($cert_serial) {
+ $result = db_query($link, "SELECT login FROM ttrss_user_prefs, ttrss_users
+ WHERE pref_name = 'SSL_CERT_SERIAL' AND value = '$cert_serial' AND
+ owner_uid = ttrss_users.id");
+
+ if (db_num_rows($result) != 0) {
+ return db_escape_string(db_fetch_result($result, 0, "login"));
+ }
+ }
+
+ return "";
+ }
+
+ function get_remote_user($link) {
+
+ if (defined('ALLOW_REMOTE_USER_AUTH') && ALLOW_REMOTE_USER_AUTH) {
+ return db_escape_string($_SERVER["REMOTE_USER"]);
+ }
+
+ return db_escape_string(get_login_by_ssl_certificate($link));
+ }
+
+ function get_remote_fakepass($link) {
+ if (get_remote_user($link))
+ return "******";
+ else
+ return "";
+ }
+
function authenticate_user($link, $login, $password, $force_auth = false) {
if (!SINGLE_USER_MODE) {
$pwd_hash2 = encrypt_password($password, $login);
$login = db_escape_string($login);
- if (defined('ALLOW_REMOTE_USER_AUTH') && ALLOW_REMOTE_USER_AUTH
- && $_SERVER["REMOTE_USER"] && $login != "admin") {
+ $remote_user = get_remote_user($link);
- $login = db_escape_string($_SERVER["REMOTE_USER"]);
+ if ($remote_user && $remote_user == $login && $login != "admin") {
+
+ $login = $remote_user;
$query = "SELECT id,login,access_level,pwd_hash
FROM ttrss_users WHERE
login = '$login'";
+ if (defined('AUTO_CREATE_USER') && AUTO_CREATE_USER
+ && $_SERVER["REMOTE_USER"]) {
+ $result = db_query($link, $query);
+
+ // First login ?
+ if (db_num_rows($result) == 0) {
+ $query = "INSERT INTO ttrss_users
+ (login,access_level,last_login,created)
+ VALUES ('$login', 0, null, NOW())";
+ db_query($link, $query);
+ }
+ }
+
} else {
$query = "SELECT id,login,access_level,pwd_hash
FROM ttrss_users WHERE
}
$result = db_query($link, $query);
-
+
if (db_num_rows($result) == 1) {
$_SESSION["uid"] = db_fetch_result($result, 0, "id");
$_SESSION["name"] = db_fetch_result($result, 0, "login");
$_SESSION["access_level"] = db_fetch_result($result, 0, "access_level");
-
- db_query($link, "UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
+
+ db_query($link, "UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
$_SESSION["uid"]);
-
+
+
+ // LemonLDAP can send user informations via HTTP HEADER
+ if (defined('AUTO_CREATE_USER') && AUTO_CREATE_USER){
+ // update user name
+ if ($_SERVER['HTTP_USER_NAME']){
+ $fullname = db_escape_string($_SERVER['HTTP_USER_NAME']);
+ db_query($link, "UPDATE ttrss_users SET full_name = '$fullname' WHERE id = " .
+ $_SESSION["uid"]);
+ }
+ // update user mail
+ if ($_SERVER['HTTP_USER_MAIL']){
+ $email = db_escape_string($_SERVER['HTTP_USER_MAIL']);
+ db_query($link, "UPDATE ttrss_users SET email = '$email' WHERE id = " .
+ $_SESSION["uid"]);
+ }
+ }
+
$_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
$_SESSION["pwd_hash"] = db_fetch_result($result, 0, "pwd_hash");
$_SESSION["last_version_check"] = time();
-
+
initialize_user_prefs($link, $_SESSION["uid"]);
-
+
return true;
}
-
+
return false;
} else {
$_SESSION["name"] = "admin";
$_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
-
+
initialize_user_prefs($link, $_SESSION["uid"]);
-
+
return true;
}
}
function make_password($length = 8) {
$password = "";
- $possible = "0123456789abcdfghjkmnpqrstvwxyzABCDFGHJKMNPQRSTVWXYZ";
-
- $i = 0;
-
- while ($i < $length) {
+ $possible = "0123456789abcdfghjkmnpqrstvwxyzABCDFGHJKMNPQRSTVWXYZ";
+
+ $i = 0;
+
+ while ($i < $length) {
$char = substr($possible, mt_rand(0, strlen($possible)-1), 1);
-
- if (!strstr($password, $char)) {
+
+ if (!strstr($password, $char)) {
$password .= $char;
$i++;
}
// this is called after user is created to initialize default feeds, labels
// or whatever else
-
+
// user preferences are checked on every login, not here
function initialize_user($link, $uid) {
}
function validate_session($link) {
- if (SINGLE_USER_MODE) {
- return true;
- }
+ if (SINGLE_USER_MODE) return true;
- if (SESSION_CHECK_ADDRESS && $_SESSION["uid"]) {
- if ($_SESSION["ip_address"]) {
- if ($_SESSION["ip_address"] != $_SERVER["REMOTE_ADDR"]) {
- $_SESSION["login_error_msg"] = __("Session failed to validate (incorrect IP)");
- return false;
- }
- }
- }
+ $check_ip = $_SESSION['ip_address'];
+
+ switch (SESSION_CHECK_ADDRESS) {
+ case 0:
+ $check_ip = '';
+ break;
+ case 1:
+ $check_ip = substr($check_ip, 0, strrpos($check_ip, '.')+1);
+ break;
+ case 2:
+ $check_ip = substr($check_ip, 0, strrpos($check_ip, '.'));
+ $check_ip = substr($check_ip, 0, strrpos($check_ip, '.')+1);
+ break;
+ };
- if ($_SESSION["ref_schema_version"] != get_schema_version($link, true)) {
+ if ($check_ip && strpos($_SERVER['REMOTE_ADDR'], $check_ip) !== 0) {
+ $_SESSION["login_error_msg"] =
+ __("Session failed to validate (incorrect IP)");
return false;
}
+ if ($_SESSION["ref_schema_version"] != get_schema_version($link, true))
+ return false;
+
if ($_SESSION["uid"]) {
- $result = db_query($link,
+ $result = db_query($link,
"SELECT pwd_hash FROM ttrss_users WHERE id = '".$_SESSION["uid"]."'");
$pwd_hash = db_fetch_result($result, 0, "pwd_hash");
$login_action = $_POST["login_action"];
- # try to authenticate user if called from login form
+ # try to authenticate user if called from login form
if ($login_action == "do_login") {
$login = $_POST["login"];
$password = $_POST["password"];
}
}
- header("Location: " . $_SERVER["REQUEST_URI"]);
+ if ($_REQUEST['return']) {
+ header("Location: " . $_REQUEST['return']);
+ } else {
+ header("Location: " . $_SERVER["REQUEST_URI"]);
+ }
+
exit;
return;
}
if (!$_SESSION["uid"] || !validate_session($link)) {
- render_login_form($link, $mobile);
- //header("Location: login.php");
- exit;
+
+ if (get_remote_user($link) && AUTO_LOGIN) {
+ authenticate_user($link, get_remote_user($link), null);
+ $_SESSION["ref_schema_version"] = get_schema_version($link, true);
+ } else {
+ render_login_form($link, $mobile);
+ //header("Location: login.php");
+ exit;
+ }
} else {
/* bump login timestamp */
- db_query($link, "UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
+ db_query($link, "UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
$_SESSION["uid"]);
if ($_SESSION["language"] && SESSION_COOKIE_LIFETIME > 0) {
- setcookie("ttrss_lang", $_SESSION["language"],
+ setcookie("ttrss_lang", $_SESSION["language"],
time() + SESSION_COOKIE_LIFETIME);
}
}
}
}
- function truncate_string($str, $max_len) {
+ function truncate_string($str, $max_len, $suffix = '…') {
if (mb_strlen($str, "utf-8") > $max_len - 3) {
- return mb_substr($str, 0, $max_len, "utf-8") . "…";
+ return mb_substr($str, 0, $max_len, "utf-8") . $suffix;
} else {
return $str;
}
$time = time();
if ($t) {
- print "<link rel=\"stylesheet\" type=\"text/css\"
+ print "<link rel=\"stylesheet\" type=\"text/css\"
href=\"$t/theme.css?$time \">";
if (file_exists("$t/theme.js")) {
print "<script type=\"text/javascript\" src=\"$t/theme.js?$time\">
foreach ($themes as $t) {
if (is_file("$t/theme.ini")) {
$ini = parse_ini_file("$t/theme.ini", true);
- if ($ini['theme']['version'] >= THEME_VERSION_REQUIRED &&
+ if ($ini['theme']['version'] >= THEME_VERSION_REQUIRED &&
!$ini['theme']['disabled']) {
$entry = array();
$entry["path"] = $t;
return $rv;
}
+ function convert_timestamp($timestamp, $source_tz, $dest_tz) {
+
+ try {
+ $source_tz = new DateTimeZone($source_tz);
+ } catch (Exception $e) {
+ $source_tz = new DateTimeZone('UTC');
+ }
+
+ try {
+ $dest_tz = new DateTimeZone($dest_tz);
+ } catch (Exception $e) {
+ $dest_tz = new DateTimeZone('UTC');
+ }
+
+ $dt = new DateTime(date('Y-m-d H:i:s', $timestamp), $source_tz);
+ return $dt->format('U') + $dest_tz->getOffset($dt);
+ }
+
function make_local_datetime($link, $timestamp, $long, $owner_uid = false,
$no_smart_dt = false) {
$dt = new DateTime($timestamp, new DateTimeZone('UTC'));
$user_timestamp = $dt->format('U') + $user_tz->getOffset($dt);
- if (!$no_smart_dt && get_pref($link, 'HEADLINES_SMART_DATE', $owner_uid)) {
- return smart_date_time($link, $user_timestamp,
+ if (!$no_smart_dt) {
+ return smart_date_time($link, $user_timestamp,
$user_tz->getOffset($dt), $owner_uid);
} else {
if ($long)
return false;
}
}
-
+
function bool_to_sql_bool($s) {
if ($s) {
return "true";
}
function toggleEvenOdd($a) {
- if ($a == "even")
+ if ($a == "even")
return "odd";
else
return "even";
function sanity_check($link) {
+ global $ERRORS;
+
$error_code = 0;
$schema_version = get_schema_version($link);
$error_code = 12;
}
- if ($error_code != 0) {
- print_error_xml($error_code);
- return false;
- } else {
- return true;
- }
+ return array("code" => $error_code, "message" => $ERRORS[$error_code]);
}
function file_is_locked($filename) {
} else {
$cat_qpart = "cat_id IS NULL";
}
-
- $tmp_result = db_query($link, "SELECT id
+
+ $tmp_result = db_query($link, "SELECT id
FROM ttrss_feeds WHERE $cat_qpart AND owner_uid = $owner_uid");
while ($tmp_line = db_fetch_assoc($tmp_result)) {
$tmp_feed = $tmp_line["id"];
- db_query($link, "UPDATE ttrss_user_entries
- SET unread = false,last_read = NOW()
+ db_query($link, "UPDATE ttrss_user_entries
+ SET unread = false,last_read = NOW()
WHERE feed_id = '$tmp_feed' AND owner_uid = $owner_uid");
}
} else if ($feed == -2) {
- db_query($link, "UPDATE ttrss_user_entries
- SET unread = false,last_read = NOW() WHERE (SELECT COUNT(*)
- FROM ttrss_user_labels2 WHERE article_id = ref_id) > 0
+ db_query($link, "UPDATE ttrss_user_entries
+ SET unread = false,last_read = NOW() WHERE (SELECT COUNT(*)
+ FROM ttrss_user_labels2 WHERE article_id = ref_id) > 0
AND unread = true AND owner_uid = $owner_uid");
}
} else if ($feed > 0) {
- db_query($link, "UPDATE ttrss_user_entries
- SET unread = false,last_read = NOW()
+ 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) {
- db_query($link, "UPDATE ttrss_user_entries
+ db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW()
WHERE marked = true AND owner_uid = $owner_uid");
}
if ($feed == -2) {
- db_query($link, "UPDATE ttrss_user_entries
+ db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW()
WHERE published = true AND owner_uid = $owner_uid");
}
$intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE");
if (DB_TYPE == "pgsql") {
- $match_part = "updated > NOW() - INTERVAL '$intl hour' ";
+ $match_part = "updated > NOW() - INTERVAL '$intl hour' ";
} else {
- $match_part = "updated > DATE_SUB(NOW(),
+ $match_part = "updated > DATE_SUB(NOW(),
INTERVAL $intl HOUR) ";
}
- $result = db_query($link, "SELECT id FROM ttrss_entries,
+ $result = db_query($link, "SELECT id FROM ttrss_entries,
ttrss_user_entries WHERE $match_part AND
unread = true AND
- ttrss_user_entries.ref_id = ttrss_entries.id AND
+ ttrss_user_entries.ref_id = ttrss_entries.id AND
owner_uid = $owner_uid");
$affected_ids = array();
}
if ($feed == -4) {
- db_query($link, "UPDATE ttrss_user_entries
+ db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW()
WHERE owner_uid = $owner_uid");
}
$label_id = -$feed - 11;
- db_query($link, "UPDATE ttrss_user_entries, ttrss_user_labels2
- SET unread = false, last_read = NOW()
+ db_query($link, "UPDATE ttrss_user_entries, ttrss_user_labels2
+ SET unread = false, last_read = NOW()
WHERE label_id = '$label_id' AND unread = true
AND owner_uid = '$owner_uid' AND ref_id = article_id");
while ($line = db_fetch_assoc($result)) {
db_query($link, "UPDATE ttrss_user_entries SET
- unread = false, last_read = NOW()
+ unread = false, last_read = NOW()
WHERE int_id = " . $line["post_int_id"]);
}
db_query($link, "COMMIT");
}
}
- function update_generic_feed($link, $feed, $cat_view, $force_update = false) {
- if ($cat_view) {
-
- if ($feed > 0) {
- $cat_qpart = "cat_id = '$feed'";
- } else {
- $cat_qpart = "cat_id IS NULL";
- }
-
- $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_id = $tmp_line["id"];
- update_rss_feed($link, $feed_id, $force_update);
- }
-
- } else {
- update_rss_feed($link, $feed, $force_update);
- }
- }
-
function getAllCounters($link, $omode = "flc", $active_feed = false) {
if (!$omode) $omode = "flc";
$data = getGlobalCounters($link);
-
+
$data = array_merge($data, getVirtCounters($link));
if (strchr($omode, "l")) $data = array_merge($data, getLabelCounters($link));
if (strchr($omode, "f")) $data = array_merge($data, getFeedCounters($link, $active_feed));
if (strchr($omode, "t")) $data = array_merge($data, getTagCounters($link));
- if (strchr($omode, "c")) {
+ if (strchr($omode, "c")) {
if (get_pref($link, 'ENABLE_FEED_CATS')) {
$data = array_merge($data, getCategoryCounters($link));
}
}
return $data;
- }
+ }
function getCategoryCounters($link) {
$ret_arr = array();
$age_qpart = getMaxAgeSubquery();
- $result = db_query($link, "SELECT id AS cat_id, value AS unread
- FROM ttrss_feed_categories, ttrss_cat_counters_cache
- WHERE ttrss_cat_counters_cache.feed_id = id AND
+ $result = db_query($link, "SELECT id AS cat_id, value AS unread
+ FROM ttrss_feed_categories, ttrss_cat_counters_cache
+ WHERE ttrss_cat_counters_cache.feed_id = id AND
ttrss_feed_categories.owner_uid = " . $_SESSION["uid"]);
while ($line = db_fetch_assoc($result)) {
$age_qpart = getMaxAgeSubquery();
- $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE $cat_query
+ $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE $cat_query
AND owner_uid = " . $owner_uid);
-
+
$cat_feeds = array();
while ($line = db_fetch_assoc($result)) {
array_push($cat_feeds, "feed_id = " . $line["id"]);
}
-
+
if (count($cat_feeds) == 0) return 0;
-
+
$match_part = implode(" OR ", $cat_feeds);
-
- $result = db_query($link, "SELECT COUNT(int_id) AS unread
- FROM ttrss_user_entries,ttrss_entries
- WHERE unread = true AND ($match_part) AND id = ref_id
+
+ $result = db_query($link, "SELECT COUNT(int_id) AS unread
+ FROM ttrss_user_entries,ttrss_entries
+ WHERE unread = true AND ($match_part) AND id = ref_id
AND $age_qpart AND owner_uid = " . $owner_uid);
-
+
$unread = 0;
-
+
# this needs to be rewritten
while ($line = db_fetch_assoc($result)) {
$unread += $line["unread"];
}
-
+
return $unread;
} else if ($cat == -1) {
return getFeedUnread($link, -1) + getFeedUnread($link, -2) + getFeedUnread($link, -3) + getFeedUnread($link, 0);
} else if ($cat == -2) {
$result = db_query($link, "
- SELECT COUNT(unread) AS unread FROM
- ttrss_user_entries, ttrss_labels2, ttrss_user_labels2, ttrss_feeds
- WHERE label_id = ttrss_labels2.id AND article_id = ref_id AND
+ SELECT COUNT(unread) AS unread FROM
+ ttrss_user_entries, ttrss_labels2, ttrss_user_labels2, ttrss_feeds
+ WHERE label_id = ttrss_labels2.id AND article_id = ref_id AND
ttrss_labels2.owner_uid = '$owner_uid'
AND unread = true AND feed_id = ttrss_feeds.id
AND ttrss_user_entries.owner_uid = '$owner_uid'");
return $unread;
- }
+ }
}
function getMaxAgeSubquery($days = COUNTERS_MAX_AGE) {
if (DB_TYPE == "pgsql") {
- return "ttrss_entries.date_updated >
+ return "ttrss_entries.date_updated >
NOW() - INTERVAL '$days days'";
} else {
- return "ttrss_entries.date_updated >
+ return "ttrss_entries.date_updated >
DATE_SUB(NOW(), INTERVAL $days DAY)";
}
}
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
$result = db_query($link, "
- SELECT COUNT(unread) AS unread FROM
- ttrss_user_entries, ttrss_labels2, ttrss_user_labels2, ttrss_feeds
- WHERE label_id = ttrss_labels2.id AND article_id = ref_id AND
+ SELECT COUNT(unread) AS unread FROM
+ ttrss_user_entries, ttrss_labels2, ttrss_user_labels2, ttrss_feeds
+ WHERE label_id = ttrss_labels2.id AND article_id = ref_id AND
ttrss_labels2.owner_uid = '$owner_uid' AND ttrss_labels2.id = '$label_id'
AND unread = true AND feed_id = ttrss_feeds.id
AND ttrss_user_entries.owner_uid = '$owner_uid'");
$age_qpart = getMaxAgeSubquery();
if ($is_cat) {
- return getCategoryUnread($link, $n_feed, $owner_uid);
+ return getCategoryUnread($link, $n_feed, $owner_uid);
} if ($feed != "0" && $n_feed == 0) {
$feed = db_escape_string($feed);
$result = db_query($link, "SELECT SUM((SELECT COUNT(int_id)
- FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id
+ FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id
AND ref_id = id AND $age_qpart
- AND $unread_qpart)) AS count FROM ttrss_tags
+ AND $unread_qpart)) AS count FROM ttrss_tags
WHERE owner_uid = $owner_uid AND tag_name = '$feed'");
return db_fetch_result($result, 0, "count");
} else if ($n_feed == -2) {
$match_part = "published = true";
} else if ($n_feed == -3) {
- $match_part = "unread = true";
+ $match_part = "unread = true AND score >= 0";
$intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE", $owner_uid);
if (DB_TYPE == "pgsql") {
- $match_part .= " AND updated > NOW() - INTERVAL '$intl hour' ";
+ $match_part .= " AND updated > NOW() - INTERVAL '$intl hour' ";
} else {
$match_part .= " AND updated > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
}
$feeds_qpart = '';
}
- $query = "SELECT count(int_id) AS unread
+ $query = "SELECT count(int_id) AS unread
FROM $from_qpart WHERE
- ttrss_user_entries.ref_id = ttrss_entries.id AND
+ ttrss_user_entries.ref_id = ttrss_entries.id AND
$age_qpart AND
$feeds_qpart
$unread_qpart AND ($match_part) AND ttrss_user_entries.owner_uid = $owner_uid";
$result = db_query($link, $query);
-
+
} else {
-
+
$result = db_query($link, "SELECT COUNT(post_int_id) AS unread
- FROM ttrss_tags,ttrss_user_entries,ttrss_entries
- WHERE tag_name = '$feed' AND post_int_id = int_id AND ref_id = ttrss_entries.id
+ FROM ttrss_tags,ttrss_user_entries,ttrss_entries
+ WHERE tag_name = '$feed' AND post_int_id = int_id AND ref_id = ttrss_entries.id
AND $unread_qpart AND $age_qpart AND
ttrss_tags.owner_uid = " . $owner_uid);
}
-
+
$unread = db_fetch_result($result, 0, "unread");
return $unread;
$result = db_query($link, "SELECT SUM(value) AS c_id FROM ttrss_counters_cache
WHERE owner_uid = '$user_id' AND feed_id > 0");
- $c_id = db_fetch_result($result, 0, "c_id");
+ $c_id = db_fetch_result($result, 0, "c_id");
return $c_id;
}
function getGlobalCounters($link, $global_unread = -1) {
$ret_arr = array();
- if ($global_unread == -1) {
+ if ($global_unread == -1) {
$global_unread = getGlobalUnread($link);
}
- $cv = array("id" => "global-unread",
+ $cv = array("id" => "global-unread",
"counter" => $global_unread);
array_push($ret_arr, $cv);
- $result = db_query($link, "SELECT COUNT(id) AS fn FROM
+ $result = db_query($link, "SELECT COUNT(id) AS fn FROM
ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
$subscribed_feeds = db_fetch_result($result, 0, "fn");
- $cv = array("id" => "subscribed-feeds",
+ $cv = array("id" => "subscribed-feeds",
"counter" => $subscribed_feeds);
array_push($ret_arr, $cv);
}
function getSubscribedFeeds($link) {
- $result = db_query($link, "SELECT COUNT(id) AS fn FROM
+ $result = db_query($link, "SELECT COUNT(id) AS fn FROM
ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
return db_fetch_result($result, 0, "fn");
}
function getTagCounters($link) {
-
+
$ret_arr = array();
$age_qpart = getMaxAgeSubquery();
- $result = db_query($link, "SELECT tag_name,SUM((SELECT COUNT(int_id)
- FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id
+ $result = db_query($link, "SELECT tag_name,SUM((SELECT COUNT(int_id)
+ FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id
AND ref_id = id AND $age_qpart
- AND unread = true)) AS count FROM ttrss_tags
- WHERE owner_uid = ".$_SESSION['uid']." GROUP BY tag_name
+ AND unread = true)) AS count FROM ttrss_tags
+ WHERE owner_uid = ".$_SESSION['uid']." GROUP BY tag_name
ORDER BY count DESC LIMIT 55");
-
+
$tags = array();
while ($line = db_fetch_assoc($result)) {
}
foreach (array_keys($tags) as $tag) {
- $unread = $tags[$tag];
+ $unread = $tags[$tag];
$tag = htmlspecialchars($tag);
$cv = array("id" => $tag,
array_push($ret_arr, $cv);
}
- return $ret_arr;
+ return $ret_arr;
}
function getVirtCounters($link) {
$cv = array("id" => $i,
"counter" => $count);
-
+
// if (get_pref($link, 'EXTENDED_FEEDLIST'))
// $cv["xmsg"] = getFeedArticles($link, $i)." ".__("total");
array_push($ret_arr, $cv);
- }
+ }
return $ret_arr;
}
$result = db_query($link, "SELECT id, caption FROM ttrss_labels2
WHERE owner_uid = '$owner_uid'");
-
+
while ($line = db_fetch_assoc($result)) {
$id = -$line["id"] - 11;
array_push($ret_arr, $cv);
}
-
+
return $ret_arr;
}
$query = "SELECT ttrss_feeds.id,
ttrss_feeds.title,
- ".SUBSTRING_FOR_DATE."(ttrss_feeds.last_updated,1,19) AS last_updated,
+ ".SUBSTRING_FOR_DATE."(ttrss_feeds.last_updated,1,19) AS last_updated,
last_error, value AS count
FROM ttrss_feeds, ttrss_counters_cache
- WHERE ttrss_feeds.owner_uid = ".$_SESSION["uid"]."
+ WHERE ttrss_feeds.owner_uid = ".$_SESSION["uid"]."
AND ttrss_counters_cache.feed_id = id";
$result = db_query($link, $query);
$fctrs_modified = false;
while ($line = db_fetch_assoc($result)) {
-
+
$id = $line["id"];
$count = $line["count"];
$last_error = htmlspecialchars($line["last_error"]);
return $version[1];
}
- function print_error_xml($code, $add_msg = "") {
- global $ERRORS;
-
- $error_msg = $ERRORS[$code];
-
- if ($add_msg) {
- $error_msg = "$error_msg; $add_msg";
- }
-
- print "<rpc-reply>";
- print "<error error-code=\"$code\" error-msg=\"$error_msg\"/>";
- print "</rpc-reply>";
- }
-
/**
* Subscribes the user to the given feed
*
* to get all possible feeds.
* 5 - Couldn't download the URL content.
*/
- function subscribe_to_feed($link, $url, $cat_id = 0,
+ function subscribe_to_feed($link, $url, $cat_id = 0,
$auth_login = '', $auth_pass = '') {
$url = fix_url($url);
if (!$url || !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;
+ $update_method = 0;
+
+ $result = db_query($link, "SELECT twitter_oauth FROM ttrss_users
+ WHERE id = ".$_SESSION['uid']);
+
+ $has_oauth = db_fetch_result($result, 0, 'twitter_oauth');
+
+ if (!$has_oauth || strpos($url, '://api.twitter.com') === false) {
+ if (!fetch_file_contents($url, false, $auth_login, $auth_pass)) return 5;
+
+ if (url_is_html($url, $auth_login, $auth_pass)) {
+ $feedUrls = get_feeds_from_html($url, $auth_login, $auth_pass);
+ if (count($feedUrls) == 0) {
+ return 3;
+ } else if (count($feedUrls) > 1) {
+ return 4;
+ }
+ //use feed url as new URL
+ $url = key($feedUrls);
}
- //use feed url as new URL
- $url = key($feedUrls);
- }
+ } else {
+ if (!fetch_twitter_rss($link, $url, $_SESSION['uid']))
+ return 5;
+
+ $update_method = 3;
+ }
if ($cat_id == "0" || !$cat_id) {
$cat_qpart = "NULL";
} else {
$cat_qpart = "'$cat_id'";
}
-
+
$result = db_query($link,
- "SELECT id FROM ttrss_feeds
+ "SELECT id FROM ttrss_feeds
WHERE feed_url = '$url' AND owner_uid = ".$_SESSION["uid"]);
-
+
if (db_num_rows($result) == 0) {
$result = db_query($link,
- "INSERT INTO ttrss_feeds
- (owner_uid,feed_url,title,cat_id, auth_login,auth_pass)
- VALUES ('".$_SESSION["uid"]."', '$url',
- '[Unknown]', $cat_qpart, '$auth_login', '$auth_pass')");
-
+ "INSERT INTO ttrss_feeds
+ (owner_uid,feed_url,title,cat_id, auth_login,auth_pass,update_method)
+ VALUES ('".$_SESSION["uid"]."', '$url',
+ '[Unknown]', $cat_qpart, '$auth_login', '$auth_pass', '$update_method')");
+
$result = db_query($link,
- "SELECT id FROM ttrss_feeds WHERE feed_url = '$url'
+ "SELECT id FROM ttrss_feeds WHERE feed_url = '$url'
AND owner_uid = " . $_SESSION["uid"]);
-
+
$feed_id = db_fetch_result($result, 0, "id");
-
+
if ($feed_id) {
update_rss_feed($link, $feed_id, true);
}
}
}
- function print_feed_select($link, $id, $default_id = "",
+ function print_feed_select($link, $id, $default_id = "",
$attributes = "", $include_all_feeds = true) {
print "<select id=\"$id\" name=\"$id\" $attributes>";
- if ($include_all_feeds) {
+ if ($include_all_feeds) {
print "<option value=\"0\">".__('All feeds')."</option>";
}
-
+
$result = db_query($link, "SELECT id,title FROM ttrss_feeds
WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
$title = truncate_string(htmlspecialchars($line["title"]), 40);
- printf("<option $is_selected value='%d'>%s</option>",
+ printf("<option $is_selected value='%d'>%s</option>",
$line["id"], $title);
}
-
+
print "</select>";
}
- function print_feed_cat_select($link, $id, $default_id = "",
+ function print_feed_cat_select($link, $id, $default_id = "",
$attributes = "", $include_all_cats = true) {
-
+
print "<select id=\"$id\" name=\"$id\" default=\"$default_id\" onchange=\"catSelectOnChange(this)\" $attributes>";
if ($include_all_cats) {
if ($line["id"] == $default_id) {
$is_selected = "selected=\"1\"";
} else {
- $is_selected = "";
+ $is_selected = "";
}
if ($line["title"])
- printf("<option $is_selected value='%d'>%s</option>",
+ printf("<option $is_selected value='%d'>%s</option>",
$line["id"], htmlspecialchars($line["title"]));
}
print "</select>";
}
-
+
function checkbox_to_sql_bool($val) {
return ($val == "on") ? "true" : "false";
}
} else if ($id < -10) {
return __("Labels");
} else if ($id > 0) {
- $result = db_query($link, "SELECT ttrss_feed_categories.title
+ $result = db_query($link, "SELECT ttrss_feed_categories.title
FROM ttrss_feeds, ttrss_feed_categories WHERE ttrss_feeds.id = '$id' AND
cat_id = ttrss_feed_categories.id");
if (db_num_rows($result) == 1) {
if ($id < -10) {
return "images/label.png";
} else {
- if (file_exists(ICONS_DIR . "/$id.ico"))
+ if (file_exists(ICONS_DIR . "/$id.ico"))
return ICONS_URL . "/$id.ico";
}
break;
$params["theme"] = get_user_theme($link);
$params["theme_options"] = get_user_theme_options($link);
- $params["daemon_enabled"] = ENABLE_UPDATE_DAEMON;
$params["sign_progress"] = theme_image($link, "images/indicator_white.gif");
$params["sign_progress_tiny"] = theme_image($link, "images/indicator_tiny.gif");
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", "DEFAULT_ARTICLE_LIMIT",
- "HIDE_READ_SHOWS_SPECIAL", "HIDE_FEEDLIST", "COMBINED_DISPLAY_MODE") as $param) {
+ "HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
$params[strtolower($param)] = (int) get_pref($link, $param);
}
$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
+ $result = db_query($link, "SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
- $num_feeds = db_fetch_result($result, 0, "cf");
+ $max_feed_id = db_fetch_result($result, 0, "mid");
+ $num_feeds = db_fetch_result($result, 0, "nf");
+ $params["max_feed_id"] = (int) $max_feed_id;
$params["num_feeds"] = (int) $num_feeds;
+
$params["collapsed_feedlist"] = (int) get_pref($link, "_COLLAPSED_FEEDLIST");
return $params;
}
function make_runtime_info($link) {
- $result = db_query($link, "SELECT COUNT(*) AS cf FROM
+ $data = array();
+
+ $result = db_query($link, "SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
- $num_feeds = db_fetch_result($result, 0, "cf");
+ $max_feed_id = db_fetch_result($result, 0, "mid");
+ $num_feeds = db_fetch_result($result, 0, "nf");
- $data = array();
+ $data["max_feed_id"] = (int) $max_feed_id;
+ $data["num_feeds"] = (int) $num_feeds;
- $data['num_feeds'] = (int) $num_feeds;
$data['last_article_id'] = getLastArticleId($link);
$data['cdm_expanded'] = get_pref($link, 'CDM_EXPANDED');
- if (ENABLE_UPDATE_DAEMON) {
+ if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
$data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock");
}
}
- if (CHECK_FOR_NEW_VERSION && $_SESSION["access_level"] >= 10) {
-
- if ($_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
+ if ($_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
$new_version_details = @check_for_update($link);
- $data['new_version_available'] = (int) $new_version_details != "";
+ $data['new_version_available'] = (int) ($new_version_details != false);
$_SESSION["last_version_check"] = time();
- }
}
return $data;
}
- function getSearchSql($search, $match_on) {
+ function getSearchSql($link, $search, $match_on) {
$search_query_part = "";
$keywords = split(" ", $search);
$query_keywords = array();
- if ($match_on == "both") {
-
- foreach ($keywords as $k) {
- if (strpos($k, "-") === 0) {
- $k = substr($k, 1);
- $not = "NOT";
- } else {
- $not = "";
- }
-
- array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
- OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
+ foreach ($keywords as $k) {
+ if (strpos($k, "-") === 0) {
+ $k = substr($k, 1);
+ $not = "NOT";
+ } else {
+ $not = "";
}
- $search_query_part = implode("AND", $query_keywords) . " AND ";
+ if (strpos($k, "@") === 0) {
- } else if ($match_on == "title") {
+ $user_tz_string = get_pref($link, 'USER_TIMEZONE', $_SESSION['uid']);
+ $orig_ts = strtotime(substr($k, 1));
- foreach ($keywords as $k) {
- if (strpos($k, "-") === 0) {
- $k = substr($k, 1);
- $not = "NOT";
- } else {
- $not = "";
- }
+ $k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC'));
+ array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH('$k')) $not = '$k')");
+ } else if ($match_on == "both") {
+ array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+ OR UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
+ } else if ($match_on == "title") {
array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%'))");
- }
-
- $search_query_part = implode("AND", $query_keywords) . " AND ";
-
- } else if ($match_on == "content") {
-
- foreach ($keywords as $k) {
- if (strpos($k, "-") === 0) {
- $k = substr($k, 1);
- $not = "NOT";
- } else {
- $not = "";
- }
-
+ } else if ($match_on == "content") {
array_push($query_keywords, "(UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
}
}
if (SPHINX_ENABLED) {
$ids = join(",", @sphinx_search($search, 0, 500));
- if ($ids)
+ if ($ids)
$search_query_part = "ref_id IN ($ids) AND ";
else
$search_query_part = "ref_id = -1 AND ";
} else {
- $search_query_part = getSearchSql($search, $match_on);
+ $search_query_part = getSearchSql($link, $search, $match_on);
$search_query_part .= " AND ";
- }
+ }
} else {
$search_query_part = "";
}
$view_query_part = "";
-
+
if ($view_mode == "adaptive" || $view_query_part == "noscores") {
if ($search) {
$view_query_part = " ";
}
}
}
-
+
if ($view_mode == "marked") {
$view_query_part = " marked = true AND ";
}
if ($limit > 0) {
$limit_query_part = "LIMIT " . $limit;
- }
+ }
$vfeed_query_part = "";
-
+
// override query strategy and enable feed display when searching globally
if ($search && $search_mode == "all_feeds") {
$query_strategy_part = "ttrss_entries.id > 0";
- $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+ $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
/* tags */
} else if (preg_match("/^-?[0-9][0-9]*$/", $feed) == false) {
$query_strategy_part = "ttrss_entries.id > 0";
$vfeed_query_part = "(SELECT title FROM ttrss_feeds WHERE
id = feed_id) as feed_title,";
} else if ($feed > 0 && $search && $search_mode == "this_cat") {
-
- $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+
+ $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
$tmp_result = false;
if ($cat_view) {
- $tmp_result = db_query($link, "SELECT id
+ $tmp_result = db_query($link, "SELECT id
FROM ttrss_feeds WHERE cat_id = '$feed'");
} else {
$tmp_result = db_query($link, "SELECT id
- FROM ttrss_feeds WHERE cat_id = (SELECT cat_id FROM ttrss_feeds
+ FROM ttrss_feeds WHERE cat_id = (SELECT cat_id FROM ttrss_feeds
WHERE id = '$feed') AND id != '$feed'");
}
-
+
$cat_siblings = array();
-
+
if (db_num_rows($tmp_result) > 0) {
while ($p = db_fetch_assoc($tmp_result)) {
array_push($cat_siblings, "feed_id = " . $p["id"]);
}
-
- $query_strategy_part = sprintf("(feed_id = %d OR %s)",
+
+ $query_strategy_part = sprintf("(feed_id = %d OR %s)",
$feed, implode(" OR ", $cat_siblings));
-
+
} else {
$query_strategy_part = "ttrss_entries.id > 0";
}
-
+
} else if ($feed > 0) {
-
+
if ($cat_view) {
if ($feed > 0) {
} else {
$query_strategy_part = "cat_id IS NULL";
}
-
+
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
- } else {
+ } else {
$query_strategy_part = "feed_id = '$feed'";
}
} else if ($feed == 0 && !$cat_view) { // archive virtual feed
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
$ext_tables_part = ",ttrss_labels2,ttrss_user_labels2";
-
+
$query_strategy_part = "ttrss_labels2.id = ttrss_user_labels2.label_id AND
ttrss_user_labels2.article_id = ref_id";
}
} else if ($feed == -3) { // fresh virtual feed
- $query_strategy_part = "unread = true";
+ $query_strategy_part = "unread = true AND score >= 0";
$intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE", $owner_uid);
if (DB_TYPE == "pgsql") {
- $query_strategy_part .= " AND updated > NOW() - INTERVAL '$intl hour' ";
+ $query_strategy_part .= " AND updated > NOW() - INTERVAL '$intl hour' ";
} else {
$query_strategy_part .= " AND updated > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
}
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
$ext_tables_part = ",ttrss_labels2,ttrss_user_labels2";
-
+
} else {
$query_strategy_part = "id > 0"; // dumb
}
if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
$order_by = "$date_sort_field";
- } else {
+ } else {
$order_by = "$date_sort_field DESC";
}
if ($override_order) {
$order_by = $override_order;
}
-
+
$feed_title = "";
if ($search) {
$feed_title = getCategoryTitle($link, $feed);
} else {
if ((int)$feed == $feed && $feed > 0) {
- $result = db_query($link, "SELECT title,site_url,last_error
+ $result = db_query($link, "SELECT title,site_url,last_error
FROM ttrss_feeds WHERE id = '$feed' AND owner_uid = $owner_uid");
-
+
$feed_title = db_fetch_result($result, 0, "title");
$feed_site_url = db_fetch_result($result, 0, "site_url");
$last_error = db_fetch_result($result, 0, "last_error");
} else {
$feed_title = getFeedTitle($link, $feed);
- }
+ }
}
}
$content_query_part = "content as content_preview,";
if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
-
+
if ($feed >= 0) {
$feed_kind = "Feeds";
} else {
$feed_kind = "Labels";
}
-
+
if ($limit_query_part) {
$offset_query_part = "OFFSET $offset";
}
if ($vfeed_query_part && get_pref($link, 'VFEED_GROUP_BY_FEED', $owner_uid)) {
if (!$override_order) {
- $order_by = "ttrss_feeds.title, $order_by";
+ $order_by = "ttrss_feeds.title, $order_by";
}
}
LEFT JOIN ttrss_feeds ON (feed_id = ttrss_feeds.id)";
}
- $query = "SELECT DISTINCT
+ $query = "SELECT DISTINCT
date_entered,
guid,
ttrss_entries.id,ttrss_entries.title,
if ($_REQUEST["debug"]) print $query;
$result = db_query($link, $query);
-
+
} else {
// browsing by tag
-
+
$feed_kind = "Tags";
-
- $result = db_query($link, "SELECT
+
+ $result = db_query($link, "SELECT DISTINCT
+ date_entered,
guid,
note,
ttrss_entries.id as id,title,
updated,
unread,feed_id,orig_feed_id,
- marked,link,last_read,
+ marked,link,last_read,
".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms,
$vfeed_query_part
$content_query_part
FROM
ttrss_entries,ttrss_user_entries,ttrss_tags
WHERE
- ref_id = ttrss_entries.id AND
+ ref_id = ttrss_entries.id AND
ttrss_user_entries.owner_uid = '$owner_uid' AND
post_int_id = int_id AND tag_name = '$feed' AND
$view_query_part
$search_query_part
$query_strategy_part ORDER BY $order_by
- $limit_query_part");
+ $limit_query_part");
}
return array($result, $feed_title, $feed_site_url, $last_error);
-
+
}
function generate_syndicated_feed($link, $owner_uid, $feed, $is_cat,
$limit, $search, $search_mode, $match_on, $view_mode = false) {
+ require_once "lib/MiniTemplator.class.php";
+
$note_style = "float : right; background-color : #fff7d5; border-width : 1px; ".
"padding : 5px; border-style : dashed; border-color : #e7d796;".
"margin-bottom : 1em; color : #9a8c59;";
$date_sort_field = "date_entered";
}
- $qfh_ret = queryFeedHeadlines($link, $feed,
- $limit, $view_mode, $is_cat, $search, $search_mode,
+ $qfh_ret = queryFeedHeadlines($link, $feed,
+ $limit, $view_mode, $is_cat, $search, $search_mode,
$match_on, "$date_sort_field DESC", 0, $owner_uid);
$result = $qfh_ret[0];
$feed_site_url = $qfh_ret[2];
$last_error = $qfh_ret[3];
-// if (!$feed_site_url) $feed_site_url = "http://localhost/";
+ $feed_self_url = get_self_url_prefix() .
+ "/backend.php?op=rss&id=-2&key=" .
+ get_feed_access_key($link, -2, false);
+
+ if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
+
+ $tpl = new MiniTemplator;
+
+ $tpl->readTemplateFromFile("templates/generated_feed.txt");
+
+ $tpl->setVariable('FEED_TITLE', $feed_title);
+ $tpl->setVariable('VERSION', VERSION);
+ $tpl->setVariable('FEED_URL', htmlspecialchars($feed_self_url));
+
+ if (PUBSUBHUBBUB_HUB && $feed == -2) {
+ $tpl->setVariable('HUB_URL', htmlspecialchars(PUBSUBHUBBUB_HUB));
+ $tpl->addBlock('feed_hub');
+ }
+
+ $tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()));
- print "<?xml version=\"1.0\" encoding=\"utf-8\"?>
- <?xml-stylesheet type=\"text/xsl\" href=\"rss.xsl\"?>
- <rss version=\"2.0\">
- <channel>
- <title>$feed_title</title>
- <link>$feed_site_url</link>
- <description>Feed generated by Tiny Tiny RSS</description>";
-
while ($line = db_fetch_assoc($result)) {
- print "<item>";
- print "<guid>" . htmlspecialchars($line["guid"]) . "</guid>";
- print "<link>" . htmlspecialchars($line["link"]) . "</link>";
+ $tpl->setVariable('ARTICLE_ID', htmlspecialchars($line['link']));
+ $tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']));
+ $tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']));
+ $tpl->setVariable('ARTICLE_EXCERPT',
+ truncate_string(strip_tags($line["content_preview"]), 100, '...'));
- $tags = get_article_tags($link, $line["id"], $owner_uid);
+ $content = sanitize_rss($link, $line["content_preview"], false, $owner_uid);
- foreach ($tags as $tag) {
- print "<category>" . htmlspecialchars($tag) . "</category>";
+ if ($line['note']) {
+ $content = "<div style=\"$note_style\">" . $line['note'] . "</div>" .
+ $content;
}
- $rfc822_date = date('r', strtotime($line["updated"]));
-
- print "<pubDate>$rfc822_date</pubDate>";
+ $tpl->setVariable('ARTICLE_CONTENT', $content);
- if ($line["author"]) {
- print "<author>" . htmlspecialchars($line["author"]) . "</author>";
- }
-
- print "<title><![CDATA[" .
- htmlspecialchars($line["title"]) . "]]></title>";
-
- print "<description><![CDATA[";
+ $tpl->setVariable('ARTICLE_UPDATED', date('c', strtotime($line["updated"])));
+ $tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']));
+
+ $tags = get_article_tags($link, $line["id"], $owner_uid);
- if ($line["note"]) {
- print "<div style='$note_style'>";
- print $line["note"];
- print "</div>";
+ foreach ($tags as $tag) {
+ $tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag));
+ $tpl->addBlock('category');
}
- print sanitize_rss($link, $line["content_preview"], false, $owner_uid);
- print "]]></description>";
-
$enclosures = get_article_enclosures($link, $line["id"]);
foreach ($enclosures as $e) {
$type = htmlspecialchars($e['content_type']);
$url = htmlspecialchars($e['content_url']);
$length = $e['duration'];
- print "<enclosure url=\"$url\" type=\"$type\" length=\"$length\"/>";
+
+ $tpl->setVariable('ARTICLE_ENCLOSURE_URL', $url);
+ $tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', $type);
+ $tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', $length);
+
+ $tpl->addBlock('enclosure');
}
- print "</item>";
- }
-
- print "</channel></rss>";
+ $tpl->addBlock('entry');
+ }
+
+ $tmp = "";
+ $tpl->addBlock('feed');
+ $tpl->generateOutputToString($tmp);
+
+ print $tmp;
}
function getCategoryTitle($link, $cat_id) {
$res = trim($str); if (!$res) return '';
- if (get_pref($link, "STRIP_UNSAFE_TAGS", $owner) || $force_strip_tags) {
- $res = $purifier->purify($res);
- }
+// if (get_pref($link, "STRIP_UNSAFE_TAGS", $owner) || $force_strip_tags) {
+ $res = $purifier->purify($res);
+// }
if (get_pref($link, "STRIP_IMAGES", $owner)) {
$res = preg_replace('/<img[^>]+>/is', '', $res);
}
+ if (strpos($res, "href=") === false)
+ $res = rewrite_urls($res);
+
$charset_hack = '<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
</head>';
$doc = new DOMDocument();
$doc->loadHTML($charset_hack . $res);
$xpath = new DOMXPath($doc);
-
+
$entries = $xpath->query('(//a[@href]|//img[@src])');
$br_inserted = 0;
if ($entry->hasAttribute('href'))
$entry->setAttribute('href',
rewrite_relative_url($site_url, $entry->getAttribute('href')));
-
+
if ($entry->hasAttribute('src'))
- $entry->setAttribute('src',
- rewrite_relative_url($site_url, $entry->getAttribute('src')));
+ if (preg_match('/^image.php\?i=[a-z0-9]+$/', $entry->getAttribute('src')) == 0)
+ $entry->setAttribute('src',
+ rewrite_relative_url($site_url, $entry->getAttribute('src')));
}
if (strtolower($entry->nodeName) == "a") {
- if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW', $owner)) {
- $entry->setAttribute("target", "_blank");
- }
+ $entry->setAttribute("target", "_blank");
}
if (strtolower($entry->nodeName) == "img" && !$br_inserted) {
}
}
-
+
$node = $doc->getElementsByTagName('body')->item(0);
- return $doc->saveXML($node);
+ return $doc->saveXML($node);
}
/**
* Send by mail a digest of last articles.
- *
+ *
* @param mixed $link The database connection.
* @param integer $limit The maximum number of articles by digest.
* @return boolean Return false if digests are not enabled.
$interval_query = "last_digest_sent < DATE_SUB(NOW(), INTERVAL $days DAY)";
}
- $result = db_query($link, "SELECT id,email FROM ttrss_users
+ $result = db_query($link, "SELECT id,email FROM ttrss_users
WHERE email != '' AND (last_digest_sent IS NULL OR $interval_query)");
while ($line = db_fetch_assoc($result)) {
print "No headlines\n";
}
- db_query($link, "UPDATE ttrss_users SET last_digest_sent = NOW()
+ db_query($link, "UPDATE ttrss_users SET last_digest_sent = NOW()
WHERE id = " . $line["id"]);
}
}
link,
SUBSTRING(content, 1, 120) AS excerpt,
".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
- FROM
- ttrss_user_entries,ttrss_entries,ttrss_feeds
- WHERE
- ref_id = ttrss_entries.id AND feed_id = ttrss_feeds.id
+ FROM
+ ttrss_user_entries,ttrss_entries,ttrss_feeds
+ WHERE
+ ref_id = ttrss_entries.id AND feed_id = ttrss_feeds.id
AND include_in_digest = true
AND $interval_query
AND ttrss_user_entries.owner_uid = $user_id
- AND unread = true
+ AND unread = true
ORDER BY ttrss_feeds.title, date_updated DESC
LIMIT $limit");
array_push($headlines, $line);
}
- for ($i = 0; $i < sizeof($headlines); $i++) {
+ for ($i = 0; $i < sizeof($headlines); $i++) {
$line = $headlines[$i];
$tpl->setVariable('ARTICLE_TITLE', $line["title"]);
$tpl->setVariable('ARTICLE_LINK', $line["link"]);
$tpl->setVariable('ARTICLE_UPDATED', $updated);
- $tpl->setVariable('ARTICLE_EXCERPT',
+ $tpl->setVariable('ARTICLE_EXCERPT',
truncate_string(strip_tags($line["excerpt"]), 100));
$tpl->addBlock('article');
$tpl_t->setVariable('ARTICLE_TITLE', $line["title"]);
$tpl_t->setVariable('ARTICLE_LINK', $line["link"]);
$tpl_t->setVariable('ARTICLE_UPDATED', $updated);
-// $tpl_t->setVariable('ARTICLE_EXCERPT',
+// $tpl_t->setVariable('ARTICLE_EXCERPT',
// truncate_string(strip_tags($line["excerpt"]), 100));
$tpl_t->addBlock('article');
}
function check_for_update($link) {
- $releases_feed = "http://tt-rss.org/releases.rss";
+ if (CHECK_FOR_NEW_VERSION && $_SESSION['access_level'] >= 10) {
+ $version_url = "http://tt-rss.org/version.php?ver=" . VERSION;
- if (!CHECK_FOR_NEW_VERSION || $_SESSION["access_level"] < 10) {
- return;
- }
-
- if (DEFAULT_UPDATE_METHOD == "1") {
- $rss = new SimplePie();
- $rss->set_useragent(SELF_USER_AGENT);
- $rss->set_feed_url($fetch_url);
- $rss->set_output_encoding('UTF-8');
- $rss->init();
- } else {
- $rss = fetch_rss($releases_feed);
- }
-
- if ($rss) {
-
- if (DEFAULT_UPDATE_METHOD == "1") {
- $items = $rss->get_items();
- } else {
- $items = $rss->items;
-
- if (!$items || !is_array($items)) $items = $rss->entries;
- if (!$items || !is_array($items)) $items = $rss;
- }
-
- if (!is_array($items) || count($items) == 0) {
- return;
- }
-
- $latest_item = $items[0];
-
- if (DEFAULT_UPDATE_METHOD == "1") {
- $last_title = $latest_item->get_title();
- } else {
- $last_title = $latest_item["title"];
- }
+ $version_data = @fetch_file_contents($version_url);
- $latest_version = trim(preg_replace("/(Milestone)|(completed)/", "", $last_title));
+ if ($version_data) {
+ $version_data = json_decode($version_data, true);
+ if ($version_data && $version_data['version']) {
- if (DEFAULT_UPDATE_METHOD == "1") {
- $release_url = sanitize_rss($link, $latest_item->get_link());
- $content = sanitize_rss($link, $latest_item->get_description());
- } else {
- $release_url = sanitize_rss($link, $latest_item["link"]);
- $content = sanitize_rss($link, $latest_item["description"]);
+ if (version_compare(VERSION, $version_data['version']) == -1) {
+ return $version_data;
+ }
+ }
}
-
- if (version_compare(VERSION, $latest_version) == -1) {
- return sprintf("New version of Tiny-Tiny RSS (%s) is available:",
- $latest_version)."<div class='milestoneDetails'>$content</div>";
- } else {
- return false;
- }
}
+ return false;
}
function markArticlesById($link, $ids, $cmode) {
$ids_qpart = join(" OR ", $tmp_ids);
if ($cmode == 0) {
- db_query($link, "UPDATE ttrss_user_entries SET
+ db_query($link, "UPDATE ttrss_user_entries SET
marked = false,last_read = NOW()
WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
} else if ($cmode == 1) {
- db_query($link, "UPDATE ttrss_user_entries SET
+ db_query($link, "UPDATE ttrss_user_entries SET
marked = true
WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
} else {
- db_query($link, "UPDATE ttrss_user_entries SET
+ db_query($link, "UPDATE ttrss_user_entries SET
marked = NOT marked,last_read = NOW()
WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
}
$ids_qpart = join(" OR ", $tmp_ids);
if ($cmode == 0) {
- db_query($link, "UPDATE ttrss_user_entries SET
+ db_query($link, "UPDATE ttrss_user_entries SET
published = false,last_read = NOW()
WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
} else if ($cmode == 1) {
- db_query($link, "UPDATE ttrss_user_entries SET
+ db_query($link, "UPDATE ttrss_user_entries SET
published = true
WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
} else {
- db_query($link, "UPDATE ttrss_user_entries SET
+ db_query($link, "UPDATE ttrss_user_entries SET
published = NOT published,last_read = NOW()
WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
}
+
+ if (PUBSUBHUBBUB_HUB) {
+ $rss_link = get_self_url_prefix() .
+ "/backend.php?op=rss&id=-2&key=" .
+ get_feed_access_key($link, -2, false);
+
+ $p = new Publisher(PUBSUBHUBBUB_HUB);
+
+ $pubsub_result = $p->publish_update($rss_link);
+ }
}
function catchupArticlesById($link, $ids, $cmode, $owner_uid = false) {
$ids_qpart = join(" OR ", $tmp_ids);
if ($cmode == 0) {
- db_query($link, "UPDATE ttrss_user_entries SET
+ db_query($link, "UPDATE ttrss_user_entries SET
unread = false,last_read = NOW()
WHERE ($ids_qpart) AND owner_uid = $owner_uid");
} else if ($cmode == 1) {
- db_query($link, "UPDATE ttrss_user_entries SET
+ db_query($link, "UPDATE ttrss_user_entries SET
unread = true
WHERE ($ids_qpart) AND owner_uid = $owner_uid");
} else {
- db_query($link, "UPDATE ttrss_user_entries SET
+ db_query($link, "UPDATE ttrss_user_entries SET
unread = NOT unread,last_read = NOW()
WHERE ($ids_qpart) AND owner_uid = $owner_uid");
}
function catchupArticleById($link, $id, $cmode) {
if ($cmode == 0) {
- db_query($link, "UPDATE ttrss_user_entries SET
+ db_query($link, "UPDATE ttrss_user_entries SET
unread = false,last_read = NOW()
WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
} else if ($cmode == 1) {
- db_query($link, "UPDATE ttrss_user_entries SET
+ db_query($link, "UPDATE ttrss_user_entries SET
unread = true
WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
} else {
- db_query($link, "UPDATE ttrss_user_entries SET
+ db_query($link, "UPDATE ttrss_user_entries SET
unread = NOT unread,last_read = NOW()
WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
}
}
function make_guid_from_title($title) {
- return preg_replace("/[ \"\',.:;]/", "-",
+ return preg_replace("/[ \"\',.:;]/", "-",
mb_strtolower(strip_tags($title), 'utf-8'));
}
- function print_headline_subtoolbar($link, $feed_site_url, $feed_title,
+ function format_headline_subtoolbar($link, $feed_site_url, $feed_title,
$feed_id, $is_cat, $search, $match_on,
- $search_mode, $view_mode) {
+ $search_mode, $view_mode, $error) {
- $page_prev_link = "viewFeedGoPage(-1)";
- $page_next_link = "viewFeedGoPage(1)";
- $page_first_link = "viewFeedGoPage(0)";
+ $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()";
+ $catchup_page_link = "catchupPage()";
+ $catchup_feed_link = "catchupCurrentFeed()";
+ $catchup_sel_link = "catchupSelection()";
- $archive_sel_link = "archiveSelection()";
- $delete_sel_link = "deleteSelection()";
+ $archive_sel_link = "archiveSelection()";
+ $delete_sel_link = "deleteSelection()";
- $sel_all_link = "selectArticles('all')";
- $sel_unread_link = "selectArticles('unread')";
- $sel_none_link = "selectArticles('none')";
- $sel_inv_link = "selectArticles('invert')";
+ $sel_all_link = "selectArticles('all')";
+ $sel_unread_link = "selectArticles('unread')";
+ $sel_none_link = "selectArticles('none')";
+ $sel_inv_link = "selectArticles('invert')";
- $tog_unread_link = "selectionToggleUnread()";
- $tog_marked_link = "selectionToggleMarked()";
- $tog_published_link = "selectionTogglePublished()";
+ $tog_unread_link = "selectionToggleUnread()";
+ $tog_marked_link = "selectionToggleMarked()";
+ $tog_published_link = "selectionTogglePublished()";
-
print "<div id=\"subtoolbar_main\">";
+
$reply = "<div id=\"subtoolbar_main\">";
- print __('Select:')."
-
<a href=\"#\" onclick=\"$sel_all_link\">".__('All')."</a>,
-
<a href=\"#\" onclick=\"$sel_unread_link\">".__('Unread')."</a>,
-
<a href=\"#\" onclick=\"$sel_inv_link\">".__('Invert')."</a>,
-
<a href=\"#\" onclick=\"$sel_none_link\">".__('None')."</a></li>";
+ $reply .= __('Select:')."
+ <a href=\"#\" onclick=\"$sel_all_link\">".__('All')."</a>,
+ <a href=\"#\" onclick=\"$sel_unread_link\">".__('Unread')."</a>,
+ <a href=\"#\" onclick=\"$sel_inv_link\">".__('Invert')."</a>,
+ <a href=\"#\" onclick=\"$sel_none_link\">".__('None')."</a></li>";
- print " ";
+ $reply .= " ";
- print "<select dojoType=\"dijit.form.Select\"
- onchange=\"headlineActionsChange(this)\">";
- print "<option value=\"false\">".__('Actions...')."</option>";
+ $reply .= "<select dojoType=\"dijit.form.Select\"
+ onchange=\"headlineActionsChange(this)\">";
+ $reply .= "<option value=\"false\">".__('Actions...')."</option>";
- print "<option value=\"0\" disabled=\"1\">".__('Selection toggle:')."</option>";
+ $reply .= "<option value=\"0\" disabled=\"1\">".__('Selection toggle:')."</option>";
- print "<option value=\"$tog_unread_link\">".__('Unread')."</option>
- <option value=\"$tog_marked_link\">".__('Starred')."</option>
- <option value=\"$tog_published_link\">".__('Published')."</option>";
+ $reply .= "<option value=\"$tog_unread_link\">".__('Unread')."</option>
+ <option value=\"$tog_marked_link\">".__('Starred')."</option>
+ <option value=\"$tog_published_link\">".__('Published')."</option>";
- print "<option value=\"0\" disabled=\"1\">".__('Selection:')."</option>";
+ $reply .= "<option value=\"0\" disabled=\"1\">".__('Selection:')."</option>";
- print "<option value=\"$catchup_sel_link\">".__('Mark as read')."</option>";
+ $reply .= "<option value=\"$catchup_sel_link\">".__('Mark as read')."</option>";
- if ($feed_id != "0") {
- print "<option value=\"$archive_sel_link\">".__('Archive')."</option>";
- } else {
- print "<option value=\"$archive_sel_link\">".__('Move back')."</option>";
- print "<option value=\"$delete_sel_link\">".__('Delete')."</option>";
+ if ($feed_id != "0") {
+ $reply .= "<option value=\"$archive_sel_link\">".__('Archive')."</option>";
+ } else {
+ $reply .= "<option value=\"$archive_sel_link\">".__('Move back')."</option>";
+ $reply .= "<option value=\"$delete_sel_link\">".__('Delete')."</option>";
- }
+ }
- print "<option value=\"emailArticle(false)\">".__('Forward by email').
- "</option>";
+ $reply .= "<option value=\"emailArticle(false)\">".__('Forward by email').
+ "</option>";
- $rss_link = htmlspecialchars(get_self_url_prefix() .
- "/backend.php?op=rss&id=$feed_id&is_cat=$is_cat$view_mode$search_q");
+ if ($is_cat) $cat_q = "&is_cat=$is_cat";
- print "<option value=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">".__('View as RSS')."</option>";
+ $rss_link = htmlspecialchars(get_self_url_prefix() .
+ "/backend.php?op=rss&id=$feed_id$cat_q$search_q");
- print "</select>";
+ $reply .= "<option value=\"0\" disabled=\"1\">".__('Feed:')."</option>";
- print "</div>";
+ $reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>";
- print "<div id=\"subtoolbar_ftitle\">";
+ $reply .= "<option value=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">".__('View as RSS')."</option>";
- if ($feed_site_url) {
- $target = "target=\"_blank\"";
- print "<a title=\"".__("Visit the website")."\" $target href=\"$feed_site_url\">".
- truncate_string($feed_title,30)."</a>";
- } else {
- if ($feed_id < -10) {
- $label_id = -11-$feed_id;
+ $reply .= "</select>";
- $result = db_query($link, "SELECT fg_color, bg_color
- FROM ttrss_labels2 WHERE id = '$label_id' AND owner_uid = " .
- $_SESSION["uid"]);
+ $reply .= "</div>";
- if (db_num_rows($result) != 0) {
- $fg_color = db_fetch_result($result, 0, "fg_color");
- $bg_color = db_fetch_result($result, 0, "bg_color");
+ $reply .= "<div id=\"subtoolbar_ftitle\">";
- print "<span style='background : $bg_color; color : $fg_color'>";
- print $feed_title;
- print "</span>";
- } else {
- print $feed_title;
- }
+ if ($feed_site_url) {
+ $target = "target=\"_blank\"";
+ $reply .= "<a title=\"".__("Visit the website")."\" $target href=\"$feed_site_url\">".
+ truncate_string($feed_title,30)."</a>";
+
+ if ($error) {
+ $reply .= " (<span class=\"error\" title=\"$error\">Error</span>)";
+ }
+ } else {
+ if ($feed_id < -10) {
+ $label_id = -11-$feed_id;
+
+ $result = db_query($link, "SELECT fg_color, bg_color
+ FROM ttrss_labels2 WHERE id = '$label_id' AND owner_uid = " .
+ $_SESSION["uid"]);
+
+ if (db_num_rows($result) != 0) {
+ $fg_color = db_fetch_result($result, 0, "fg_color");
+ $bg_color = db_fetch_result($result, 0, "bg_color");
+
+ $reply .= "<span style='background : $bg_color; color : $fg_color'>";
+ $reply .= $feed_title;
+ $reply .= "</span>";
} else {
- print $feed_title;
+ $reply .= $feed_title;
}
- }
- if ($search) {
- $search_q = "&q=$search&m=$match_on&smode=$search_mode";
} else {
- $search_q = "";
+ $reply .= $feed_title;
}
+ }
- // Adaptive doesn't really make any sense for generated feeds
- // All Articles is the default, so no need to insert it either
- if ($view_mode == "adaptive" || $view_mode == "all_articles")
- $view_mode = "";
- else
- $view_mode = "&view-mode=$view_mode";
+ if ($search) {
+ $search_q = "&q=$search&m=$match_on&smode=$search_mode";
+ } else {
+ $search_q = "";
+ }
- print "
- title=\"".__("View as RSS feed")."\"
- onclick=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">
-
<img class=\"noborder\" style=\"vertical-align : middle\" src=\"images/feed-icon-12x12.png\"></a>";
+ $reply .= "
+ <a href=\"#\"
+ title=\"".__("View as RSS feed")."\"
+ onclick=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">
+ <img class=\"noborder\" style=\"vertical-align : middle\" src=\"images/feed-icon-12x12.png\"></a>";
- print "</div>";
+ $reply .= "</div>";
+
+ return $reply;
+ }
- }
-
function outputFeedList($link, $special = true) {
$feedlist = array();
} else {
$cat['items'] = array();
}
-
+
foreach (array(-4, -3, -1, -2, 0) as $i) {
array_push($cat['items'], feedlist_init_feed($link, $i));
}
-
+
if ($enable_cats) {
array_push($feedlist['items'], $cat);
} else {
$feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
}
-
+
$result = db_query($link, "SELECT * FROM
ttrss_labels2 WHERE owner_uid = '$owner_uid' ORDER by caption");
-
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- $cat_hidden = get_pref($link, "_COLLAPSED_LABELS");
- $cat = feedlist_init_cat($link, -2, $cat_hidden);
- } else {
- $cat['items'] = array();
- }
- while ($line = db_fetch_assoc($result)) {
-
- $label_id = -$line['id'] - 11;
- $count = getFeedUnread($link, $label_id);
-
- array_push($cat['items'], feedlist_init_feed($link, $label_id,
- false, $count));
- }
-
- if ($enable_cats) {
- array_push($feedlist['items'], $cat);
- } else {
- $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
+ if (db_num_rows($result) > 0) {
+
+ if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ $cat_hidden = get_pref($link, "_COLLAPSED_LABELS");
+ $cat = feedlist_init_cat($link, -2, $cat_hidden);
+ } else {
+ $cat['items'] = array();
+ }
+
+ while ($line = db_fetch_assoc($result)) {
+
+ $label_id = -$line['id'] - 11;
+ $count = getFeedUnread($link, $label_id);
+
+ $feed = feedlist_init_feed($link, $label_id, false, $count);
+
+ $feed['fg_color'] = $line['fg_color'];
+ $feed['bg_color'] = $line['bg_color'];
+
+ array_push($cat['items'], $feed);
+ }
+
+ if ($enable_cats) {
+ array_push($feedlist['items'], $cat);
+ } else {
+ $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
+ }
}
}
-
+
/* if (get_pref($link, 'ENABLE_FEED_CATS')) {
if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {
$order_by_qpart = "order_id,category,unread DESC,title";
} else {
if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {
$order_by_qpart = "unread DESC,title";
- } else {
+ } else {
$order_by_qpart = "title";
}
} */
cat_id,last_error,
ttrss_feed_categories.title AS category,
ttrss_feed_categories.collapsed,
- value AS unread
+ value AS unread
FROM ttrss_feeds LEFT JOIN ttrss_feed_categories
- ON (ttrss_feed_categories.id = cat_id)
- LEFT JOIN ttrss_counters_cache
+ ON (ttrss_feed_categories.id = cat_id)
+ LEFT JOIN ttrss_counters_cache
ON
(ttrss_feeds.id = feed_id)
- WHERE
+ WHERE
ttrss_feeds.owner_uid = '$owner_uid'
- ORDER BY $order_by_qpart";
+ ORDER BY $order_by_qpart";
$result = db_query($link, $query);
if (db_num_rows($result) > 0) {
$category = "";
-
- if (!$enable_cats)
+
+ if (!$enable_cats)
$cat['items'] = array();
else
$cat = false;
-
+
while ($line = db_fetch_assoc($result)) {
-
+
$feed = htmlspecialchars(trim($line["title"]));
-
+
if (!$feed) $feed = "[Untitled]";
-
- $feed_id = $line["id"];
+
+ $feed_id = $line["id"];
$unread = $line["unread"];
-
+
$cat_id = $line["cat_id"];
$tmp_category = $line["category"];
if (!$tmp_category) $tmp_category = __("Uncategorized");
-
+
if ($category != $tmp_category && $enable_cats) {
-
+
$category = $tmp_category;
-
+
$collapsed = sql_bool_to_bool($line["collapsed"]);
-
+
// workaround for NULL category
if ($category == __("Uncategorized")) {
$collapsed = get_pref($link, "_COLLAPSED_UNCAT");
}
-
+
if ($cat) array_push($feedlist['items'], $cat);
-
+
$cat = feedlist_init_cat($link, $cat_id, $collapsed);
}
-
- $updated = make_local_datetime($link, $line["updated_noms"], false);
-
- array_push($cat['items'], feedlist_init_feed($link, $feed_id,
+
+ $updated = make_local_datetime($link, $line["updated_noms"], false);
+
+ array_push($cat['items'], feedlist_init_feed($link, $feed_id,
$feed, $unread, $line['last_error'], $updated));
}
-
+
if ($enable_cats) {
array_push($feedlist['items'], $cat);
- } else {
+ } else {
$feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
}
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
- $query = "SELECT DISTINCT tag_name,
+ $query = "SELECT DISTINCT tag_name,
owner_uid as owner FROM
ttrss_tags WHERE post_int_id = (SELECT int_id FROM ttrss_user_entries WHERE
ref_id = '$a_id' AND owner_uid = '$owner_uid' LIMIT 1) ORDER BY tag_name";
$obj_id = md5("TAGS:$owner_uid:$id");
- $tags = array();
+ $tags = array();
if ($memcache && $obj = $memcache->get($obj_id)) {
$tags = $obj;
$tmp_result = db_query($link, $query);
while ($tmp_line = db_fetch_assoc($tmp_result)) {
- array_push($tags, $tmp_line["tag_name"]);
+ array_push($tags, $tmp_line["tag_name"]);
}
/* update the cache */
$tags_str = db_escape_string(join(",", $tags));
- db_query($link, "UPDATE ttrss_user_entries
+ db_query($link, "UPDATE ttrss_user_entries
SET tag_cache = '$tags_str' WHERE ref_id = '$id'
AND owner_uid = " . $_SESSION["uid"]);
}
function trim_value(&$value) {
$value = trim($value);
- }
+ }
function trim_array($array) {
$tmp = $array;
function format_warning($msg, $id = "") {
global $link;
- return "<div class=\"warning\" id=\"$id\">
+ return "<div class=\"warning\" id=\"$id\">
<img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";
}
- function format_notice($msg) {
+ function format_notice($msg, $id = "") {
global $link;
- return "<div class=\"notice\" id=\"$id\">
+ return "<div class=\"notice\" id=\"$id\">
<img src=\"".theme_image($link, "images/sign_info.png")."\">$msg</div>";
}
- function format_error($msg) {
+ function format_error($msg, $id = "") {
global $link;
- return "<div class=\"error\" id=\"$id\">
+ return "<div class=\"error\" id=\"$id\">
<img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";
}
$entry = "";
- if (($ctype == __("audio/mpeg")) && (get_pref($link, "ENABLE_FLASH_PLAYER")) ) {
-
- $entry .= "<object type=\"application/x-shockwave-flash\"
- data=\"extras/button/musicplayer.swf?song_url=$url\"
- width=\"17\" height=\"17\">
- <param name=\"movie\" value=\"extras/button/musicplayer.swf?song_url=$url\" /> </object>";
- }
+ if (strpos($ctype, "audio/") === 0) {
- /*
+ if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false ||
+ strpos($_SERVER['HTTP_USER_AGENT'], "Chrome") !== false ||
+ strpos($_SERVER['HTTP_USER_AGENT'], "Safari") !== false )) {
- if (substr($ctype,0,6)=="audio/" || $ctype=="application/ogg" || $ctype=="application/x-ogg") {
- $entry .= "<audio controls=\"controls\"><source src=\"$url\" type=\"$ctype\" />";
- if (($ctype == __("audio/mpeg")) &&
- (get_pref($link, "ENABLE_FLASH_PLAYER")) ) {
- $entry .= "<span><object type=\"application/x-shockwave-flash\" data=\"extras/button/musicplayer.swf?song_url=$url\" width=\"17\" height=\"17\"> <param name=\"movie\" value=\"extras/button/musicplayer.swf?song_url=$url\" /> </object></span>";
- }
- $entry .= "</audio> ";
- if (($ctype == __("audio/mpeg")) &&
- (get_pref($link, "ENABLE_FLASH_PLAYER")) ) {
- $entry .= "<a id='switchToFlashLink' href='#' onclick='return switchToFlash(this)'>".__('Switch to Flash Player')."</a>";
- $entry .= "<script type='text/javascript'>html5AudioOrFlash('$ctype');</script>";
+ $id = 'AUDIO-' . uniqid();
+
+ $entry .= "<audio id=\"$id\"\">
+ <source src=\"$url\"></source>
+ </audio>";
+
+ $entry .= "<span onclick=\"player(this)\"
+ title=\"".__("Click to play")."\" status=\"0\"
+ class=\"player\" audio-id=\"$id\">".__("Play")."</span>";
+
+ } else {
+
+ $entry .= "<object type=\"application/x-shockwave-flash\"
+ data=\"extras/button/musicplayer.swf?song_url=$url\"
+ width=\"17\" height=\"17\" style='float : left; margin-right : 5px;'>
+ <param name=\"movie\"
+ value=\"extras/button/musicplayer.swf?song_url=$url\" />
+ </object>";
}
- } elseif (substr($ctype,0,6)=="video/") {
- $entry .= "<video controls=\"controls\"><source src=\"$url\" type=\"$ctype\" />";
- $entry .= "</video>";
- } */
+ }
+ $filename = substr($url, strrpos($url, "/")+1);
+ $entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
+ $filename . " (" . $ctype . ")" . "</a>";
return $entry;
}
- function outputArticleXML($link, $id, $feed_id, $mark_as_read = true,
+ function format_article($link, $id, $feed_id, $mark_as_read = true,
$zoom_mode = false) {
+ $rv = array();
+
+ $rv['id'] = $id;
+
/* we can figure out feed_id from article id anyway, why do we
* pass feed_id here? let's ignore the argument :( */
$feed_id = (int) db_fetch_result($result, 0, "feed_id");
- if (!$zoom_mode) { print "<article id='$id'><![CDATA["; };
+ $rv['feed_id'] = $feed_id;
+
+ //if (!$zoom_mode) { print "<article id='$id'><![CDATA["; };
$result = db_query($link, "SELECT rtl_content, always_display_enclosures FROM ttrss_feeds
WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
}
if ($mark_as_read) {
- $result = db_query($link, "UPDATE ttrss_user_entries
- SET unread = false,last_read = NOW()
+ $result = db_query($link, "UPDATE ttrss_user_entries
+ SET unread = false,last_read = NOW()
WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
ccache_update($link, $feed_id, $_SESSION["uid"]);
} else {
if ($line["comments"] && $line["link"] != $line["comments"]) {
$entry_comments = "<a target='_blank' href=\"".$line["comments"]."\">comments</a>";
- }
+ }
}
if ($zoom_mode) {
header("Content-Type: text/html");
- print "<html><head>
+ $rv['content'] .= "<html><head>
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
<title>Tiny Tiny RSS - ".$line["title"]."</title>
<link rel=\"stylesheet\" type=\"text/css\" href=\"tt-rss.css\">
</head><body>";
}
- print "<div id=\"PTITLE-$id\" style=\"display : none\">" .
+ $rv['content'] .= "<div id=\"PTITLE-$id\" style=\"display : none\">" .
truncate_string(strip_tags($line['title']), 15) . "</div>";
- print "<div class=\"postReply\" id=\"POST-$id\">";
-
- print "<div dojoType=\"dijit.Menu\" style=\"display: none;\"
- targetNodeIds=\"POSTHDR-$id\">";
- print "<div onclick=\"postOpenInNewTab(event, $id)\"
- dojoType=\"dijit.MenuItem\">".__('View in a new tab')."</div>";
- print "<div dojoType=\"dijit.MenuSeparator\"></div>";
- print "<div onclick=\"openArticleInNewWindow($id)\"
- dojoType=\"dijit.MenuItem\">".__('Open original article')."</div>";
- print "</div>";
+ $rv['content'] .= "<div class=\"postReply\" id=\"POST-$id\">";
-
print "<div onclick=\"return postClicked(event, $id)\"
+
$rv['content'] .= "<div onclick=\"return postClicked(event, $id)\"
class=\"postHeader\" id=\"POSTHDR-$id\">";
$entry_author = $line["author"];
$entry_author = __(" - ") . $entry_author;
}
- $parsed_updated = make_local_datetime($link, $line["updated"], true,
+ $parsed_updated = make_local_datetime($link, $line["updated"], true,
false, true);
-
print "<div class=\"postDate$rtl_class\">$parsed_updated</div>";
+
$rv['content'] .= "<div class=\"postDate$rtl_class\">$parsed_updated</div>";
if ($line["link"]) {
- print "<div clear='both'><a target='_blank' href=\"" .
- $line["link"] . "\">" .
- $line["title"] . "<span class='author'>$entry_author</span></a></div>";
+ $rv['content'] .= "<div clear='both'><a target='_blank'
+ title=\"".htmlspecialchars($line['title'])."\"
+ href=\"" .
+ $line["link"] . "\">" .
+ truncate_string($line["title"], 100) .
+ "<span class='author'>$entry_author</span></a></div>";
} else {
-
print "<div clear='both'>" . $line["title"] . "$entry_author</div>";
+
$rv['content'] .= "<div clear='both'>" . $line["title"] . "$entry_author</div>";
}
$tags_str = format_tags_string(get_article_tags($link, $id), $id);
if (!$entry_comments) $entry_comments = " "; # placeholder
-
print "<div style='float : right'>
- <img src='".theme_image($link, 'images/tag.png')."'
+
$rv['content'] .= "<div style='float : right'>
+ <img src='".theme_image($link, 'images/tag.png')."'
class='tagsPic' alt='Tags' title='Tags'> ";
if (!$zoom_mode) {
- print "<span id=\"ATSTR-$id\">$tags_str</span>
- <a title=\"".__('Edit tags for this article')."\"
+ $rv['content'] .= "<span id=\"ATSTR-$id\">$tags_str</span>
+ <a title=\"".__('Edit tags for this article')."\"
href=\"#\" onclick=\"editArticleTags($id, $feed_id)\">(+)</a>";
- print "<img src=\"".theme_image($link, 'images/art-zoom.png')."\"
+ $rv['content'] .= "<img src=\"".theme_image($link, 'images/art-zoom.png')."\"
class='tagsPic' style=\"cursor : pointer\"
onclick=\"postOpenInNewTab(event, $id)\"
alt='Zoom' title='".__('Open article in new tab')."'>";
- $note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
+ //$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
- print "<img src=\"".theme_image($link, 'images/art-pub-note.png')."\"
+ $rv['content'] .= "<img src=\"".theme_image($link, 'images/art-pub-note.png')."\"
class='tagsPic' style=\"cursor : pointer\"
- onclick=\"publishWithNote($id, '$note_escaped')\"
- alt='PubNote' title='".__('Publish article with a note')."'>";
+ onclick=\"editArticleNote($id)\"
+ alt='PubNote' title='".__('Edit article note')."'>";
if (DIGEST_ENABLE) {
- print "<img src=\"".theme_image($link, 'images/art-email.png')."\"
+ $rv['content'] .= "<img src=\"".theme_image($link, 'images/art-email.png')."\"
class='tagsPic' style=\"cursor : pointer\"
onclick=\"emailArticle($id)\"
alt='Zoom' title='".__('Forward by email')."'>";
}
- print "<img src=\"".theme_image($link, 'images/digest_checkbox.png')."\"
+ if (ENABLE_TWEET_BUTTON) {
+ $rv['content'] .= "<img src=\"".theme_image($link, 'images/art-tweet.png')."\"
+ class='tagsPic' style=\"cursor : pointer\"
+ onclick=\"tweetArticle($id)\"
+ alt='Zoom' title='".__('Share on Twitter')."'>";
+ }
+
+ $rv['content'] .= "<img src=\"".theme_image($link, 'images/digest_checkbox.png')."\"
class='tagsPic' style=\"cursor : pointer\"
onclick=\"closeArticlePanel($id)\"
alt='Zoom' title='".__('Close this panel')."'>";
} else {
$tags_str = strip_tags($tags_str);
- print "<span id=\"ATSTR-$id\">$tags_str</span>";
+ $rv['content'] .= "<span id=\"ATSTR-$id\">$tags_str</span>";
}
- print "</div>";
-
print "<div clear='both'>$entry_comments</div>";
+ $rv['content'] .= "</div>";
+
$rv['content'] .= "<div clear='both'>$entry_comments</div>";
if ($line["orig_feed_id"]) {
if (db_num_rows($tmp_result) != 0) {
-
print "<div clear='both'>";
- print __("Originally from:");
+
$rv['content'] .= "<div clear='both'>";
+ $rv['content'] .= __("Originally from:");
- print " ";
+ $rv['content'] .= " ";
$tmp_line = db_fetch_assoc($tmp_result);
- print "<a target='_blank'
+ $rv['content'] .= "<a target='_blank'
href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
$tmp_line['title'] . "</a>";
- print " ";
+ $rv['content'] .= " ";
-
print "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
-
print "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.gif'></a>";
+
$rv['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
+
$rv['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.gif'></a>";
- print "</div>";
+ $rv['content'] .= "</div>";
}
}
- print "</div>";
+ $rv['content'] .= "</div>";
- print "<div class=\"postIcon\">" .
- "<a target=\"_blank\" title=\"".__("Visit the website")."\"$
+ $rv['content'] .= "<div class=\"postIcon\">" .
+ "<a target=\"_blank\" title=\"".__("Visit the website")."\"$
href=\"".htmlspecialchars($feed_site_url)."\">".
$feed_icon . "</a></div>";
- print "<div class=\"postContent\">";
+ $rv['content'] .= "<div id=\"POSTNOTE-$id\">";
+ if ($line['note']) {
+ $rv['content'] .= format_article_note($id, $line['note']);
+ }
+ $rv['content'] .= "</div>";
+
+ $rv['content'] .= "<div class=\"postContent\">";
$article_content = sanitize_rss($link, $line["content"], false, false,
$feed_site_url);
- print "<div id=\"POSTNOTE-$id\">";
- if ($line['note']) {
- print format_article_note($id, $line['note']);
- }
- print "</div>";
-
- print $article_content;
+ $rv['content'] .= $article_content;
- print_article_enclosures($link, $id, $always_display_enclosures,
- $article_content);
+ $rv['content'] .= format_article_enclosures($link, $id,
+ $always_display_enclosures, $article_content);
- print "</div>";
+ $rv['content'] .= "</div>";
- print "</div>";
+ $rv['content'] .= "</div>";
}
- if (!$zoom_mode) {
- print "]]></article>";
- } else {
- print "
+ if ($zoom_mode) {
+ $rv['content'] .= "
<div style=\"text-align : center\">
<button onclick=\"return window.close()\">".
__("Close this window")."</button></div>";
- print "</body></html>";
-
+ $rv['content'] .= "</body></html>";
}
+ return $rv;
+
}
- function outputHeadlinesList($link, $feed, $subop, $view_mode, $limit, $cat_view,
- $next_unread_feed, $offset, $vgr_last_feed = false,
+ function format_headlines_list($link, $feed, $subop, $view_mode, $limit, $cat_view,
+ $next_unread_feed, $offset, $vgr_last_feed = false,
$override_order = false) {
$disable_cache = false;
+ $reply = array();
+
$timing_info = getmicrotime();
$topmost_article_ids = array();
catchupArticlesById($link, $ids, $cmode);
}
- if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0 && !$cat_view) {
- update_generic_feed($link, $feed, $cat_view, true);
+ if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0) {
+ update_rss_feed($link, $feed, true);
}
if ($subop == "MarkAllRead") {
// FIXME: might break tag display?
- if ($feed > 0 && !$cat_view) {
+ if ($feed > 0 && !$cat_view) {
$result = db_query($link,
"SELECT id FROM ttrss_feeds WHERE id = '$feed' LIMIT 1");
-
+
if (db_num_rows($result) == 0) {
- print "<div align='center'>".__('Feed not found.')."</div>";
- return;
+ $reply['content'] = "<div align='center'>".__('Feed not found.')."</div>";
}
}
} else {
$rtl_content = false;
}
-
+
if ($rtl_content) {
$rtl_tag = "dir=\"RTL\"";
} else {
@$search = db_escape_string($_REQUEST["query"]);
- if ($search) {
+ if ($search) {
$disable_cache = true;
}
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H0", $timing_info);
- $qfh_ret = queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view,
+ $qfh_ret = queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view,
$search, $search_mode, $match_on, $override_order, $real_offset);
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
$vgroup_last_feed = $vgr_last_feed;
-/* if ($feed == -2) {
- $feed_site_url = article_publish_url($link);
- } */
-
/// STOP //////////////////////////////////////////////////////////////////////////////////
- print "<toolbar><![CDATA[";
-
if (!$offset) {
-// print "<div id=\"headlinesContainer\" $rtl_tag>";
-
- if (!$result) {
- print "<div align='center'>".__("Could not display feed (query failed). Please check label match syntax or local configuration.")."</div>";
- return;
- }
if (db_num_rows($result) > 0) {
- print_headline_subtoolbar($link, $feed_site_url, $feed_title,
- $feed, $cat_view, $search, $match_on, $search_mode, $view_mode);
-
-// print "<div id=\"headlinesInnerContainer\" onscroll=\"headlines_scroll_handler()\">";
-
+ $reply['toolbar'] = format_headline_subtoolbar($link, $feed_site_url, $feed_title,
+ $feed, $cat_view, $search, $match_on, $search_mode, $view_mode,
+ $last_error);
}
}
- print "]]></toolbar><content><![CDATA[";
-
$headlines_count = db_num_rows($result);
if (db_num_rows($result) > 0) {
while ($line = db_fetch_assoc($result)) {
$class = ($lnum % 2) ? "even" : "odd";
-
+
$id = $line["id"];
$feed_id = $line["feed_id"];
$labels_str = "<span id=\"HLLCTR-$id\">";
$labels_str .= format_article_labels($labels, $id);
$labels_str .= "</span>";
-
+
if (count($topmost_article_ids) < 3) {
array_push($topmost_article_ids, $id);
}
if ($line["last_read"] == "" && !sql_bool_to_bool($line["unread"])) {
-
+
$update_pic = "<img id='FUPDPIC-$id' src=\"".
- theme_image($link, 'images/updated.png')."\"
+ theme_image($link, 'images/updated.png')."\"
alt=\"Updated\">";
} else {
- $update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\"
+ $update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\"
alt=\"Updated\">";
}
- if (sql_bool_to_bool($line["unread"]) &&
+ if (sql_bool_to_bool($line["unread"]) &&
time() - strtotime($line["updated_noms"]) < $fresh_intl) {
$update_pic = "<img id='FUPDPIC-$id' src=\"".
theme_image($link, 'images/fresh_sign.png')."\" alt=\"Fresh\">";
}
-
+
if ($line["unread"] == "t" || $line["unread"] == "1") {
$class .= " Unread";
++$num_unread;
}
if ($line["marked"] == "t" || $line["marked"] == "1") {
- $marked_pic = "<img id=\"FMPIC-$id\"
- src=\"".theme_image($link, 'images/mark_set.png')."\"
- class=\"markedPic\" alt=\"Unstar article\"
+ $marked_pic = "<img id=\"FMPIC-$id\"
+ src=\"".theme_image($link, 'images/mark_set.png')."\"
+ class=\"markedPic\" alt=\"Unstar article\"
onclick='javascript:tMark($id)'>";
} else {
- $marked_pic = "<img id=\"FMPIC-$id\"
- src=\"".theme_image($link, 'images/mark_unset.png')."\"
- class=\"markedPic\" alt=\"Star article\"
+ $marked_pic = "<img id=\"FMPIC-$id\"
+ src=\"".theme_image($link, 'images/mark_unset.png')."\"
+ class=\"markedPic\" alt=\"Star article\"
onclick='javascript:tMark($id)'>";
}
if ($line["published"] == "t" || $line["published"] == "1") {
- $published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($link,
- 'images/pub_set.png')."\"
+ $published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($link,
+ 'images/pub_set.png')."\"
class=\"markedPic\"
alt=\"Unpublish article\" onclick='javascript:tPub($id)'>";
} else {
$published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($link,
- 'images/pub_unset.png')."\"
+ 'images/pub_unset.png')."\"
class=\"markedPic\"
alt=\"Publish article\" onclick='javascript:tPub($id)'>";
}
# $content_link = "<a target=\"_blank\" href=\"".$line["link"]."\">" .
# $line["title"] . "</a>";
-# $content_link = "<a
+# $content_link = "<a
# href=\"" . htmlspecialchars($line["link"]) . "\"
# onclick=\"view($id,$feed_id);\">" .
# $line["title"] . "</a>";
# $content_link = "<a href=\"javascript:viewContentUrl('".$line["link"]."');\">" .
# $line["title"] . "</a>";
- $updated_fmt = make_local_datetime($link, $line["updated_noms"], false);
+ $updated_fmt = make_local_datetime($link, $line["updated_noms"], false);
if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
- $content_preview = truncate_string(strip_tags($line["content_preview"]),
+ $content_preview = truncate_string(strip_tags($line["content_preview"]),
100);
}
$score = $line["score"];
- $score_pic = theme_image($link,
+ $score_pic = theme_image($link,
"images/" . get_score_pic($score));
/* $score_title = __("(Click to change)");
- $score_pic = "<img class='hlScorePic' src=\"images/$score_pic\"
+ $score_pic = "<img class='hlScorePic' src=\"images/$score_pic\"
onclick=\"adjustArticleScore($id, $score)\" title=\"$score $score_title\">"; */
- $score_pic = "<img class='hlScorePic' src=\"$score_pic\"
+ $score_pic = "<img class='hlScorePic' src=\"$score_pic\"
title=\"$score\">";
if ($score > 500) {
if ($has_feed_icon) {
$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";
} else {
- //$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\" alt=\"\">";
- $feed_icon_img = "";
+ $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/feed-icon-12x12.png\" alt=\"\">";
}
if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
$vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)";
-
print "<div class='cdmFeedTitle'>".
+
$reply['content'] .= "<div class='cdmFeedTitle'>".
"<div style=\"float : right\">$feed_icon_img</div>".
"<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
$line["feed_title"]."</a> $vf_catchup_link</div>";
}
}
- $mouseover_attrs = "onmouseover='postMouseIn($id)'
+ $mouseover_attrs = "onmouseover='postMouseIn($id)'
onmouseout='postMouseOut($id)'";
-
print "<div class='$class' id='RROW-$id' $mouseover_attrs>";
+
$reply['content'] .= "<div class='$class' id='RROW-$id' $mouseover_attrs>";
-
print "<div class='hlUpdPic'>$update_pic</div>";
+
$reply['content'] .= "<div class='hlUpdPic'>$update_pic</div>";
-
print "<div class='hlLeft'>";
+
$reply['content'] .= "<div class='hlLeft'>";
- print "<input type=\"checkbox\" onclick=\"tSR(this)\"
+ $reply['content'] .= "<input type=\"checkbox\" onclick=\"tSR(this)\"
id=\"RCHK-$id\">";
-
- print "$marked_pic";
- print "$published_pic";
- print "</div>";
+ $reply['content'] .= "$marked_pic";
+ $reply['content'] .= "$published_pic";
- print "<div onclick='return hlClicked(event, $id)'
+ $reply['content'] .= "</div>";
+
+ $reply['content'] .= "<div onclick='return hlClicked(event, $id)'
class=\"hlTitle\"><span class='hlContent$hlc_suffix'>";
- print "<a id=\"RTITLE-$id\"
+ $reply['content'] .= "<a id=\"RTITLE-$id\"
href=\"" . htmlspecialchars($line["link"]) . "\"
- onclick=\"return false;\">" .
+ onclick=\"\">" .
$line["title"];
if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
if ($content_preview) {
- print "<span class=\"contentPreview\"> - $content_preview</span>";
+ $reply['content'] .= "<span class=\"contentPreview\"> - $content_preview</span>";
}
}
- print "</a></span>";
+ $reply['content'] .= "</a></span>";
- print $labels_str;
+ $reply['content'] .= $labels_str;
/* if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
- if (@$line["feed_title"]) {
+ if (@$line["feed_title"]) {
print "<span class=\"hlFeed\">
(<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
$line["feed_title"]."</a>)
}
} */
- print "</div>";
-
+ $reply['content'] .= "</div>";
-
- print "<div class=\"hlRight\">";
- print "<span class=\"hlUpdated\">$updated_fmt</span>";
- print $score_pic;
+ $reply['content'] .= "<div class=\"hlRight\">";
+ $reply['content'] .= "<span class=\"hlUpdated\">$updated_fmt</span>";
+ $reply['content'] .= $score_pic;
if ($line["feed_title"] && !get_pref($link, 'VFEED_GROUP_BY_FEED')) {
- print "<span onclick=\"viewfeed($feed_id)\"
+ $reply['content'] .= "<span onclick=\"viewfeed($feed_id)\"
title=\"".htmlspecialchars($line['feed_title'])."\">
$feed_icon_img<span>";
}
- print "</div>";
- print "</div>";
+ $reply['content'] .= "</div>";
+ $reply['content'] .= "</div>";
} else {
//$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\" alt=\"\">";
}
-
print "<div class='cdmFeedTitle'>".
+
$reply['content'] .= "<div class='cdmFeedTitle'>".
"<div style=\"float : right\">$feed_icon_img</div>".
"<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
$line["feed_title"]."</a> $vf_catchup_link</div>";
$expand_cdm = get_pref($link, 'CDM_EXPANDED');
- $mouseover_attrs = "onmouseover='postMouseIn($id)'
+ $mouseover_attrs = "onmouseover='postMouseIn($id)'
onmouseout='postMouseOut($id)'";
- print "<div class=\"$class\"
+ $reply['content'] .= "<div class=\"$class\"
id=\"RROW-$id\" $mouseover_attrs'>";
-
print "<div class=\"cdmHeader\">";
+
$reply['content'] .= "<div class=\"cdmHeader\">";
-
print "<div style='float : right'>";
- print "<span class='updated'>$updated_fmt</span>";
- print "$score_pic";
+
$reply['content'] .= "<div style='float : right'>";
+ $reply['content'] .= "<span class='updated'>$updated_fmt</span>";
+ $reply['content'] .= "$score_pic";
if (!get_pref($link, "VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
- print "<span style=\"cursor : pointer\"
+ $reply['content'] .= "<span style=\"cursor : pointer\"
title=\"".htmlspecialchars($line["feed_title"])."\"
onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
}
- print "<div class=\"updPic\">$update_pic</div>";
+ $reply['content'] .= "<div class=\"updPic\">$update_pic</div>";
+
+ $reply['content'] .= "</div>";
- print "</div>";
-
- print "<input type=\"checkbox\" onclick=\"toggleSelectRowById(this,
+ $reply['content'] .= "<input type=\"checkbox\" onclick=\"toggleSelectRowById(this,
'RROW-$id')\" id=\"RCHK-$id\"/>";
- print "$marked_pic";
- print "$published_pic";
+ $reply['content'] .= "$marked_pic";
+ $reply['content'] .= "$published_pic";
- print "<span id=\"RTITLE-$id\"
+ $reply['content'] .= "<span id=\"RTITLE-$id\"
onclick=\"return cdmClicked(event, $id);\"
class=\"titleWrap$hlc_suffix\">
<a class=\"title\"
- target=\"_blank\" href=\"".$line["link"]."\">".$line["title"].
+ title=\"".htmlspecialchars($line['title'])."\"
+ target=\"_blank\" href=\"".
+ htmlspecialchars($line["link"])."\">".
+ truncate_string($line["title"], 100) .
" $entry_author</a>";
- print $labels_str;
+ $reply['content'] .= $labels_str;
if (!$expand_cdm)
$content_hidden = "style=\"display : none\"";
else
$excerpt_hidden = "style=\"display : none\"";
- print "<span $excerpt_hidden
+ $reply['content'] .= "<span $excerpt_hidden
id=\"CEXC-$id\" class=\"cdmExcerpt\"> - $content_preview</span>";
- print "</span>";
+ $reply['content'] .= "</span>";
- print "</div>";
+ $reply['content'] .= "</div>";
-
print "<div class=\"cdmContent\" $content_hidden
+
$reply['content'] .= "<div class=\"cdmContent\" $content_hidden
onclick=\"return cdmClicked(event, $id);\"
id=\"CICD-$id\">";
-
print "<div class=\"cdmContentInner\">";
+
$reply['content'] .= "<div class=\"cdmContentInner\">";
if ($line["orig_feed_id"]) {
WHERE id = ".$line["orig_feed_id"]);
if (db_num_rows($tmp_result) != 0) {
-
-
print "<div clear='both'>";
- print __("Originally from:");
-
- print " ";
-
+
+
$reply['content'] .= "<div clear='both'>";
+ $reply['content'] .= __("Originally from:");
+
+ $reply['content'] .= " ";
+
$tmp_line = db_fetch_assoc($tmp_result);
-
- print "<a target='_blank'
+
+ $reply['content'] .= "<a target='_blank'
href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
$tmp_line['title'] . "</a>";
-
- print " ";
-
-
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>";
+
+ $reply['content'] .= " ";
+
+
$reply['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
+
$reply['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.gif'></a>";
+
+ $reply['content'] .= "</div>";
}
}
}
if ($expand_cdm) {
- $article_content = sanitize_rss($link, $line["content_preview"],
+ $article_content = sanitize_rss($link, $line["content_preview"],
false, false, $feed_site_url);
if (!$article_content) $article_content = " ";
$article_content = '';
}
-
print "<div id=\"POSTNOTE-$id\">";
+
$reply['content'] .= "<div id=\"POSTNOTE-$id\">";
if ($line['note']) {
- print format_article_note($id, $line['note']);
+ $reply['content'] .= format_article_note($id, $line['note']);
}
- print "</div>";
+ $reply['content'] .= "</div>";
- print "<span id=\"CWRAP-$id\">$article_content</span>";
+ $reply['content'] .= "<span id=\"CWRAP-$id\">$article_content</span>";
$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'] == null) ? $line['orig_feed_id'] :
$line['feed_id'])." AND owner_uid = ".$_SESSION["uid"]);
- $always_display_enclosures = sql_bool_to_bool(db_fetch_result($tmp_result,
+ $always_display_enclosures = sql_bool_to_bool(db_fetch_result($tmp_result,
0, "always_display_enclosures"));
- print_article_enclosures($link, $id, $always_display_enclosures,
+ $reply['content'] .= format_article_enclosures($link, $id, $always_display_enclosures,
$article_content);
- print "</div>";
+ $reply['content'] .= "</div>";
-
print "<div class=\"cdmFooter\">";
+
$reply['content'] .= "<div class=\"cdmFooter\">";
$tags_str = format_tags_string(get_article_tags($link, $id), $id);
-
print "<img src='".theme_image($link,
+
$reply['content'] .= "<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')."\"
+ <a title=\"".__('Edit tags for this article')."\"
href=\"#\" onclick=\"editArticleTags($id, $feed_id, true)\">(+)</a>";
-
print "<div style=\"float : right\">";
+
$reply['content'] .= "<div style=\"float : right\">";
- print "<img src=\"images/art-zoom.png\"
+ $reply['content'] .= "<img src=\"images/art-zoom.png\"
onclick=\"zoomToArticle(event, $id)\"
style=\"cursor : pointer\"
- alt='Zoom'
+ alt='Zoom'
title='".__('Open article in new tab')."'>";
+ //$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
+
+ $reply['content'] .= "<img src=\"images/art-pub-note.png\"
+ style=\"cursor : pointer\" style=\"cursor : pointer\"
+ onclick=\"editArticleNote($id)\"
+ alt='PubNote' title='".__('Edit article note')."'>";
+
if (DIGEST_ENABLE) {
- print "<img src=\"".theme_image($link, 'images/art-email.png')."\"
+ $reply['content'] .= "<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\"
- style=\"cursor : pointer\" style=\"cursor : pointer\"
- onclick=\"publishWithNote($id, '$note_escaped')\"
- alt='PubNote' title='".__('Publish article with a note')."'>";
+ if (ENABLE_TWEET_BUTTON) {
+ $reply['content'] .= "<img src=\"".theme_image($link, 'images/art-tweet.png')."\"
+ class='tagsPic' style=\"cursor : pointer\"
+ onclick=\"tweetArticle($id)\"
+ alt='Zoom' title='".__('Share on Twitter')."'>";
+ }
-
print "<img src=\"images/digest_checkbox.png\"
+
$reply['content'] .= "<img src=\"images/digest_checkbox.png\"
style=\"cursor : pointer\" style=\"cursor : pointer\"
onclick=\"dismissArticle($id)\"
alt='Dismiss' title='".__('Dismiss article')."'>";
- print "</div>";
- print "</div>";
+ $reply['content'] .= "</div>";
+ $reply['content'] .= "</div>";
+
+ $reply['content'] .= "</div>";
- print "</div>";
+ $reply['content'] .= "</div>";
- print "</div>";
+ }
- }
-
++$lnum;
- }
+ }
} else {
$message = "";
}
if (!$offset && $message) {
-
print "<div class='whiteBox'>$message";
+
$reply['content'] .= "<div class='whiteBox'>$message";
-
print "<p class=\"small\"><span class=\"insensitive\">";
+
$reply['content'] .= "<p class=\"small\"><span class=\"insensitive\">";
$result = db_query($link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
WHERE owner_uid = " . $_SESSION['uid']);
-
+
$last_updated = db_fetch_result($result, 0, "last_updated");
$last_updated = make_local_datetime($link, $last_updated, false);
-
- printf(__("Feeds last updated at %s"), $last_updated);
-
+
+ $reply['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
+
$result = db_query($link, "SELECT COUNT(id) AS num_errors
FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
-
+
$num_errors = db_fetch_result($result, 0, "num_errors");
-
+
if ($num_errors > 0) {
- print "<br/>";
-
print "<a class=\"insensitive\" href=\"#\" onclick=\"showFeedsWithErrors()\">".
+ $reply['content'] .= "<br/>";
+
$reply['content'] .= "<a class=\"insensitive\" href=\"#\" onclick=\"showFeedsWithErrors()\">".
__('Some feeds have update errors (click for details)')."</a>";
}
- print "</span></p></div>";
+ $reply['content'] .= "</span></p></div>";
}
}
# print "</div>";
# }
- print "]]></content>";
+ #print "]]></content>";
- return array($topmost_article_ids, $headlines_count, $feed, $disable_cache, $vgroup_last_feed);
+ return array($topmost_article_ids, $headlines_count, $feed, $disable_cache,
+ $vgroup_last_feed, $reply['content'], $reply['toolbar']);
}
// from here: http://www.roscripts.com/Create_tag_cloud-71.html
function printTagCloud($link) {
- $query = "SELECT tag_name, COUNT(post_int_id) AS count
- FROM ttrss_tags WHERE owner_uid = ".$_SESSION["uid"]."
+ $query = "SELECT tag_name, COUNT(post_int_id) AS count
+ FROM ttrss_tags WHERE owner_uid = ".$_SESSION["uid"]."
GROUP BY tag_name ORDER BY count DESC LIMIT 50";
$result = db_query($link, $query);
$max_size = 32; // max font size in pixels
$min_size = 11; // min font size in pixels
-
+
// largest and smallest array values
$max_qty = max(array_values($tags));
$min_qty = min(array_values($tags));
-
+
// find the range of values
$spread = $max_qty - $min_qty;
if ($spread == 0) { // we don't want to divide by zero
$spread = 1;
}
-
+
// set the font-size increment
$step = ($max_size - $min_size) / ($spread);
-
+
// loop through the tag array
foreach ($tags as $key => $value) {
// calculate font-size
$key_escaped = str_replace("'", "\\'", $key);
- echo "<a href=\"javascript:viewfeed('$key_escaped') \" style=\"font-size: " .
- $size . "px\" title=\"$value articles tagged with " .
+ echo "<a href=\"javascript:viewfeed('$key_escaped') \" style=\"font-size: " .
+ $size . "px\" title=\"$value articles tagged with " .
$key . '">' . $key . '</a> ';
}
}
function print_checkpoint($n, $s) {
- $ts = getmicrotime();
+ $ts = getmicrotime();
echo sprintf("<!-- CP[$n] %.4f seconds -->", $ts - $s);
return $ts;
}
$tag = mb_strtolower($tag, 'utf-8');
- $tag = preg_replace('/[\"\+\>\<]/', "", $tag);
+ $tag = preg_replace('/[\'\"\+\>\<]/', "", $tag);
-// $tag = str_replace('"', "", $tag);
-// $tag = str_replace("+", " ", $tag);
+// $tag = str_replace('"', "", $tag);
+// $tag = str_replace("+", " ", $tag);
$tag = str_replace("technorati tag: ", "", $tag);
return $tag;
function get_self_url_prefix() {
- $url_path = "";
-
+ /* $url_path = "";
+
if ($_SERVER['HTTPS'] != "on") {
$url_path = "http://";
} else {
$url_path .= $_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']);
- return $url_path;
+ return $url_path; */
+
+ return SELF_URL_PATH;
}
function opml_publish_url($link){
$url_path = get_self_url_prefix();
- $url_path .= "/opml.php?op=publish&key=" .
+ $url_path .= "/opml.php?op=publish&key=" .
get_feed_access_key($link, 'OPML:Publish', false, $_SESSION["uid"]);
return $url_path;
/**
* Purge a feed contents, marked articles excepted.
- *
+ *
* @param mixed $link The database connection.
* @param integer $id The id of the feed to purge.
* @return void
WHERE feed_id IS NULL AND marked = false AND owner_uid = " . $_SESSION["uid"]);
}
- $result = db_query($link, "DELETE FROM ttrss_entries WHERE
+ $result = db_query($link, "DELETE FROM ttrss_entries WHERE
(SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
ccache_update($link, $id, $_SESSION['uid']);
* @return string The Mozilla Firefox feed adding URL.
*/
function add_feed_url() {
- $url_path = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
- $url_path .= "?op=pref-feeds&quiet=1&subop=add&feed_url=%s";
+ //$url_path = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
+
+ $url_path = get_self_url_prefix() .
+ "/backend.php?op=pref-feeds&quiet=1&subop=add&feed_url=%s";
return $url_path;
} // function add_feed_url
/**
* Encrypt a password in SHA1.
- *
+ *
* @param string $pass The password to encrypt.
* @param string $login A optionnal login.
* @return string The encrypted password.
* Used by daemons to update n feeds by run.
* Only update feed needing a update, and not being processed
* by another process.
- *
+ *
* @param mixed $link Database link
* @param integer $limit Maximum number of feeds in update batch. Default to DAEMON_FEED_LIMIT.
* @param boolean $from_http Set to true if you call this function from http to disable cli specific code.
$login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
} else {
$login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
- }
+ }
} else {
$login_thresh_qpart = "";
}
// We search for feed needing update.
$result = db_query($link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id, ttrss_feeds.owner_uid,
".SUBSTRING_FOR_DATE."(ttrss_feeds.last_updated,1,19) AS last_updated,
- ttrss_feeds.update_interval
- FROM
+ ttrss_feeds.update_interval
+ FROM
ttrss_feeds, ttrss_users, ttrss_user_prefs
WHERE
ttrss_feeds.owner_uid = ttrss_users.id
} 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
+ 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_param"] = $line["action_param"];
$filter["filter_param"] = $line["filter_param"];
$filter["inverse"] = sql_bool_to_bool($line["inverse"]);
-
+
array_push($filters[$line["name"]], $filter);
}
}
function get_score_pic($score) {
- if ($score > 100) {
- return "score_high.png";
- } else if ($score > 0) {
+ if ($score > 100) {
+ return "score_high.png";
+ } else if ($score > 0) {
return "score_half_high.png";
} else if ($score < -100) {
return "score_low.png";
} else if ($score < 0) {
return "score_half_low.png";
- } else {
+ } else {
return "score_neutral.png";
}
}
function update_feedbrowser_cache($link) {
$result = db_query($link, "SELECT feed_url,title, COUNT(id) AS subscribers
- FROM ttrss_feeds WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
- WHERE tf.feed_url = ttrss_feeds.feed_url
- AND (private IS true OR feed_url LIKE '%:%@%/%'))
+ FROM ttrss_feeds WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
+ WHERE tf.feed_url = ttrss_feeds.feed_url
+ AND (private IS true OR feed_url LIKE '%:%@%/%'))
GROUP BY feed_url, title ORDER BY subscribers DESC LIMIT 1000");
-
+
db_query($link, "BEGIN");
-
+
db_query($link, "DELETE FROM ttrss_feedbrowser_cache");
-
+
$count = 0;
-
+
while ($line = db_fetch_assoc($result)) {
$subscribers = db_escape_string($line["subscribers"]);
$feed_url = db_escape_string($line["feed_url"]);
if (db_num_rows($tmp_result) == 0) {
- db_query($link, "INSERT INTO ttrss_feedbrowser_cache
- (feed_url, title, subscribers) VALUES ('$feed_url',
+ db_query($link, "INSERT INTO ttrss_feedbrowser_cache
+ (feed_url, title, subscribers) VALUES ('$feed_url',
'$title', '$subscribers')");
++$count;
}
-
+
}
-
+
db_query($link, "COMMIT");
return $count;
}
}
- function ccache_find($link, $feed_id, $owner_uid, $is_cat = false,
+ function ccache_find($link, $feed_id, $owner_uid, $is_cat = false,
$no_update = false) {
if (!is_numeric($feed_id)) return;
if (!$is_cat) {
$table = "ttrss_counters_cache";
if ($feed_id > 0) {
- $tmp_result = db_query($link, "SELECT owner_uid FROM ttrss_feeds
+ $tmp_result = db_query($link, "SELECT owner_uid FROM ttrss_feeds
WHERE id = '$feed_id'");
$owner_uid = db_fetch_result($tmp_result, 0, "owner_uid");
}
}
$result = db_query($link, "SELECT value FROM $table
- WHERE owner_uid = '$owner_uid' AND feed_id = '$feed_id'
+ WHERE owner_uid = '$owner_uid' AND feed_id = '$feed_id'
LIMIT 1");
if (db_num_rows($result) == 1) {
}
- function ccache_update($link, $feed_id, $owner_uid, $is_cat = false,
+ function ccache_update($link, $feed_id, $owner_uid, $is_cat = false,
$update_pcat = true) {
if (!is_numeric($feed_id)) return;
if (!$is_cat && $feed_id > 0) {
- $tmp_result = db_query($link, "SELECT owner_uid FROM ttrss_feeds
+ $tmp_result = db_query($link, "SELECT owner_uid FROM ttrss_feeds
WHERE id = '$feed_id'");
$owner_uid = db_fetch_result($tmp_result, 0, "owner_uid");
}
ccache_update($link, $line["id"], $owner_uid, false, false);
}
- $result = db_query($link, "SELECT SUM(value) AS sv
- FROM ttrss_counters_cache, ttrss_feeds
- WHERE id = feed_id AND $cat_qpart AND
+ $result = db_query($link, "SELECT SUM(value) AS sv
+ FROM ttrss_counters_cache, ttrss_feeds
+ WHERE id = feed_id AND $cat_qpart AND
ttrss_feeds.owner_uid = '$owner_uid'");
$unread = (int) db_fetch_result($result, 0, "sv");
} else {
db_query($link, "INSERT INTO $table
- (feed_id, value, owner_uid, updated)
- VALUES
+ (feed_id, value, owner_uid, updated)
+ VALUES
($feed_id, $unread, $owner_uid, NOW())");
}
}
function label_find_id($link, $label, $owner_uid) {
- $result = db_query($link,
- "SELECT id FROM ttrss_labels2 WHERE caption = '$label'
+ $result = db_query($link,
+ "SELECT id FROM ttrss_labels2 WHERE caption = '$label'
AND owner_uid = '$owner_uid' LIMIT 1");
if (db_num_rows($result) == 1) {
return $label_cache;
}
- $result = db_query($link,
- "SELECT DISTINCT label_id,caption,fg_color,bg_color
- FROM ttrss_labels2, ttrss_user_labels2
- WHERE id = label_id
- AND article_id = '$id'
+ $result = db_query($link,
+ "SELECT DISTINCT label_id,caption,fg_color,bg_color
+ FROM ttrss_labels2, ttrss_user_labels2
+ WHERE id = label_id
+ AND article_id = '$id'
AND owner_uid = ".$_SESSION["uid"] . "
ORDER BY caption");
}
if ($memcache) $memcache->add($obj_id, $rv, 0, 3600);
- if (count($rv) > 0)
+ if (count($rv) > 0)
label_update_cache($link, $id, $rv);
else
label_update_cache($link, $id, array("no-labels" => 1));
function label_find_caption($link, $label, $owner_uid) {
- $result = db_query($link,
- "SELECT caption FROM ttrss_labels2 WHERE id = '$label'
+ $result = db_query($link,
+ "SELECT caption FROM ttrss_labels2 WHERE id = '$label'
AND owner_uid = '$owner_uid' LIMIT 1");
if (db_num_rows($result) == 1) {
if ($force)
label_clear_cache($link, $id);
- if (!$labels)
+ if (!$labels)
$labels = get_article_labels($link, $id);
$labels = db_escape_string(json_encode($labels));
if (!$label_id) return;
- $result = db_query($link,
+ $result = db_query($link,
"DELETE FROM ttrss_user_labels2
- WHERE
+ WHERE
label_id = '$label_id' AND
article_id = '$id'");
if (!$label_id) return;
- $result = db_query($link,
- "SELECT
+ $result = db_query($link,
+ "SELECT
article_id FROM ttrss_labels2, ttrss_user_labels2
- WHERE
- label_id = id AND
+ WHERE
+ label_id = id AND
label_id = '$label_id' AND
article_id = '$id' AND owner_uid = '$owner_uid'
LIMIT 1");
if (db_num_rows($result) == 0) {
- db_query($link, "INSERT INTO ttrss_user_labels2
+ db_query($link, "INSERT INTO ttrss_user_labels2
(label_id, article_id) VALUES ('$label_id', '$id')");
}
- label_clear_cache($link, $id);
+ label_clear_cache($link, $id);
}
feed_id = '$ext_id' AND owner_uid = $owner_uid");
/* Disable filters that reference label being removed */
-
+
db_query($link, "UPDATE ttrss_filters SET
enabled = false WHERE action_param = '$caption'
AND action_id = 7
if (db_num_rows($result) == 0) {
$result = db_query($link,
- "INSERT INTO ttrss_labels2 (caption,owner_uid)
+ "INSERT INTO ttrss_labels2 (caption,owner_uid)
VALUES ('$caption', '".$_SESSION["uid"]."')");
$result = db_affected_rows($link, $result) != 0;
$id = $line["id"];
if ($feed_id < -10 && $feed_id == -11-$label_id) {
- print "<option id=\"LHDL-$id\"
+ print "<option id=\"LHDL-$id\"
value=\"selectionRemoveLabel($label_id)\">".
__('Remove:') . " $label_caption</option>";
- } else {
- print "<option id=\"LHDL-$id\"
+ } else {
+ print "<option id=\"LHDL-$id\"
value=\"selectionAssignLabel($label_id)\">".
__('Assign:') . " $label_caption</option>";
}
array_push($formatted_tags, $tag_str);
$tmp_tags_str = implode(", ", $formatted_tags);
-
+
if ($num_tags == $tag_limit || mb_strlen($tmp_tags_str) > 150) {
break;
}
$labels_str = "";
foreach ($labels as $l) {
- $labels_str .= sprintf("<span class='hlLabelRef'
+ $labels_str .= sprintf("<span class='hlLabelRef'
style='color : %s; background-color : %s'>%s</span>",
$l[2], $l[3], $l[1]);
}
function format_article_note($id, $note) {
- $note_escaped = htmlspecialchars($note, ENT_QUOTES);
-
- $str = "<div class='articleNote'>";
- $str .= $note;
- $str .= "<div class='articleNoteOps'>";
- $str .= "<a href=\"javascript:publishWithNote($id, '$note_escaped')\">".
- __('edit note')."</a>";
- $str .= "</div>";
- $str .= "</div>";
+ $str = "<div class='articleNote' title=\"".__('edit note')."\"
+ onclick=\"editArticleNote($id)\">$note</div>";
return $str;
}
$mode = bool_to_sql_bool($mode);
db_query($link, "UPDATE ttrss_feed_categories SET
- collapsed = $mode WHERE id = '$cat_id' AND owner_uid = " .
+ collapsed = $mode WHERE id = '$cat_id' AND owner_uid = " .
$_SESSION["uid"]);
} else {
$pref_name = '';
WHERE id = '$id'");
if (db_num_rows($result) == 0) {
- db_query($link, "INSERT INTO ttrss_archived_feeds
+ db_query($link, "INSERT INTO ttrss_archived_feeds
(id, owner_uid, title, feed_url, site_url)
SELECT id, owner_uid, title, feed_url, site_url from ttrss_feeds
WHERE id = '$id'");
}
db_query($link, "UPDATE ttrss_user_entries SET feed_id = NULL,
- orig_feed_id = '$id' WHERE feed_id = '$id' AND
+ orig_feed_id = '$id' WHERE feed_id = '$id' AND
marked = true AND owner_uid = $owner_uid");
/* Remove access key for the feed */
/* remove the feed */
- db_query($link, "DELETE FROM ttrss_feeds
+ db_query($link, "DELETE FROM ttrss_feeds
WHERE id = '$id' AND owner_uid = $owner_uid");
db_query($link, "COMMIT");
WHERE title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]);
if (db_num_rows($result) == 0) {
-
+
$result = db_query($link,
- "INSERT INTO ttrss_feed_categories (owner_uid,title)
+ "INSERT INTO ttrss_feed_categories (owner_uid,title)
VALUES ('".$_SESSION["uid"]."', '$feed_cat')");
db_query($link, "COMMIT");
}
return false;
- }
+ }
function remove_feed_category($link, $id, $owner_uid) {
WHERE id = '$feed_id'");
if (db_num_rows($result) == 0) {
- db_query($link, "INSERT INTO ttrss_archived_feeds
+ db_query($link, "INSERT INTO ttrss_archived_feeds
(id, owner_uid, title, feed_url, site_url)
SELECT id, owner_uid, title, feed_url, site_url from ttrss_feeds
WHERE id = '$feed_id'");
}
- db_query($link, "UPDATE ttrss_user_entries
+ db_query($link, "UPDATE ttrss_user_entries
SET orig_feed_id = feed_id, feed_id = NULL
WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
}
}
function getArticleFeed($link, $id) {
- $result = db_query($link, "SELECT feed_id FROM ttrss_user_entries
+ $result = db_query($link, "SELECT feed_id FROM ttrss_user_entries
WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
if (db_num_rows($result) != 0) {
global $memcache;
- $query = "SELECT * FROM ttrss_enclosures
+ $query = "SELECT * FROM ttrss_enclosures
WHERE post_id = '$id' AND content_url != ''";
$obj_id = md5("ENCLOSURES:$id");
foreach (array_values($counters) as $cv) {
$unread = $cv["counter"];
-
+
if ($unread || !$unread_only) {
-
+
$row = array(
"id" => $cv["id"],
"title" => $cv["description"],
"unread" => $cv["counter"],
"cat_id" => -2,
);
-
+
array_push($feeds, $row);
}
}
array_push($feeds, $row);
}
- }
+ }
}
/* Real feeds */
}
if ($cat_id == -4 || $cat_id == -3) {
- $result = db_query($link, "SELECT
+ $result = db_query($link, "SELECT
id, feed_url, cat_id, title, ".
SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
- FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] .
+ FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] .
" ORDER BY cat_id, title " . $limit_qpart);
} else {
else
$cat_qpart = "cat_id IS NULL";
- $result = db_query($link, "SELECT
+ $result = db_query($link, "SELECT
id, feed_url, cat_id, title, ".
SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
- FROM ttrss_feeds WHERE
- $cat_qpart AND owner_uid = " . $_SESSION["uid"] .
+ FROM ttrss_feeds WHERE
+ $cat_qpart AND owner_uid = " . $_SESSION["uid"] .
" ORDER BY cat_id, title " . $limit_qpart);
}
"cat_id" => (int)$line["cat_id"],
"last_updated" => strtotime($line["last_updated"])
);
-
+
array_push($feeds, $row);
}
}
$search = db_escape_string($_REQUEST["search"]);
$search_mode = db_escape_string($_REQUEST["search_mode"]);
$match_on = db_escape_string($_REQUEST["match_on"]);
-
- $qfh_ret = queryFeedHeadlines($link, $feed_id, $limit,
+
+ $qfh_ret = queryFeedHeadlines($link, $feed_id, $limit,
$view_mode, $is_cat, $search, $search_mode, $match_on,
$order, $offset);
$headlines = array();
while ($line = db_fetch_assoc($result)) {
- $is_updated = ($line["last_read"] == "" &&
+ $is_updated = ($line["last_read"] == "" &&
($line["unread"] != "t" && $line["unread"] != "1"));
$headline_row = array(
return $headlines;
}
- function generate_dashboard_feed($link) {
- print "<headlines id=\"-5\" is_cat=\"\">";
+ function generate_error_feed($link, $error) {
+ $reply = array();
+
+ $reply['headlines']['id'] = -6;
+ $reply['headlines']['is_cat'] = false;
+
+ $reply['headlines']['toolbar'] = '';
+ $reply['headlines']['content'] = "<div class='whiteBox'>". $error . "</div>";
+
+ $reply['headlines-info'] = array("count" => 0,
+ "vgroup_last_feed" => '',
+ "unread" => 0,
+ "disable_cache" => true);
+
+ return $reply;
+ }
+
- print "<toolbar><![CDATA[]]></toolbar>";
+ function generate_dashboard_feed($link) {
+ $reply = array();
- print '<content><![CDATA[';
+ $reply['headlines']['id'] = -5;
+ $reply['headlines']['is_cat'] = false;
- print "<div class='whiteBox'>".__('No feed selected.');
+ $reply['headlines']['toolbar'] = '';
+ $reply['headlines']['content'] = "<div class='whiteBox'>".__('No feed selected.');
-
print "<p class=\"small\"><span class=\"insensitive\">";
+
$reply['headlines']['content'] .= "<p class=\"small\"><span class=\"insensitive\">";
$result = db_query($link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
WHERE owner_uid = " . $_SESSION['uid']);
$last_updated = db_fetch_result($result, 0, "last_updated");
$last_updated = make_local_datetime($link, $last_updated, false);
- printf(__("Feeds last updated at %s"), $last_updated);
+ $reply['headlines']['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
$result = db_query($link, "SELECT COUNT(id) AS num_errors
FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
$num_errors = db_fetch_result($result, 0, "num_errors");
if ($num_errors > 0) {
- print "<br/>";
-
print "<a class=\"insensitive\" href=\"#\" onclick=\"showFeedsWithErrors()\">".
+ $reply['headlines']['content'] .= "<br/>";
+
$reply['headlines']['content'] .= "<a class=\"insensitive\" href=\"#\" onclick=\"showFeedsWithErrors()\">".
__('Some feeds have update errors (click for details)')."</a>";
}
- print "</span></p>";
-
- print "]]></content>";
- print "</headlines>";
+ $reply['headlines']['content'] .= "</span></p>";
- print "<headlines-info><![CDATA[";
-
- $info = array("count" => 0,
+ $reply['headlines-info'] = array("count" => 0,
"vgroup_last_feed" => '',
"unread" => 0,
"disable_cache" => true);
- print json_encode($info);
-
- print "]]></headlines-info>";
-
+ return $reply;
}
function save_email_address($link, $email) {
// FIXME: implement persistent storage of emails
- if (!$_SESSION['stored_emails'])
+ if (!$_SESSION['stored_emails'])
$_SESSION['stored_emails'] = array();
if (!in_array($email, $_SESSION['stored_emails']))
$sql_is_cat = bool_to_sql_bool($is_cat);
- $result = db_query($link, "SELECT access_key FROM ttrss_access_keys
- WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat
+ $result = db_query($link, "SELECT access_key FROM ttrss_access_keys
+ WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat
AND owner_uid = " . $owner_uid);
if (db_num_rows($result) == 1) {
$key = db_escape_string(sha1(uniqid(rand(), true)));
db_query($link, "UPDATE ttrss_access_keys SET access_key = '$key'
- WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat
+ WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat
AND owner_uid = " . $owner_uid);
return $key;
$sql_is_cat = bool_to_sql_bool($is_cat);
- $result = db_query($link, "SELECT access_key FROM ttrss_access_keys
- WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat
+ $result = db_query($link, "SELECT access_key FROM ttrss_access_keys
+ WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat
AND owner_uid = " . $owner_uid);
if (db_num_rows($result) == 1) {
} else {
$key = db_escape_string(sha1(uniqid(rand(), true)));
- $result = db_query($link, "INSERT INTO ttrss_access_keys
+ $result = db_query($link, "INSERT INTO ttrss_access_keys
(access_key, feed_id, is_cat, owner_uid)
VALUES ('$key', '$feed_id', $sql_is_cat, '$owner_uid')");
*
* @return array Array of feeds. Key is the full URL, value the title
*/
- function get_feeds_from_html($url)
+ function get_feeds_from_html($url, $login = false, $pass = false)
{
$url = fix_url($url);
$baseUrl = substr($url, 0, strrpos($url, '/') + 1);
libxml_use_internal_errors(true);
+ $content = @fetch_file_contents($url, false, $login, $pass);
+
$doc = new DOMDocument();
- $doc->loadHTMLFile($url);
+ $doc->loadHTML($content);
$xpath = new DOMXPath($doc);
$entries = $xpath->query('/html/head/link[@rel="alternate"]');
$feedUrls = array();
*
* @return boolean True if the URL contains HTML content
*/
- function url_is_html($url) {
- $content = substr(fetch_file_contents($url, false), 0, 1000);
+ function url_is_html($url, $login = false, $pass = false) {
+ $content = substr(fetch_file_contents($url, false, $login, $pass), 0, 1000);
+
if (stripos($content, '<html>') === false
&& stripos($content, '<html ') === false
) {
$result = db_query($link, "SELECT caption FROM ttrss_labels2
WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY caption");
- print "<select default=\"$value\" name=\"" . htmlspecialchars($name) .
+ print "<select default=\"$value\" name=\"" . htmlspecialchars($name) .
"\" $attributes onchange=\"labelSelectOnChange(this)\" >";
while ($line = db_fetch_assoc($result)) {
}
- function print_article_enclosures($link, $id, $always_display_enclosures,
+ function format_article_enclosures($link, $id, $always_display_enclosures,
$article_content) {
$result = get_article_enclosures($link, $id);
-
+ $rv = '';
+
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);
-
+
+# $filename = substr($url, strrpos($url, "/")+1);
+
$entry = format_inline_player($link, $url, $ctype);
-
-
$entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
- $filename . " (" . $ctype . ")" . "</a>";
-
+
+
# $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\">";
-
+
+
$rv .= "<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"])) {
-
+
alt=\"".htmlspecialchars($entry["filename"])."\"
src=\"" .htmlspecialchars($entry["url"]) . "\"/></p>";
}
}
}
}
-
+
if (count($entries) == 1) {
- print __("Attachment:") . " ";
+ $rv .= __("Attachment:") . " ";
} else {
- print __("Attachments:") . " ";
+ $rv .= __("Attachments:") . " ";
}
-
- print join(", ", $entries_html);
-
- print "</div>";
+
+ $rv .= join(", ", $entries_html);
+
+ $rv .= "</div>";
}
+
+ return $rv;
}
function getLastArticleId($link) {
function rewrite_relative_url($url, $rel_url) {
if (strpos($rel_url, "://") !== false) {
return $rel_url;
- } else if (strpos($rel_url, "/") === 0)
+ } else if (strpos($rel_url, "/") === 0)
{
$parts = parse_url($url);
$parts['path'] = $rel_url;
$sphinxClient->SetServer('localhost', 9312);
$sphinxClient->SetConnectTimeout(1);
- $sphinxClient->SetFieldWeights(array('title' => 70, 'content' => 30,
+ $sphinxClient->SetFieldWeights(array('title' => 70, 'content' => 30,
'feed_title' => 20));
$sphinxClient->SetMatchMode(SPH_MATCH_EXTENDED2);
$sphinxClient->SetLimits($offset, $limit, 1000);
$sphinxClient->SetArrayResult(false);
$sphinxClient->SetFilter('owner_uid', array($_SESSION['uid']));
-
+
$result = $sphinxClient->Query($query, SPHINX_INDEX);
$ids = array();
while ($limit > 0) {
$limit_part = 500;
- $query = "SELECT ttrss_tags.id AS id
- FROM ttrss_tags, ttrss_user_entries, ttrss_entries
+ $query = "SELECT ttrss_tags.id AS id
+ FROM ttrss_tags, ttrss_user_entries, ttrss_entries
WHERE post_int_id = int_id AND $interval_query AND
ref_id = ttrss_entries.id AND tag_cache != '' LIMIT $limit_part";
-
+
$result = db_query($link, $query);
$ids = array();
$obj = array();
$feed_id = (int) $feed_id;
- if (!$title)
+ if (!$title)
$title = getFeedTitle($link, $feed_id, false);
if ($unread === false)
return $obj;
}
+
+ function fetch_twitter_rss($link, $url, $owner_uid) {
+ $result = db_query($link, "SELECT twitter_oauth FROM ttrss_users
+ WHERE id = $owner_uid");
+
+ $access_token = json_decode(db_fetch_result($result, 0, 'twitter_oauth'), true);
+ $url_escaped = db_escape_string($url);
+
+ if ($access_token) {
+
+ $tmhOAuth = new tmhOAuth(array(
+ 'consumer_key' => CONSUMER_KEY,
+ 'consumer_secret' => CONSUMER_SECRET,
+ 'user_token' => $access_token['oauth_token'],
+ 'user_secret' => $access_token['oauth_token_secret'],
+ ));
+
+ $code = $tmhOAuth->request('GET', $url);
+
+ if ($code == 200) {
+
+ $content = $tmhOAuth->response['response'];
+
+ define('MAGPIE_CACHE_ON', false);
+
+ $rss = new MagpieRSS($content, MAGPIE_OUTPUT_ENCODING,
+ MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
+
+ return $rss;
+
+ } else {
+
+ db_query($link, "UPDATE ttrss_feeds
+ SET last_error = 'OAuth authorization failed ($code).'
+ WHERE feed_url = '$url_escaped' AND owner_uid = $owner_uid");
+ }
+
+ } else {
+
+ db_query($link, "UPDATE ttrss_feeds
+ SET last_error = 'OAuth information not found.'
+ WHERE feed_url = '$url_escaped' AND owner_uid = $owner_uid");
+
+ return false;
+ }
+ }
+
+ function print_user_stylesheet($link) {
+ $value = get_pref($link, 'USER_STYLESHEET');
+
+ if ($value) {
+ print "<style type=\"text/css\">";
+ print str_replace("<br/>", "\n", $value);
+ print "</style>";
+ }
+
+ }
+
+ function rewrite_urls($line) {
+ global $url_regex;
+
+ $urls = null;
+
+ $result = preg_replace("/((?<!=.)((http|https|ftp)+):\/\/[^ ,!]+)/i",
+ "<a target=\"_blank\" href=\"\\1\">\\1</a>", $line);
+
+ return $result;
+ }
+
?>
git.wh0rd.org / tt-rss.git / blobdiff