<?php
-/* if ($_REQUEST["debug"]) {
+ if ($_REQUEST["debug"]) {
define('DEFAULT_ERROR_LEVEL', E_ALL);
- } else {
- define('DEFAULT_ERROR_LEVEL', E_ERROR | E_WARNING | E_PARSE);
- } */
+ }
require_once 'config.php';
}
} // If translations are enabled.
+ if (defined('MEMCACHE_SERVER')) {
+ $memcache = new Memcache;
+ $memcache->connect(MEMCACHE_SERVER, 11211);
+ }
+
require_once 'db-prefs.php';
require_once 'compat.php';
require_once 'errors.php';
}
}
- function fetch_file_contents($url) {
+ function fetch_file_contents($url, $type) {
if (USE_CURL_FOR_ICONS) {
- $tmpfile = tempnam(TMP_DIRECTORY, "ttrss-tmp");
-
$ch = curl_init($url);
- $fp = fopen($tmpfile, "w");
- if ($fp) {
- curl_setopt($ch, CURLOPT_FILE, $fp);
- curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
- curl_setopt($ch, CURLOPT_TIMEOUT, 45);
- curl_exec($ch);
-
- if (strpos(curl_getinfo($ch, CURLINFO_CONTENT_TYPE), "image/") !== false) {
- curl_close($ch);
- fclose($fp);
- $contents = file_get_contents($tmpfile);
- } else {
- curl_close($ch);
- fclose($fp);
- }
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
+ curl_setopt($ch, CURLOPT_TIMEOUT, 45);
+ curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+ curl_setopt($ch, CURLOPT_MAXREDIRS, 20);
+ curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+ $contents = curl_exec($ch);
+ if ($contents === false) {
+ curl_close($ch);
+ return false;
}
- unlink($tmpfile);
+ $content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
+ curl_close($ch);
- return $contents;
+ if ($type && strpos($content_type, "$type") === false) {
+ return false;
+ }
+ return $contents;
} else {
return file_get_contents($url);
}
$icon_file = ICONS_DIR . "/$feed.ico";
if ($favicon_url && !file_exists($icon_file)) {
- $contents = fetch_file_contents($favicon_url);
+ $contents = fetch_file_contents($favicon_url, "image");
- $fp = fopen($icon_file, "w");
+ if ($contents) {
+ $fp = fopen($icon_file, "w");
- if ($fp) {
- fwrite($fp, $contents);
- fclose($fp);
- chmod($icon_file, 0644);
+ if ($fp) {
+ fwrite($fp, $contents);
+ fclose($fp);
+ chmod($icon_file, 0644);
+ }
}
}
}
- function update_rss_feed($link, $feed_url, $feed, $ignore_daemon = false) {
+ function update_rss_feed($link, $feed, $ignore_daemon = false) {
+
+ global $memcache;
+
+ /* Update all feeds with the same URL to utilize memcache */
+
+ if ($memcache) {
+ $result = db_query($link, "SELECT f1.id
+ FROM ttrss_feeds AS f1, ttrss_feeds AS f2
+ WHERE f2.feed_url = f1.feed_url AND f2.id = '$feed'");
+
+ while ($line = db_fetch_assoc($result)) {
+ update_rss_feed_real($link, $line["id"], $ignore_daemon);
+ }
+ } else {
+ update_rss_feed_real($link, $feed, $ignore_daemon);
+ }
+ }
+
+ function update_rss_feed_real($link, $feed, $ignore_daemon = false) {
+
+ global $memcache;
if (!$_REQUEST["daemon"] && !$ignore_daemon) {
return false;
} else {
$result = db_query($link, "SELECT id,update_interval,auth_login,
- auth_pass,cache_images,update_method,hidden,last_updated
+ feed_url,auth_pass,cache_images,update_method,last_updated
FROM ttrss_feeds WHERE id = '$feed'");
}
if (db_num_rows($result) == 0) {
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
- _debug("update_rss_feed: feed $feed [$feed_url] NOT FOUND/SKIPPED");
+ _debug("update_rss_feed: feed $feed NOT FOUND/SKIPPED");
}
return false;
}
- $hidden = sql_bool_to_bool(db_fetch_result($result, 0, "hidden"));
$update_method = db_fetch_result($result, 0, "update_method");
$last_updated = db_fetch_result($result, 0, "last_updated");
$auth_login = db_fetch_result($result, 0, "auth_login");
$auth_pass = db_fetch_result($result, 0, "auth_pass");
- if (ALLOW_SELECT_UPDATE_METHOD) {
- if (ENABLE_SIMPLEPIE) {
- $use_simplepie = $update_method != 1;
- } else {
- $use_simplepie = $update_method == 2;
- }
+ if (DEFAULT_UPDATE_METHOD == "1") {
+ $use_simplepie = $update_method != 1;
} else {
- $use_simplepie = ENABLE_SIMPLEPIE;
+ $use_simplepie = $update_method == 2;
}
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
$update_interval = db_fetch_result($result, 0, "update_interval");
$cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
+ $fetch_url = db_fetch_result($result, 0, "feed_url");
if ($update_interval < 0) { return; }
$feed = db_escape_string($feed);
- $fetch_url = $feed_url;
-
if ($auth_login && $auth_pass) {
$url_parts = array();
preg_match("/(^[^:]*):\/\/(.*)/", $fetch_url, $url_parts);
error_reporting(0);
}
- if (!$use_simplepie) {
- $rss = fetch_rss($fetch_url);
- } else {
- if (!is_dir(SIMPLEPIE_CACHE_DIR)) {
- mkdir(SIMPLEPIE_CACHE_DIR);
- }
+ $obj_id = md5("FDATA:$use_simplepie:$fetch_url");
- $rss = new SimplePie();
- $rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT);
-# $rss->set_timeout(10);
- $rss->set_feed_url($fetch_url);
- $rss->set_output_encoding('UTF-8');
-
- if (SIMPLEPIE_CACHE_IMAGES && $cache_images) {
- if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
- _debug("enabling image cache");
- }
-
- $rss->set_image_handler('./image.php', 'i');
- }
+ if ($memcache && $obj = $memcache->get($obj_id)) {
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
- _debug("feed update interval (sec): " .
- get_feed_update_interval($link, $feed)*60);
+ _debug("update_rss_feed: data found in memcache.");
}
- if (is_dir(SIMPLEPIE_CACHE_DIR)) {
- $rss->set_cache_location(SIMPLEPIE_CACHE_DIR);
- $rss->set_cache_duration(get_feed_update_interval($link, $feed) * 60);
+ $rss = $obj;
+
+ } else {
+
+ if (!$use_simplepie) {
+ $rss = fetch_rss($fetch_url);
+ } else {
+ if (!is_dir(SIMPLEPIE_CACHE_DIR)) {
+ mkdir(SIMPLEPIE_CACHE_DIR);
+ }
+
+ $rss = new SimplePie();
+ $rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT);
+ # $rss->set_timeout(10);
+ $rss->set_feed_url($fetch_url);
+ $rss->set_output_encoding('UTF-8');
+
+ if (SIMPLEPIE_CACHE_IMAGES && $cache_images) {
+ if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
+ _debug("enabling image cache");
+ }
+
+ $rss->set_image_handler('./image.php', 'i');
+ }
+
+ if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
+ _debug("feed update interval (sec): " .
+ get_feed_update_interval($link, $feed)*60);
+ }
+
+ if (is_dir(SIMPLEPIE_CACHE_DIR)) {
+ $rss->set_cache_location(SIMPLEPIE_CACHE_DIR);
+ $rss->set_cache_duration(get_feed_update_interval($link, $feed) * 60);
+ }
+
+ $rss->init();
}
- $rss->init();
+ if ($memcache && $rss) $memcache->add($obj_id, $rss, 0, 300);
}
// print_r($rss);
$rss_1_date = $item['dc']['date'];
$atom_date = $item['issued'];
if (!$atom_date) $atom_date = $item['updated'];
-
+
if ($atom_date != "") $entry_timestamp = parse_w3cdtf($atom_date);
if ($rss_1_date != "") $entry_timestamp = parse_w3cdtf($rss_1_date);
if ($rss_2_date != "") $entry_timestamp = strtotime($rss_2_date);
+
}
if ($entry_timestamp == "" || $entry_timestamp == -1 || !$entry_timestamp) {
// error_reporting(0);
$article_filters = get_article_filters($filters, $entry_title,
- $entry_content, $entry_link, $entry_timestamp);
+ $entry_content, $entry_link, $entry_timestamp, $entry_author);
if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
_debug("update_rss_feed: article filters: ");
# check for manual tags
- $tag_filter = find_article_filter($article_filters, "tag");
+ foreach ($article_filters as $f) {
+ if ($f[0] == "tag") {
- if ($tag_filter) {
+ $manual_tags = trim_array(split(",", $f[1]));
- $manual_tags = trim_array(split(",", $tag_filter[1]));
-
- foreach ($manual_tags as $tag) {
- if (tag_is_valid($tag)) {
- array_push($entry_tags, $tag);
+ foreach ($manual_tags as $tag) {
+ if (tag_is_valid($tag)) {
+ array_push($entry_tags, $tag);
+ }
}
}
}
catchup_feed($link, $feed, false, $owner_uid);
}
- if (!$hidden) {
- if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
- _debug("update_rss_feed: updating counters cache...");
- }
-
- // disabled, purge_feed() does that...
- //ccache_update($link, $feed, $owner_uid);
- }
-
purge_feed($link, $feed, 0);
db_query($link, "UPDATE ttrss_feeds
print "</select>";
}
- function get_article_filters($filters, $title, $content, $link, $timestamp) {
+ function get_article_filters($filters, $title, $content, $link, $timestamp, $author) {
$matches = array();
if ($filters["title"]) {
}
}
+ if ($filters["author"]) {
+ foreach ($filters["author"] as $filter) {
+ $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"]));
+ }
+ }
+ }
+
return $matches;
}
if (!$icon_file) $icon_file = getFeedIcon($feed_id);
+ if (strpos($icon_file, "images") !== false) {
+ $icon_file = theme_image($link, $icon_file);
+ }
+
if (file_exists($icon_file) && filesize($icon_file) > 0) {
$feed_icon = "<img id=\"FIMG-$feed_id\" src=\"$icon_file\">";
} else {
$link_title = "Updated: $last_updated";
}
- $feed = "<a title=\"$link_title\" id=\"FEEDL-$feed_id\"
- href=\"javascript:viewfeed('$feed_id', '', false, '', false, 0);\">$feed_title</a>";
+ $feed = "<span class='feedlink' title=\"$link_title\" id=\"FEEDL-$feed_id\" href=\"#\"
+ onclick=\"viewfeed('$feed_id');\">$feed_title</span>";
/* if ($feed_id < -10) {
$bg_color = "#00ccff";
}
}
- function initialize_user_prefs($link, $uid) {
+ function initialize_user_prefs($link, $uid, $profile = false) {
$uid = db_escape_string($uid);
+ if (!$profile) {
+ $profile = "NULL";
+ $profile_qpart = "AND profile IS NULL";
+ } else {
+ $profile_qpart = "AND profile = '$profile'";
+ }
+
+ if (get_schema_version($link) < 63) $profile_qpart = "";
+
db_query($link, "BEGIN");
$result = db_query($link, "SELECT pref_name,def_value FROM ttrss_prefs");
$u_result = db_query($link, "SELECT pref_name
- FROM ttrss_user_prefs WHERE owner_uid = '$uid'");
+ FROM ttrss_user_prefs WHERE owner_uid = '$uid' $profile_qpart");
$active_prefs = array();
if (array_search($line["pref_name"], $active_prefs) === FALSE) {
// print "adding " . $line["pref_name"] . "<br>";
- db_query($link, "INSERT INTO ttrss_user_prefs
- (owner_uid,pref_name,value) VALUES
- ('$uid', '".$line["pref_name"]."','".$line["def_value"]."')");
+ if (get_schema_version($link) < 63) {
+ db_query($link, "INSERT INTO ttrss_user_prefs
+ (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
+ ('$uid', '".$line["pref_name"]."','".$line["def_value"]."', $profile)");
+ }
}
}
db_query($link, "UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
$_SESSION["uid"]);
- $user_theme = get_user_theme_path($link);
-
- $_SESSION["theme"] = $user_theme;
$_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
$_SESSION["pwd_hash"] = db_fetch_result($result, 0, "pwd_hash");
$_SESSION["uid"] = 1;
$_SESSION["name"] = "admin";
- $user_theme = get_user_theme_path($link);
-
- $_SESSION["theme"] = $user_theme;
$_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
initialize_user_prefs($link, $_SESSION["uid"]);
}
}
+ if ($_SESSION["ref_schema_version"] != get_schema_version($link, true)) {
+ return false;
+ }
+
if ($_SESSION["uid"]) {
$result = db_query($link,
function login_sequence($link, $mobile = false) {
if (!SINGLE_USER_MODE) {
- if (defined('_DEBUG_USER_SWITCH') && $_SESSION["uid"]) {
- $swu = db_escape_string($_REQUEST["swu"]);
- if ($swu) {
- $_SESSION["prefs_cache"] = false;
- return authenticate_user($link, $swu, null, true);
- }
- }
-
$login_action = $_POST["login_action"];
# try to authenticate user if called from login form
$_POST["password"] = "";
$_SESSION["language"] = $_POST["language"];
+ $_SESSION["ref_schema_version"] = get_schema_version($link, true);
$_SESSION["bw_limit"] = !!$_POST["bw_limit"];
+ if ($_POST["profile"]) {
+
+ $profile = db_escape_string($_POST["profile"]);
+
+ $result = db_query($link, "SELECT id FROM ttrss_settings_profiles
+ WHERE id = '$profile' AND owner_uid = " . $_SESSION["uid"]);
+
+ if (db_num_rows($result) != 0) {
+ $_SESSION["profile"] = $profile;
+ $_SESSION["prefs_cache"] = array();
+ }
+ }
+
header("Location: " . $_SERVER["REQUEST_URI"]);
exit;
}
}
+ function theme_image($link, $filename) {
+ if ($link) {
+ $theme_path = get_user_theme_path($link);
+
+ if ($theme_path && is_file($theme_path.$filename)) {
+ return $theme_path.$filename;
+ } else {
+ return $filename;
+ }
+ } else {
+ return $filename;
+ }
+ }
+
+ function get_user_theme($link) {
+
+ if (get_schema_version($link) >= 63 && $_SESSION["uid"]) {
+ $theme_name = get_pref($link, "_THEME_ID");
+ if (is_dir("themes/$theme_name")) {
+ return $theme_name;
+ } else {
+ return '';
+ }
+ } else {
+ return '';
+ }
+
+ }
+
function get_user_theme_path($link) {
- $result = db_query($link, "SELECT theme_path
- FROM
- ttrss_themes,ttrss_users
- WHERE ttrss_themes.id = theme_id AND ttrss_users.id = " . $_SESSION["uid"]);
- if (db_num_rows($result) != 0) {
- return db_fetch_result($result, 0, "theme_path");
+
+ if (get_schema_version($link) >= 63 && $_SESSION["uid"]) {
+ $theme_name = get_pref($link, "_THEME_ID");
+
+ if ($theme_name && is_dir("themes/$theme_name")) {
+ $theme_path = "themes/$theme_name/";
+ } else {
+ $theme_name = '';
+ }
} else {
- return null;
+ $theme_path = '';
}
+
+ return $theme_path;
+ }
+
+ function get_user_theme_options($link) {
+ $t = get_user_theme_path($link);
+
+ if ($t) {
+ if (is_file("$t/theme.ini")) {
+ $ini = parse_ini_file("$t/theme.ini", true);
+ if ($ini['theme']['version']) {
+ return $ini['theme']['options'];
+ }
+ }
+ }
+ return false;
+ }
+
+
+ function get_all_themes() {
+ $themes = glob("themes/*");
+
+ asort($themes);
+
+ $rv = array();
+
+ foreach ($themes as $t) {
+ if (is_file("$t/theme.ini")) {
+ $ini = parse_ini_file("$t/theme.ini", true);
+ if ($ini['theme']['version'] && !$ini['theme']['disabled']) {
+ $entry = array();
+ $entry["path"] = $t;
+ $entry["base"] = basename($t);
+ $entry["name"] = $ini['theme']['name'];
+ $entry["version"] = $ini['theme']['version'];
+ $entry["author"] = $ini['theme']['author'];
+ $entry["options"] = $ini['theme']['options'];
+ array_push($rv, $entry);
+ }
+ }
+ }
+
+ return $rv;
}
function smart_date_time($timestamp) {
return "even";
}
+ function get_schema_version($link, $nocache = false) {
+ if (!$_SESSION["schema_version"] || $nocache) {
+ $result = db_query($link, "SELECT schema_version FROM ttrss_version");
+ $version = db_fetch_result($result, 0, "schema_version");
+ $_SESSION["schema_version"] = $version;
+ return $version;
+ } else {
+ return $_SESSION["schema_version"];
+ }
+ }
+
function sanity_check($link) {
error_reporting(0);
$error_code = 0;
- $result = db_query($link, "SELECT schema_version FROM ttrss_version");
- $schema_version = db_fetch_result($result, 0, "schema_version");
+ $schema_version = get_schema_version($link);
if ($schema_version != SCHEMA_VERSION) {
$error_code = 5;
function make_lockfile($filename) {
$fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
- if (flock($fp, LOCK_EX | LOCK_NB)) {
+ if (flock($fp, LOCK_EX | LOCK_NB)) {
+ if (function_exists('posix_getpid')) {
+ fwrite($fp, posix_getpid() . "\n");
+ }
return $fp;
} else {
return false;
$cat_qpart = "cat_id IS NULL";
}
- $tmp_result = db_query($link, "SELECT id,feed_url FROM ttrss_feeds
+ $tmp_result = db_query($link, "SELECT id FROM ttrss_feeds
WHERE $cat_qpart AND owner_uid = " . $_SESSION["uid"]);
while ($tmp_line = db_fetch_assoc($tmp_result)) {
- $feed_url = $tmp_line["feed_url"];
$feed_id = $tmp_line["id"];
- update_rss_feed($link, $feed_url, $feed_id, $force_update);
+ update_rss_feed($link, $feed_id, $force_update);
}
} else {
- $tmp_result = db_query($link, "SELECT feed_url FROM ttrss_feeds
- WHERE id = '$feed'");
- $feed_url = db_fetch_result($tmp_result, 0, "feed_url");
- update_rss_feed($link, $feed_url, $feed, $force_update);
+ update_rss_feed($link, $feed, $force_update);
}
}
getVirtCounters($link);
if (strchr($omode, "l")) getLabelCounters($link);
- if (strchr($omode, "f")) getFeedCounters($link, SMART_RPC_COUNTERS, $active_feed);
+ if (strchr($omode, "f")) getFeedCounters($link, $active_feed);
if (strchr($omode, "t")) getTagCounters($link);
if (strchr($omode, "c")) {
if (get_pref($link, 'ENABLE_FEED_CATS')) {
$age_qpart = getMaxAgeSubquery();
$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE $cat_query
- AND hidden = false
AND owner_uid = " . $owner_uid);
$cat_feeds = array();
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 hidden = false AND feed_id = ttrss_feeds.id
+ AND unread = true AND feed_id = ttrss_feeds.id
AND ttrss_user_entries.owner_uid = '$owner_uid'");
$unread = db_fetch_result($result, 0, "unread");
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 hidden = false AND feed_id = ttrss_feeds.id
+ AND unread = true AND feed_id = ttrss_feeds.id
AND ttrss_user_entries.owner_uid = '$owner_uid'");
if (db_num_rows($result) != 0) {
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
AND ref_id = id AND $age_qpart
$result = db_query($link, "SELECT id FROM ttrss_feeds
WHERE parent_feed = '$n_feed'
- AND hidden = false
AND owner_uid = " . $owner_uid);
if (db_num_rows($result) > 0) {
if ($n_feed != 0) {
$from_qpart = "ttrss_user_entries,ttrss_feeds,ttrss_entries";
- $feeds_qpart = "ttrss_feeds.hidden = false AND
- ttrss_user_entries.feed_id = ttrss_feeds.id AND";
+ $feeds_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND";
} else {
$from_qpart = "ttrss_user_entries,ttrss_entries";
}
return db_fetch_result($result, 0, "fn");
}
- function getTagCounters($link, $smart_mode = SMART_RPC_COUNTERS) {
-
- if ($smart_mode) {
- if (!$_SESSION["tctr_last_value"]) {
- $_SESSION["tctr_last_value"] = array();
- }
- }
-
- $old_counters = $_SESSION["tctr_last_value"];
-
- $tctrs_modified = false;
+ function getTagCounters($link) {
$age_qpart = getMaxAgeSubquery();
foreach (array_keys($tags) as $tag) {
$unread = $tags[$tag];
-
$tag = htmlspecialchars($tag);
-
- if (!$smart_mode || $old_counters[$tag] != $unread) {
- $old_counters[$tag] = $unread;
- $tctrs_modified = true;
- print "<counter type=\"tag\" id=\"$tag\" counter=\"$unread\"/>";
- }
-
+ print "<counter type=\"tag\" id=\"$tag\" counter=\"$unread\"/>";
}
-
- if ($smart_mode && $tctrs_modified) {
- $_SESSION["tctr_last_value"] = $old_counters;
- }
-
}
- function getVirtCounters($link, $smart_mode = SMART_RPC_COUNTERS, $ret_mode = false) {
+ function getVirtCounters($link, $ret_mode = false) {
$ret_arr = array();
return $ret_arr;
}
- function getLabelCounters($link, $smart_mode = SMART_RPC_COUNTERS, $ret_mode = false) {
+ function getLabelCounters($link, $ret_mode = false) {
$age_qpart = getMaxAgeSubquery();
- if ($smart_mode) {
- if (!$_SESSION["lctr_last_value"]) {
- $_SESSION["lctr_last_value"] = array();
- }
- }
-
- $old_counters = $_SESSION["lctr_last_value"];
- $lctrs_modified = false;
+ $owner_uid = $_SESSION["uid"];
+ $result = db_query($link, "SELECT id, caption FROM ttrss_labels2
+ WHERE owner_uid = '$owner_uid'");
+
+ while ($line = db_fetch_assoc($result)) {
- $owner_uid = $_SESSION["uid"];
+ $id = -$line["id"] - 11;
- $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;
+ $label_name = $line["caption"];
+ $count = getFeedUnread($link, $id);
- $label_name = $line["caption"];
- $count = getFeedUnread($link, $id);
-
- if (!$smart_mode || $old_counters[$id] != $count) {
- $old_counters[$id] = $count;
- $lctrs_modified = true;
- if (!$ret_mode) {
-
- if (get_pref($link, 'EXTENDED_FEEDLIST')) {
- $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
- } else {
- $xmsg_part = "";
- }
-
- print "<counter type=\"label\" id=\"$id\" counter=\"$count\" $xmsg_part/>";
- } else {
- $ret_arr[$id]["counter"] = $count;
- $ret_arr[$id]["description"] = $label_name;
- }
+ if (!$ret_mode) {
+
+ if (get_pref($link, 'EXTENDED_FEEDLIST')) {
+ $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
+ } else {
+ $xmsg_part = "";
}
-
- error_reporting (DEFAULT_ERROR_LEVEL);
- }
- if ($smart_mode && $lctrs_modified) {
- $_SESSION["lctr_last_value"] = $old_counters;
- }
+ print "<counter type=\"label\" id=\"$id\" counter=\"$count\" $xmsg_part/>";
+ } else {
+ $ret_arr[$id]["counter"] = $count;
+ $ret_arr[$id]["description"] = $label_name;
+ }
+ }
+
return $ret_arr;
}
- function getFeedCounters($link, $smart_mode = SMART_RPC_COUNTERS, $active_feed = false) {
+ function getFeedCounters($link, $active_feed = false) {
$age_qpart = getMaxAgeSubquery();
- if ($smart_mode) {
- if (!$_SESSION["fctr_last_value"]) {
- $_SESSION["fctr_last_value"] = array();
- }
- }
-
- $old_counters = $_SESSION["fctr_last_value"];
-
$query = "SELECT ttrss_feeds.id,
ttrss_feeds.title,
".SUBSTRING_FOR_DATE."(ttrss_feeds.last_updated,1,19) AS last_updated,
$count += db_fetch_result($tmp_result, 0, "unread");
- if (!$smart_mode || $old_counters[$id] != $count) {
- $old_counters[$id] = $count;
- $fctrs_modified = true;
-
- if ($last_error) {
- $error_part = "error=\"$last_error\"";
- } else {
- $error_part = "";
- }
-
- if ($has_img) {
- $has_img_part = "hi=\"$has_img\"";
- } else {
- $has_img_part = "";
- }
+ if ($last_error) {
+ $error_part = "error=\"$last_error\"";
+ } else {
+ $error_part = "";
+ }
- if ($active_feed && $id == $active_feed) {
- $has_title_part = "title=\"" . htmlspecialchars($line["title"]) . "\"";
- } else {
- $has_title_part = "";
- }
+ if ($has_img) {
+ $has_img_part = "hi=\"$has_img\"";
+ } else {
+ $has_img_part = "";
+ }
- if (get_pref($link, 'EXTENDED_FEEDLIST')) {
- $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
- }
+ if ($active_feed && $id == $active_feed) {
+ $has_title_part = "title=\"" . htmlspecialchars($line["title"]) . "\"";
+ } else {
+ $has_title_part = "";
+ }
- print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" $has_img_part $error_part updated=\"$last_updated\" $xmsg_part $has_title_part/>";
+ if (get_pref($link, 'EXTENDED_FEEDLIST')) {
+ $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
}
- }
- if ($smart_mode && $fctrs_modified) {
- $_SESSION["fctr_last_value"] = $old_counters;
+ print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" $has_img_part $error_part updated=\"$last_updated\" $xmsg_part $has_title_part/>";
}
}
print "</rpc-reply>";
}
- function subscribe_to_feed($link, $feed_link, $cat_id = 0,
+ function subscribe_to_feed($link, $url, $cat_id = 0,
$auth_login = '', $auth_pass = '') {
- # check for feed:http://url
- $feed_link = trim(preg_replace("/^feed:/", "", $feed_link));
+ $parts = parse_url($url);
- # check for feed://URL
- if (strpos($feed_link, "//") === 0) {
- $feed_link = "http:$feed_link";
- }
+ if (!validate_feed_url($url)) return 2;
- if ($feed_link == "") return;
+ if ($parts['scheme'] == 'feed') $parts['scheme'] = 'http';
+
+ $url = make_url_from_parts($parts);
if ($cat_id == "0" || !$cat_id) {
$cat_qpart = "NULL";
$result = db_query($link,
"SELECT id FROM ttrss_feeds
- WHERE feed_url = '$feed_link' AND owner_uid = ".$_SESSION["uid"]);
+ 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"]."', '$feed_link',
+ VALUES ('".$_SESSION["uid"]."', '$url',
'[Unknown]', $cat_qpart, '$auth_login', '$auth_pass')");
$result = db_query($link,
- "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_link'
+ "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_link, $feed_id, true);
+ update_rss_feed($link, $feed_id, true);
}
- return true;
+ return 1;
} else {
- return false;
+ return 0;
}
}
return "images/mark_set.png";
break;
case -2:
- return "images/pub_set.gif";
+ return "images/pub_set.png";
break;
case -3:
return "images/fresh.png";
return __("Fresh articles");
} else if ($id == -4) {
return __("All articles");
- } else if ($id == 0) {
+ } else if ($id === 0 || $id === "0") {
return __("Archived articles");
} else if ($id < -10) {
$label_id = -$id - 11;
}
}
- print "<param key=\"theme\" value=\"".$_SESSION["theme"]."\"/>";
+ print "<param key=\"theme\" value=\"".get_user_theme($link)."\"/>";
+ print "<param key=\"theme_options\" value=\"".get_user_theme_options($link)."\"/>";
print "<param key=\"daemon_enabled\" value=\"" . ENABLE_UPDATE_DAEMON . "\"/>";
print "<param key=\"feeds_frame_refresh\" value=\"" . FEEDS_FRAME_REFRESH . "\"/>";
print "<param key=\"daemon_refresh_only\" value=\"true\"/>";
+ print "<param key=\"sign_progress\" value=\"".
+ theme_image($link, "images/indicator_white.gif")."\"/>";
+
+ print "<param key=\"sign_progress_tiny\" value=\"".
+ theme_image($link, "images/indicator_tiny.gif")."\"/>";
+
+ print "<param key=\"sign_excl\" value=\"".
+ theme_image($link, "images/sign_excl.png")."\"/>";
+
+ print "<param key=\"sign_info\" value=\"".
+ theme_image($link, "images/sign_info.png")."\"/>";
+
print "<param key=\"on_catchup_show_next_feed\" value=\"" .
get_pref($link, "ON_CATCHUP_SHOW_NEXT_FEED") . "\"/>";
if ($match_on == "both") {
foreach ($keywords as $k) {
- array_push($query_keywords, "(UPPER(ttrss_entries.title) LIKE UPPER('%$k%')
- OR UPPER(ttrss_entries.content) LIKE UPPER('%$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%'))");
}
$search_query_part = implode("AND", $query_keywords) . " AND ";
} else if ($match_on == "title") {
foreach ($keywords as $k) {
- array_push($query_keywords, "(UPPER(ttrss_entries.title) LIKE UPPER('%$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%'))");
}
$search_query_part = implode("AND", $query_keywords) . " AND ";
} else if ($match_on == "content") {
foreach ($keywords as $k) {
- array_push($query_keywords, "(UPPER(ttrss_entries.content) LIKE UPPER('%$k%'))");
+ if (strpos($k, "-") === 0) {
+ $k = substr($k, 1);
+ $not = "NOT";
+ } else {
+ $not = "";
+ }
+
+ array_push($query_keywords, "(UPPER(ttrss_entries.content) $not LIKE UPPER('%$k%'))");
}
}
if ($feed != "0") {
$from_qpart = "ttrss_entries,ttrss_user_entries,ttrss_feeds$ext_tables_part";
- $feed_check_qpart = "ttrss_feeds.hidden = false AND
- ttrss_user_entries.feed_id = ttrss_feeds.id AND";
+ $feed_check_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND";
} else {
$from_qpart = "ttrss_entries,ttrss_user_entries$ext_tables_part
$rfc822_date = date('r', strtotime($line["updated"]));
- print "<pubDate>$rfc822_date</pubDate>";
+ print "<pubDate>$rfc822_date</pubDate>";
+
+ if ($line["author"]) {
+ print "<author>" . htmlspecialchars($line["author"]) . "</author>";
+ }
print "<title>" .
htmlspecialchars($line["title"]) . "</title>";
}
if (get_pref($link, "STRIP_IMAGES", $owner)) {
-
$res = preg_replace('/<img[^>]+>/is', '', $res);
+ }
+ if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW', $owner)) {
+ $res = preg_replace("/href=/i", "target=\"_blank\" href=", $res);
}
return $res;
ref_id = ttrss_entries.id AND feed_id = ttrss_feeds.id
AND include_in_digest = true
AND $interval_query
- AND hidden = false
AND ttrss_user_entries.owner_uid = $user_id
AND unread = true
ORDER BY ttrss_feeds.title, date_entered DESC
}
error_reporting(0);
- if (ENABLE_SIMPLEPIE) {
+ if (DEFAULT_UPDATE_INTERVAL == "1") {
$rss = new SimplePie();
$rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT);
// $rss->set_timeout(MAGPIE_FETCH_TIME_OUT);
if ($rss) {
- if (ENABLE_SIMPLEPIE) {
+ if (DEFAULT_UPDATE_METHOD == "1") {
$items = $rss->get_items();
} else {
$items = $rss->items;
$latest_item = $items[0];
- if (ENABLE_SIMPLEPIE) {
+ if (DEFAULT_UPDATE_METHOD == "1") {
$last_title = $latest_item->get_title();
} else {
$last_title = $latest_item["title"];
$latest_version = trim(preg_replace("/(Milestone)|(completed)/", "", $last_title));
- if (ENABLE_SIMPLEPIE) {
+ if (DEFAULT_UPDATE_METHOD == "1") {
$release_url = sanitize_rss($link, $latest_item->get_link());
$content = sanitize_rss($link, $latest_item->get_description());
} else {
function catchupArticlesById($link, $ids, $cmode, $owner_uid = false) {
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+ if (count($ids) == 0) return;
$tmp_ids = array();
print "<li onclick=\"$archive_sel_link\"> ".__('Archive')."</li>";
} else {
print "<li onclick=\"$archive_sel_link\"> ".__('Move back')."</li>";
- }
+ print "<li onclick=\"$delete_sel_link\"> ".__('Delete')."</li>";
- print "<li onclick=\"$delete_sel_link\"> ".__('Delete')."</li>";
+ }
//print "<li><span class=\"insensitive\">--------</span></li>";
print "<li class=\"insensitive\">".__('Assign label:')."</li>";
ON
(ttrss_feeds.id = feed_id)
WHERE
- ttrss_feeds.hidden = false AND
ttrss_feeds.owner_uid = '$owner_uid' AND parent_feed IS NULL
ORDER BY $order_by_qpart";
function get_article_tags($link, $id, $owner_uid = 0) {
+ global $memcache;
+
$a_id = db_escape_string($id);
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
- $tmp_result = db_query($link, "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");
+ ref_id = '$a_id' AND owner_uid = '$owner_uid' LIMIT 1) ORDER BY tag_name";
+ $obj_id = md5("TAGS:$owner_uid:$id");
$tags = array();
-
- while ($tmp_line = db_fetch_assoc($tmp_result)) {
- array_push($tags, $tmp_line["tag_name"]);
+
+ if ($memcache && $obj = $memcache->get($obj_id)) {
+ $tags = $obj;
+ } else {
+ $tmp_result = db_query($link, $query);
+
+ while ($tmp_line = db_fetch_assoc($tmp_result)) {
+ array_push($tags, $tmp_line["tag_name"]);
+ }
+
+ if ($memcache) $memcache->add($obj_id, $tags, 0, 3600);
}
return $tags;
}
function format_warning($msg, $id = "") {
+ global $link;
return "<div class=\"warning\" id=\"$id\">
- <img src=\"images/sign_excl.gif\">$msg</div>";
+ <img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";
}
function format_notice($msg) {
- return "<div class=\"notice\">
- <img src=\"images/sign_info.gif\">$msg</div>";
+ global $link;
+ return "<div class=\"notice\" id=\"$id\">
+ <img src=\"".theme_image($link, "images/sign_info.png")."\">$msg</div>";
}
function format_error($msg) {
- return "<div class=\"error\">
- <img src=\"images/sign_excl.gif\">$msg</div>";
+ global $link;
+ return "<div class=\"error\" id=\"$id\">
+ <img src=\"".theme_image($link, "images/sign_excl.png")."\">$msg</div>";
}
function print_notice($msg) {
if ($result) {
- $link_target = "";
-
- if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
- $link_target = "target=\"_blank\"";
- }
-
$line = db_fetch_assoc($result);
if ($line["icon_url"]) {
} else {
$comments_url = $line["link"];
}
- $entry_comments = "<a $link_target href=\"$comments_url\">$num_comments comments</a>";
+ $entry_comments = "<a target='_blank' href=\"$comments_url\">$num_comments comments</a>";
} else {
if ($line["comments"] && $line["link"] != $line["comments"]) {
- $entry_comments = "<a $link_target href=\"".$line["comments"]."\">comments</a>";
+ $entry_comments = "<a target='_blank' href=\"".$line["comments"]."\">comments</a>";
}
}
print "<div class=\"postDate$rtl_class\">$parsed_updated</div>";
if ($line["link"]) {
- print "<div clear='both'><a $link_target href=\"" . $line["link"] . "\">" .
+ print "<div clear='both'><a target='_blank' href=\"" . $line["link"] . "\">" .
$line["title"] . "</a><span class='author'>$entry_author</span></div>";
} else {
print "<div clear='both'>" . $line["title"] . "$entry_author</div>";
if (!$entry_comments) $entry_comments = " "; # placeholder
print "<div style='float : right'>
- <img src='images/tag.png' class='tagsPic' alt='Tags' title='Tags'> ";
+ <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')."\"
href=\"javascript:editArticleTags($id, $feed_id)\">(+)</a>";
- if (defined('_ENABLE_INLINE_VIEW')) {
-
- print "<img src=\"images/art-inline.png\" class='tagsPic'
- style=\"cursor : pointer\" style=\"cursor : pointer\"
- onclick=\"showOriginalArticleInline($id)\"
- alt='Inline' title='".__('Display original article content')."'>";
-
- }
-
- print "<img src=\"images/art-zoom.png\" class='tagsPic'
- style=\"cursor : pointer\" style=\"cursor : pointer\"
+ print "<img src=\"".theme_image($link, 'images/art-zoom.png')."\"
+ class='tagsPic' style=\"cursor : pointer\" style=\"cursor : pointer\"
onclick=\"zoomToArticle($id)\"
alt='Zoom' title='".__('Show article summary in new window')."'>";
$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
- print "<img src=\"images/art-pub-note.png\" class='tagsPic'
- style=\"cursor : pointer\" style=\"cursor : pointer\"
+ print "<img src=\"".theme_image($link, 'images/art-pub-note.png')."\"
+ class='tagsPic' style=\"cursor : pointer\" style=\"cursor : pointer\"
onclick=\"publishWithNote($id, '$note_escaped')\"
alt='PubNote' title='".__('Publish article with a note')."'>";
$article_content = sanitize_rss($link, $line["content"]);
- if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
- $article_content = preg_replace("/href=/i", "target=\"_blank\" href=",
- $article_content);
- }
-
print "<div id=\"POSTNOTE-$id\">";
if ($line['note']) {
print format_article_note($id, $line['note']);
print $article_content;
- $result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
- post_id = '$id' AND content_url != ''");
+// $result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
+// post_id = '$id' AND content_url != ''");
- if (db_num_rows($result) > 0) {
+ $result = get_article_enclosures($link, $id);
+
+// if (db_num_rows($result) > 0) {
+
+ if (count($result) > 0) {
$entries_html = array();
$entries = array();
- while ($line = db_fetch_assoc($result)) {
+ //while ($line = db_fetch_assoc($result)) {
+ foreach ($result as $line) {
$url = $line["content_url"];
$ctype = $line["content_type"];
print "<div class=\"postEnclosures\">";
if (!get_pref($link, "STRIP_IMAGES")) {
- if ($always_display_enclosures || !preg_match("/<img/i", $article_content)) {
+ if ($always_display_enclosures ||
+ !preg_match("/<img/i", $article_content)) {
+
foreach ($entries as $entry) {
- if (preg_match("/image/", $entry["type"])) {
- print "<p><img
+
+ if (preg_match("/image/", $entry["type"]) ||
+ preg_match("/\.(jpg|png|gif|bmp)/i", $entry["filename"])) {
+
+ print "<p><img
alt=\"".htmlspecialchars($entry["filename"])."\"
- src=\"" .htmlspecialchars($entry["url"]) . "\"></p>";
+ src=\"" .htmlspecialchars($entry["url"]) . "\"/></p>";
}
}
}
}
- print "<div class=\"postEnclosures\">";
-
if (db_num_rows($result) == 1) {
print __("Attachment:") . " ";
} else {
} else {
print "
<div style=\"text-align : center\">
- <input type=\"submit\" onclick=\"return window.close()\"
- value=\"".__("Close this window")."\"></div>";
+ <button onclick=\"return window.close()\">".
+ __("Close this window")."</button></div>";
print "</body></html>";
}
if ($line["last_read"] == "" && !sql_bool_to_bool($line["unread"])) {
- $update_pic = "<img id='FUPDPIC-$id' src=\"images/updated.png\"
+ $update_pic = "<img id='FUPDPIC-$id' src=\"".
+ theme_image($link, 'images/updated.png')."\"
alt=\"Updated\">";
} else {
$update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\"
if (sql_bool_to_bool($line["unread"]) &&
time() - strtotime($line["updated_noms"]) < $fresh_intl) {
- $update_pic = "<img id='FUPDPIC-$id' src=\"images/fresh_sign.png\"
- alt=\"Fresh\">";
+ $update_pic = "<img id='FUPDPIC-$id' src=\"".
+ theme_image($link, 'images/fresh_sign.png')."\" alt=\"Fresh\">";
}
if ($line["unread"] == "t" || $line["unread"] == "1") {
}
if ($line["marked"] == "t" || $line["marked"] == "1") {
- $marked_pic = "<img id=\"FMPIC-$id\" src=\"images/mark_set.png\"
- class=\"markedPic\"
- alt=\"Unstar article\" onclick='javascript:tMark($id)'>";
+ $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=\"images/mark_unset.png\"
- class=\"markedPic\"
- alt=\"Star article\" onclick='javascript:tMark($id)'>";
+ $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=\"images/pub_set.gif\"
+ $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=\"images/pub_unset.gif\"
+ $published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($link,
+ 'images/pub_unset.png')."\"
class=\"markedPic\"
alt=\"Publish article\" onclick='javascript:tPub($id)'>";
}
$score = $line["score"];
- $score_pic = get_score_pic($score);
+ $score_pic = theme_image($link,
+ "images/" . get_score_pic($score));
/* $score_title = __("(Click to change)");
$score_pic = "<img class='hlScorePic' src=\"images/$score_pic\"
onclick=\"adjustArticleScore($id, $score)\" title=\"$score $score_title\">"; */
- $score_pic = "<img class='hlScorePic' src=\"images/$score_pic\"
+ $score_pic = "<img class='hlScorePic' src=\"$score_pic\"
title=\"$score\">";
if ($score > 500) {
print "</span></div>";
- if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
- $line["content_preview"] = preg_replace("/href=/i",
- "target=\"_blank\" href=", $line["content_preview"]);
- }
-
if ($show_excerpt) {
print "<div class=\"cdmExcerpt\" id=\"CEXC-$id\"
onclick=\"cdmExpandArticle($id)\"
$always_display_enclosures = db_fetch_result($tmp_result, 0, "always_display_enclosures");
if (!get_pref($link, "STRIP_IMAGES")) {
- if ($always_display_enclosures || !preg_match("/img/i", $article_content)) {
+ if ($always_display_enclosures ||
+ !preg_match("/img/i", $article_content)) {
+
foreach ($entries as $entry) {
- if (preg_match("/image/", $entry["type"])) {
+ if (preg_match("/image/", $entry["type"]) ||
+ preg_match("/\.(jpg|png|gif|bmp)/i", $entry["filename"])) {
print "<p><img
alt=\"".htmlspecialchars($entry["filename"])."\"
src=\"" .htmlspecialchars($entry["url"]) . "\"></p>";
$tags_str = format_tags_string(get_article_tags($link, $id), $id);
-// print "<img src='images/tag.png' class='markedPic'>";
-
print "<span class='s1'>
- <img class='tagsPic' src='images/tag.png' alt='Tags' title='Tags'>
+ <img class='tagsPic' src='".theme_image($link,
+ 'images/tag.png')."' alt='Tags' title='Tags'>
<span id=\"ATSTR-$id\">$tags_str</span>
<a title=\"".__('Edit tags for this article')."\"
href=\"javascript:editArticleTags($id, $feed_id, true)\">(+)</a>";
}
$url_path .= $_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']);
- $url_path .= "/backend.php?op=publish&key=" . get_pref($link, "_PREFS_PUBLISH_KEY");
+ $url_path .= "/backend.php?op=publish&key=" .
+ get_pref($link, "_PREFS_PUBLISH_KEY", $_SESSION["uid"]);
+
+ return $url_path;
+ }
+ function opml_publish_url($link){
+ $url_path = "";
+
+
+ if ($_SERVER['HTTPS'] != "on") {
+ $url_path = "http://";
+ } else {
+ $url_path = "https://";
+ }
+
+ $url_path .= $_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']);
+ $url_path .= "/opml.php?op=publish&key=" .
+ get_pref($link, "_PREFS_PUBLISH_KEY", $_SESSION["uid"]);
return $url_path;
}
if($debug) _debug("Feed: " . $line["feed_url"] . ", " . $line["last_updated"]);
- // We setup a alarm to alert if the feed take more than 300s to update.
- // => HANG alarm.
- if(!$from_http && function_exists('pcntl_alarm')) pcntl_alarm(300);
- update_rss_feed($link, $line["feed_url"], $line["id"], true);
- // Cancel the alarm (the update went well)
- if(!$from_http && function_exists('pcntl_alarm')) pcntl_alarm(0);
+ update_rss_feed($link, $line["id"], true);
sleep(1); // prevent flood (FIXME make this an option?)
}
function load_filters($link, $feed, $owner_uid, $action_id = false) {
$filters = array();
- if ($action_id) $ftype_query_part = "action_id = '$action_id' AND";
-
- $result = db_query($link, "SELECT reg_exp,
- ttrss_filter_types.name AS name,
- ttrss_filter_actions.name AS action,
- inverse,
- action_param,
- filter_param
- FROM ttrss_filters,ttrss_filter_types,ttrss_filter_actions WHERE
- enabled = true AND
- $ftype_query_part
- owner_uid = $owner_uid AND
- ttrss_filter_types.id = filter_type AND
- ttrss_filter_actions.id = action_id AND
- (feed_id IS NULL OR feed_id = '$feed') ORDER BY reg_exp");
+ global $memcache;
- while ($line = db_fetch_assoc($result)) {
- if (!$filters[$line["name"]]) $filters[$line["name"]] = array();
- $filter["reg_exp"] = $line["reg_exp"];
- $filter["action"] = $line["action"];
- $filter["action_param"] = $line["action_param"];
- $filter["filter_param"] = $line["filter_param"];
- $filter["inverse"] = sql_bool_to_bool($line["inverse"]);
-
- array_push($filters[$line["name"]], $filter);
- }
+ $obj_id = md5("FILTER:$feed:$owner_uid:$action_id");
+
+ if ($memcache && $obj = $memcache->get($obj_id)) {
- return $filters;
+ return $obj;
+
+ } else {
+
+ if ($action_id) $ftype_query_part = "action_id = '$action_id' AND";
+
+ $result = db_query($link, "SELECT reg_exp,
+ ttrss_filter_types.name AS name,
+ ttrss_filter_actions.name AS action,
+ inverse,
+ action_param,
+ filter_param
+ FROM ttrss_filters,ttrss_filter_types,ttrss_filter_actions WHERE
+ enabled = true AND
+ $ftype_query_part
+ owner_uid = $owner_uid AND
+ ttrss_filter_types.id = filter_type AND
+ ttrss_filter_actions.id = action_id AND
+ (feed_id IS NULL OR feed_id = '$feed') ORDER BY reg_exp");
+
+ while ($line = db_fetch_assoc($result)) {
+ if (!$filters[$line["name"]]) $filters[$line["name"]] = array();
+ $filter["reg_exp"] = $line["reg_exp"];
+ $filter["action"] = $line["action"];
+ $filter["action_param"] = $line["action_param"];
+ $filter["filter_param"] = $line["filter_param"];
+ $filter["inverse"] = sql_bool_to_bool($line["inverse"]);
+
+ array_push($filters[$line["name"]], $filter);
+ }
+
+ if ($memcache) $memcache->add($obj_id, $filters, 0, 3600*8);
+
+ return $filters;
+ }
}
function get_score_pic($score) {
if ($score > 100) {
return "score_high.png";
} else if ($score > 0) {
- return "score_half_high.png";
+ return "score_half_high.png";
} else if ($score < -100) {
- return "score_low.png";
+ return "score_low.png";
} else if ($score < 0) {
- return "score_half_low.png";
+ return "score_half_low.png";
} else {
- return "score_neutral.png";
+ return "score_neutral.png";
}
}
}
function get_article_labels($link, $id) {
+ global $memcache;
+
$result = db_query($link,
"SELECT DISTINCT label_id,caption,fg_color,bg_color
FROM ttrss_labels2, ttrss_user_labels2
AND owner_uid = ".$_SESSION["uid"] . "
ORDER BY caption");
+ $obj_id = md5("LABELS:$id:" . $_SESSION["uid"]);
+
$rv = array();
- while ($line = db_fetch_assoc($result)) {
- $rk = array($line["label_id"], $line["caption"], $line["fg_color"],
- $line["bg_color"]);
- array_push($rv, $rk);
+ if ($memcache && $obj = $memcache->get($obj_id)) {
+ return $obj;
+ } else {
+ while ($line = db_fetch_assoc($result)) {
+ $rk = array($line["label_id"], $line["caption"], $line["fg_color"],
+ $line["bg_color"]);
+ array_push($rv, $rk);
+ }
+ if ($memcache) $memcache->add($obj_id, $rv, 0, 3600);
}
return $rv;
function label_add_article($link, $id, $label, $owner_uid) {
+ global $memcache;
+
+ if ($memcache) {
+ $obj_id = md5("LABELS:$id:$owner_uid");
+ $memcache->delete($obj_id);
+ }
+
$label_id = label_find_id($link, $label, $owner_uid);
if (!$label_id) return;
}
function label_remove($link, $id, $owner_uid) {
+ global $memcache;
+
+ if ($memcache) {
+ $obj_id = md5("LABELS:$id:$owner_uid");
+ $memcache->delete($obj_id);
+ }
db_query($link, "BEGIN");
$num_tags = 0;
- if ($_SESSION["theme"] == "3pane") {
+/* if (get_user_theme($link) == "3pane") {
$tag_limit = 3;
} else {
$tag_limit = 6;
- }
+ } */
+
+ $tag_limit = 6;
$formatted_tags = array();
WHERE id = '$id'");
}
- db_query($link, "UPDATE ttrss_user_entries SET feed_id = NULL
- WHERE feed_id = '$id' AND
+ db_query($link, "UPDATE ttrss_user_entries SET feed_id = NULL,
+ orig_feed_id = '$id' WHERE feed_id = '$id' AND
marked = true AND owner_uid = $owner_uid");
/* remove the feed */
db_query($link, "COMMIT");
- if (file_exists(ICONS_DIR . "/$id.ico")) {
+/* if (file_exists(ICONS_DIR . "/$id.ico")) {
unlink(ICONS_DIR . "/$id.ico");
- }
+ } */
ccache_remove($link, $id, $owner_uid);
return 0;
}
}
+
+ function make_url_from_parts($parts) {
+ $url = $parts['scheme'] . '://' . $parts['host'];
+
+ if ($parts['path']) $url .= $parts['path'];
+ if ($parts['query']) $url .= '?' . $parts['query'];
+
+ return $url;
+ }
+
+ function validate_feed_url($url) {
+ $parts = parse_url($url);
+
+ return ($parts['scheme'] == 'http' || $parts['scheme'] == 'feed' || $parts['scheme'] == 'https');
+
+ }
+
+ function get_article_enclosures($link, $id) {
+
+ global $memcache;
+
+ $query = "SELECT * FROM ttrss_enclosures
+ WHERE post_id = '$id' AND content_url != ''";
+
+ $obj_id = md5("ENCLOSURES:$id");
+
+ $rv = array();
+
+ if ($memcache && $obj = $memcache->get($obj_id)) {
+ $rv = $obj;
+ } else {
+ $result = db_query($link, $query);
+
+ if (db_num_rows($result) > 0) {
+ while ($line = db_fetch_assoc($result)) {
+ array_push($rv, $line);
+ }
+ if ($memcache) $memcache->add($obj_id, $rv, 0, 3600);
+ }
+ }
+
+ return $rv;
+ }
+
+ function api_get_feeds($link, $cat_id, $unread_only, $limit, $offset) {
+ if ($limit) {
+ $limit_qpart = "LIMIT $limit OFFSET $offset";
+ } else {
+ $limit_qpart = "";
+ }
+
+ if (!$cat_id) {
+ $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"] .
+ " ORDER BY cat_id, title " . $limit_qpart);
+ } else {
+ $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_id = '$cat_id' AND owner_uid = " . $_SESSION["uid"] .
+ " ORDER BY cat_id, title " . $limit_qpart);
+ }
+
+ $feeds = array();
+
+ while ($line = db_fetch_assoc($result)) {
+
+ $unread = getFeedUnread($link, $line["id"]);
+
+ $has_icon = feed_has_icon($line['id']);
+
+ if ($unread || !$unread_only) {
+
+ $row = array(
+ "feed_url" => $line["feed_url"],
+ "title" => $line["title"],
+ "id" => (int)$line["id"],
+ "unread" => (int)$unread,
+ "has_icon" => $has_icon,
+ "cat_id" => (int)$line["cat_id"],
+ "last_updated" => strtotime($line["last_updated"])
+ );
+
+ array_push($feeds, $row);
+ }
+ }
+
+ /* Labels */
+
+ if (!$cat_id || $cat_id == -2) {
+ $counters = getLabelCounters($link, true);
+
+ foreach (array_keys($counters) as $id) {
+
+ $unread = $counters[$id]["counter"];
+
+ if ($unread || !$unread_only) {
+
+ $row = array(
+ "id" => $id,
+ "title" => $counters[$id]["description"],
+ "unread" => $counters[$id]["counter"],
+ "cat_id" => -2,
+ );
+
+ array_push($feeds, $row);
+ }
+ }
+ }
+
+ /* Virtual feeds */
+
+ if (!$cat_id || $cat_id == -1) {
+ foreach (array(-1, -2, -3, -4, 0) as $i) {
+ $unread = getFeedUnread($link, $i);
+
+ if ($unread || !$unread_only) {
+ $title = getFeedTitle($link, $i);
+
+ $row = array(
+ "id" => $i,
+ "title" => $title,
+ "unread" => $unread,
+ "cat_id" => -1,
+ );
+ array_push($feeds, $row);
+ }
+
+ }
+ }
+ return $feeds;
+ }
+
+ function api_get_headlines($link, $feed_id, $limit, $offset,
+ $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order) {
+
+ /* do not rely on params below */
+
+ $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,
+ $view_mode, $is_cat, $search, $search_mode, $match_on,
+ $order, $offset);
+
+ $result = $qfh_ret[0];
+ $feed_title = $qfh_ret[1];
+
+ $headlines = array();
+
+ while ($line = db_fetch_assoc($result)) {
+ $is_updated = ($line["last_read"] == "" &&
+ ($line["unread"] != "t" && $line["unread"] != "1"));
+
+ $headline_row = array(
+ "id" => (int)$line["id"],
+ "unread" => sql_bool_to_bool($line["unread"]),
+ "marked" => sql_bool_to_bool($line["marked"]),
+ "updated" => strtotime($line["updated"]),
+ "is_updated" => $is_updated,
+ "title" => $line["title"],
+ "link" => $line["link"],
+ "feed_id" => $line["feed_id"],
+ "has_icon" => feed_has_icon($line["feed_id"])
+ );
+
+ if ($show_excerpt) {
+ $excerpt = truncate_string(strip_tags($line["content_preview"]), 100);
+ $headline_row["excerpt"] = $excerpt;
+ }
+
+ if ($show_content) {
+ $headline_row["content"] = $line["content_preview"];
+ }
+
+ array_push($headlines, $headline_row);
+ }
+
+ return $headlines;
+ }
+
?>
git.wh0rd.org / tt-rss.git / blobdiff