|
@@ -358,7 +358,7 @@
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- function fetch_file_contents($url, $type = false, $login = false, $pass = false) {
|
|
|
+ function fetch_file_contents($url, $type = false, $login = false, $pass = false, $post_query = false) {
|
|
|
$login = urlencode($login);
|
|
|
$pass = urlencode($pass);
|
|
|
|
|
@@ -374,6 +374,11 @@
|
|
|
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
|
|
|
curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
|
|
|
|
|
|
+ if ($post_query) {
|
|
|
+ curl_setopt($ch, CURLOPT_POST, true);
|
|
|
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $post_query);
|
|
|
+ }
|
|
|
+
|
|
|
if ($login && $pass)
|
|
|
curl_setopt($ch, CURLOPT_USERPWD, "$login:$pass");
|
|
|
|
|
@@ -7351,4 +7356,87 @@
|
|
|
|
|
|
return $query;
|
|
|
}
|
|
|
+
|
|
|
+ // Status codes:
|
|
|
+ // -1 - never connected
|
|
|
+ // 0 - no data received
|
|
|
+ // 1 - data received successfully
|
|
|
+ // 2 - did not receive valid data
|
|
|
+ // >10 - server error, code + 10 (e.g. 16 means server error 6)
|
|
|
+
|
|
|
+ function get_linked_feeds($link, $instance_id = false) {
|
|
|
+ if ($instance_id)
|
|
|
+ $instance_qpart = "id = '$instance_id' AND ";
|
|
|
+ else
|
|
|
+ $instance_qpart = "";
|
|
|
+
|
|
|
+ if (DB_TYPE == "pgsql") {
|
|
|
+ $date_qpart = "last_connected < NOW() - INTERVAL '1 second'";
|
|
|
+ } else {
|
|
|
+ $date_qpart = "last_connected < DATE_SUB(NOW(), INTERVAL 6 HOUR";
|
|
|
+ }
|
|
|
+
|
|
|
+ $result = db_query($link, "SELECT id, access_key, access_url FROM ttrss_linked_instances
|
|
|
+ WHERE $instance_qpart $date_qpart ORDER BY last_connected");
|
|
|
+
|
|
|
+ while ($line = db_fetch_assoc($result)) {
|
|
|
+ $id = $line['id'];
|
|
|
+
|
|
|
+ _debug("Updating: " . $line['access_url'] . " ($id)");
|
|
|
+
|
|
|
+ $fetch_url = $line['access_url'] . '/backend.php?op=fbexport';
|
|
|
+ $post_query = 'key=' . $line['access_key'];
|
|
|
+
|
|
|
+ $feeds = fetch_file_contents($fetch_url, false, false, false, $post_query);
|
|
|
+
|
|
|
+ if ($feeds) {
|
|
|
+ $feeds = json_decode($feeds, true);
|
|
|
+
|
|
|
+ if ($feeds) {
|
|
|
+ if ($feeds['error']) {
|
|
|
+ $status = $feeds['error']['code'] + 10;
|
|
|
+ } else {
|
|
|
+ $status = 1;
|
|
|
+
|
|
|
+ if (count($feeds['feeds']) > 0) {
|
|
|
+
|
|
|
+ db_query($link, "DELETE FROM ttrss_linked_feeds
|
|
|
+ WHERE instance_id = '$id'");
|
|
|
+
|
|
|
+ foreach ($feeds['feeds'] as $feed) {
|
|
|
+ $feed_url = db_escape_string($feed['feed_url']);
|
|
|
+ $title = db_escape_string($feed['title']);
|
|
|
+ $subscribers = db_escape_string($feed['subscribers']);
|
|
|
+
|
|
|
+ db_query($link, "INSERT INTO ttrss_linked_feeds
|
|
|
+ (feed_url, title, subscribers, instance_id, created, updated)
|
|
|
+ VALUES
|
|
|
+ ('$feed_url', '$title', '$subscribers', '$id', NOW(), NOW())");
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ // received 0 feeds, this might indicate that
|
|
|
+ // the instance on the other hand is rebuilding feedbrowser cache
|
|
|
+ // we will try again later
|
|
|
+
|
|
|
+ // TODO: maybe perform expiration based on updated here?
|
|
|
+ }
|
|
|
+
|
|
|
+ _debug("Processed " . count($feeds['feeds']) . " feeds.");
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ $status = 2;
|
|
|
+ }
|
|
|
+
|
|
|
+ } else {
|
|
|
+ $status = 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ _debug("Status: $status");
|
|
|
+
|
|
|
+ db_query($link, "UPDATE ttrss_linked_instances SET
|
|
|
+ last_status_out = '$status', last_connected = NOW() WHERE id = '$id'");
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
?>
|