|
|
|
@ -166,12 +166,30 @@ class Feeds extends Handler_Protected {
|
|
|
|
|
|
|
|
|
|
$method_split = explode(":", $method);
|
|
|
|
|
|
|
|
|
|
if ($method == "ForceUpdate" && $feed > 0 && is_numeric($feed) && !ini_get("open_basedir")) {
|
|
|
|
|
if ($method == "ForceUpdate" && $feed > 0 && is_numeric($feed)) {
|
|
|
|
|
// Update the feed if required with some basic flood control
|
|
|
|
|
|
|
|
|
|
$result = $this->dbh->query(
|
|
|
|
|
"SELECT cache_images,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
|
|
|
|
|
FROM ttrss_feeds WHERE id = '$feed'");
|
|
|
|
|
$any_needs_curl = false;
|
|
|
|
|
|
|
|
|
|
if (ini_get("open_basedir")) {
|
|
|
|
|
$pluginhost = PluginHost::getInstance();
|
|
|
|
|
foreach ($pluginhost->get_plugins() as $plugin) {
|
|
|
|
|
$flags = $plugin->flags();
|
|
|
|
|
|
|
|
|
|
if (isset($flags["needs_curl"]) && $flags["needs_curl"]) {
|
|
|
|
|
$any_needs_curl = true;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//if ($_REQUEST["debug"]) print "<!-- any_needs_curl: $any_needs_curl -->";
|
|
|
|
|
|
|
|
|
|
if (!$any_needs_curl) {
|
|
|
|
|
|
|
|
|
|
$result = $this->dbh->query(
|
|
|
|
|
"SELECT cache_images," . SUBSTRING_FOR_DATE . "(last_updated,1,19) AS last_updated
|
|
|
|
|
FROM ttrss_feeds WHERE id = '$feed'");
|
|
|
|
|
|
|
|
|
|
if ($this->dbh->num_rows($result) != 0) {
|
|
|
|
|
$last_updated = strtotime($this->dbh->fetch_result($result, 0, "last_updated"));
|
|
|
|
@ -182,9 +200,10 @@ class Feeds extends Handler_Protected {
|
|
|
|
|
update_rss_feed($feed, true, true);
|
|
|
|
|
} else {
|
|
|
|
|
$this->dbh->query("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
|
|
|
|
|
WHERE id = '$feed'");
|
|
|
|
|
WHERE id = '$feed'");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ($method_split[0] == "MarkAllReadGR") {
|
|
|
|
|