"auto" => "Detect automatically",
"en_US" => "English",
"fr_FR" => "Français",
+ "nb_NO" => "Norsk Bokmål",
"ru_RU" => "Русский",
"pt_BR" => "Portuguese/Brazil",
"zh_CN" => "Simplified Chinese");
function _debug($msg) {
$ts = strftime("%H:%M:%S", time());
+ $ts = "$ts/" . posix_getpid();
print "[$ts] $msg\n";
}
_debug("update_rss_feed: start");
}
- $result = db_query($link, "SELECT id,update_interval,auth_login,auth_pass,cache_images
- FROM ttrss_feeds WHERE id = '$feed'");
+ if (!$ignore_daemon) {
+
+ if (DB_TYPE == "pgsql") {
+ $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
+ FROM ttrss_feeds WHERE id = '$feed' AND $updstart_thresh_qpart");
+
+ } else {
+
+ $result = db_query($link, "SELECT id,update_interval,auth_login,
+ auth_pass,cache_images
+ FROM ttrss_feeds WHERE id = '$feed'");
+
+ }
if (db_num_rows($result) == 0) {
if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
- _debug("update_rss_feed: feed $feed [$feed_url] NOT FOUND");
+ _debug("update_rss_feed: feed $feed [$feed_url] NOT FOUND/SKIPPED");
}
return;
}
+ 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");
foreach ($iterator as $item) {
+ if ($_GET['xdebug']) {
+ print_r($item);
+
+ }
+
if (ENABLE_SIMPLEPIE) {
$entry_guid = $item->get_id();
if (!$entry_guid) $entry_guid = $item->get_link();
if (!$entry_content) $entry_content = $item["content:encoded"];
if (!$entry_content) $entry_content = $item["content"];
+
+ // Magpie bugs are getting ridiculous
+ if (trim($entry_content) == "Array") $entry_content = false;
+
if (!$entry_content) $entry_content = $item["atom_content"];
if (!$entry_content) $entry_content = $item["summary"];
if (!$entry_content) $entry_content = $item["description"];
if (is_array($entry_content)) {
$entry_content = $entry_content["encoded"];
if (!$entry_content) $entry_content = $entry_content["escaped"];
- }
+ }
}
-// print_r($item);
-// print_r(htmlspecialchars($entry_content));
-// print "<br>";
+ if ($_GET["xdebug"]) {
+ print "update_rss_feed: content: ";
+ print_r(htmlspecialchars($entry_content));
+ }
$entry_content_unescaped = $entry_content;
if (preg_match('/^[\t\n\r ]*$/', $entry_author)) $entry_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
WHERE guid = '$entry_guid'");
$additional_tags = array();
$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());
if ($t_ctr == 0) {
$additional_tags = false;
- } else if ($t_ctr == 1) {
+ } else if ($t_ctr > 0) {
$additional_tags = array($item['category']);
- } else {
- $additional_tags = array();
+
+ if ($item['category@term']) {
+ array_push($additional_tags, $item['category@term']);
+ }
+
for ($i = 0; $i <= $t_ctr; $i++ ) {
if ($item["category#$i"]) {
array_push($additional_tags, $item["category#$i"]);
}
+
+ if ($item["category#$i@term"]) {
+ array_push($additional_tags, $item["category#$i@term"]);
+ }
}
}
$t_ctr = $item['dc']['subject#'];
- if ($t_ctr == 1) {
+ if ($t_ctr > 0) {
$additional_tags = array($item['dc']['subject']);
- } else if ($t_ctr > 1) {
- $additional_tags = array();
+
for ($i = 0; $i <= $t_ctr; $i++ ) {
if ($item['dc']["subject#$i"]) {
array_push($additional_tags, $item['dc']["subject#$i"]);
if (ENABLE_SIMPLEPIE) {
$encs = $item->get_enclosures();
- foreach ($encs as $e) {
- $e_item = array(
- $e->link, $e->type, $e->length);
-
- array_push($enclosures, $e_item);
+ if (is_array($encs)) {
+ foreach ($encs as $e) {
+ $e_item = array(
+ $e->link, $e->type, $e->length);
+
+ array_push($enclosures, $e_item);
+ }
}
} else {
array_push($enclosures, $e_item);
- for ($i = 2; $i <= $e_ctr; $i++ ) {
- $e_item = array($item["enclosure#$i@url"],
- $item["enclosure#$i@type"],
- $item["enclosure#$i@length"]);
- array_push($enclosures, $e_item);
+ for ($i = 0; $i <= $e_ctr; $i++ ) {
+
+ if ($item["enclosure#$i@url"]) {
+ $e_item = array($item["enclosure#$i@url"],
+ $item["enclosure#$i@type"],
+ $item["enclosure#$i@length"]);
+ array_push($enclosures, $e_item);
+ }
}
}
$pwd_hash1 = encrypt_password($password);
$pwd_hash2 = encrypt_password($password, $login);
- if ($force_auth && defined('_DEBUG_USER_SWITCH')) {
+ if (defined('ALLOW_REMOTE_USER_AUTH') && ALLOW_REMOTE_USER_AUTH
+ && $_SERVER["REMOTE_USER"]) {
+
+ $login = db_escape_string($_SERVER["REMOTE_USER"]);
+
$query = "SELECT id,login,access_level
FROM ttrss_users WHERE
- login = '$login'";
+ login = '$login'";
+
} else {
$query = "SELECT id,login,access_level,pwd_hash
FROM ttrss_users WHERE
function file_is_locked($filename) {
if (function_exists('flock')) {
error_reporting(0);
- $fp = fopen($filename, "r");
+ $fp = fopen(LOCK_DIRECTORY . "/$filename", "r");
error_reporting(DEFAULT_ERROR_LEVEL);
if ($fp) {
if (flock($fp, LOCK_EX | LOCK_NB)) {
}
function make_lockfile($filename) {
- $fp = fopen($filename, "w");
+ $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
if (flock($fp, LOCK_EX | LOCK_NB)) {
return $fp;
}
function make_stampfile($filename) {
- $fp = fopen($filename, "w");
+ $fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
if (flock($fp, LOCK_EX | LOCK_NB)) {
fwrite($fp, time() . "\n");
function read_stampfile($filename) {
error_reporting(0);
- $fp = fopen($filename, "r");
+ $fp = fopen(LOCK_DIRECTORY . "/$filename", "r");
error_reporting (DEFAULT_ERROR_LEVEL);
if (flock($fp, LOCK_EX)) {
print "<param key=\"icons_location\" value=\"" .
ICONS_URL . "\"/>";
+ print "<param key=\"hide_read_shows_special\" value=\"" .
+ (int) get_pref($link, "HIDE_READ_SHOWS_SPECIAL") . "\"/>";
+
print "</init-params>";
}
<li onclick=\"$tog_published_link\">".__('Published')."</li>
</ul></li>
<li class=\"vsep\"> </li>
- <li class=\"top\">
<a href=\"$catchup_page_link\">".__('Mark as read')."</a><ul>
+ <li class=\"top\">
".__('Mark as read')."<ul>
<li onclick=\"$catchup_sel_link\">".__('Selection')."</li>
<!-- <li onclick=\"$catchup_page_link\">".__('This page')."</li> -->
<li><span class=\"insensitive\">--------</span></li>
}
printFeedEntry($feed_id, $class, $feed, $unread,
- ICONS_DIR."/$feed_id.ico", $link, $rtl_content,
+ ICONS_URL."/$feed_id.ico", $link, $rtl_content,
$last_updated, $line["last_error"]);
++$lnum;
$filename = substr($url, strrpos($url, "/")+1);
- $entry = "<a href=\"" . htmlspecialchars($url) . "\">" .
+ $entry = "<a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
$filename . " (" . $line["content_type"] . ")" . "</a>";
array_push($entries, $entry);
function outputHeadlinesList($link, $feed, $subop, $view_mode, $limit, $cat_view,
$next_unread_feed, $offset) {
+ $disable_cache = false;
+
$timing_info = getmicrotime();
$topmost_article_ids = array();
/// START /////////////////////////////////////////////////////////////////////////////////
$search = db_escape_string($_GET["query"]);
+
+ if ($search) {
+ $disable_cache = true;
+ }
+
$search_mode = db_escape_string($_GET["search_mode"]);
$match_on = db_escape_string($_GET["match_on"]);
// print "<div class=\"cdmInnerContent\" id=\"CICD-$id\" $cdm_cstyle>";
print $line["content_preview"];
+
+ $e_result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
+ post_id = '$id'");
+
+ if (db_num_rows($e_result) > 0) {
+ print "<div class=\"cdmEnclosures\">";
+
+ if (db_num_rows($e_result) == 1) {
+ print __("Attachment:") . " ";
+ } else {
+ print __("Attachments:") . " ";
+ }
+
+ $entries = array();
+
+ while ($e_line = db_fetch_assoc($e_result)) {
+
+ $url = $e_line["content_url"];
+
+ $filename = substr($url, strrpos($url, "/")+1);
+
+ $entry = "<a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
+ $filename . " (" . $e_line["content_type"] . ")" . "</a>";
+
+ array_push($entries, $entry);
+ }
+
+ print join(", ", $entries);
+
+ print "</div>";
+ }
+
print "<br clear='both'>";
// print "</div>";
print "</div>";
}
- return array($topmost_article_ids, $headlines_count);
+ return array($topmost_article_ids, $headlines_count, $feed, $disable_cache);
}
// from here: http://www.roscripts.com/Create_tag_cloud-71.html
git.wh0rd.org / tt-rss.git / blobdiff