aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@diekershoff.homeunix.net>2010-12-22 06:37:33 +0100
committerroot <root@diekershoff.homeunix.net>2010-12-22 06:37:33 +0100
commit780ab072f55bd18575ca821eb6ea481cc0728814 (patch)
treeb72a2250f69a3f10b5076c91fa12e21e6946738a
parent8cfa93b730f87edf98c52e9a38cfa015ce1f5d47 (diff)
parent5b1fde8b0f4c658b3560ad4b0d29d176c42baf87 (diff)
downloadvolse-hubzilla-780ab072f55bd18575ca821eb6ea481cc0728814.tar.gz
volse-hubzilla-780ab072f55bd18575ca821eb6ea481cc0728814.tar.bz2
volse-hubzilla-780ab072f55bd18575ca821eb6ea481cc0728814.zip
Merge branch 'master' of git://github.com/friendika/friendika
-rw-r--r--include/poller.php27
-rw-r--r--index.php4
2 files changed, 24 insertions, 7 deletions
diff --git a/include/poller.php b/include/poller.php
index ec1fef7a8..dda0cb0ce 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -43,16 +43,30 @@
if($contact['priority'] || $contact['subhub']) {
- $update = false;
+ $hub_update = true;
+ $update = false;
+
+ $t = $contact['last-update'];
// We should be getting everything via a hub. But just to be sure, let's check once a day.
+ // (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately)
// This also lets us update our subscription to the hub, and add or replace hubs in case it
- // changed.
+ // changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'.
- if($contact['subhub'])
- $contact['priority'] = 3;
- $t = $contact['last-update'];
+ if($contact['subhub']) {
+ $interval = get_config('system','pushpoll_frequency');
+ $contact['priority'] = (($interval !== false) ? intval($interval) : 3);
+ $hub_update = false;
+
+ if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
+ $hub_update = true;
+ }
+
+
+ /**
+ * Based on $contact['priority'], should we poll this site now? Or later?
+ */
switch ($contact['priority']) {
case 5:
@@ -218,7 +232,8 @@
consume_feed($xml,$importer,$contact,$hub);
- if((strlen($hub)) && (($contact['rel'] == REL_BUD) || (($contact['network'] === 'stat') && (! $contact['readonly'])))) {
+ if((strlen($hub)) && ($hub_update)
+ && (($contact['rel'] == REL_BUD) || (($contact['network'] === 'stat') && (! $contact['readonly'])))) {
logger('poller: subscribing to hub(s) : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
$hubs = explode(',', $hub);
if(count($hubs)) {
diff --git a/index.php b/index.php
index eac3b66df..f6ea0c9a8 100644
--- a/index.php
+++ b/index.php
@@ -61,8 +61,10 @@ $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
*
*/
-if(! $install)
+if(! $install) {
require_once("session.php");
+ load_hooks();
+}
require_once("datetime.php");