require_once("boot.php");
require_once("include/follow.php");
-require_once("include/Scrape.php");
function RemoveReply($subject) {
while (in_array(strtolower(substr($subject, 0, 3)), array("re:", "aw:")))
}
if(is_null($db)) {
- @include(".htconfig.php");
- require_once("include/dba.php");
- $db = new dba($db_host, $db_user, $db_pass, $db_data);
- unset($db_host, $db_user, $db_pass, $db_data);
- };
-
+ @include(".htconfig.php");
+ require_once("include/dba.php");
+ $db = new dba($db_host, $db_user, $db_pass, $db_data);
+ unset($db_host, $db_user, $db_pass, $db_data);
+ };
require_once('include/session.php');
require_once('include/datetime.php');
- require_once('library/simplepie/simplepie.inc');
require_once('include/items.php');
require_once('include/Contact.php');
require_once('include/email.php');
require_once('include/socgraph.php');
- require_once('include/pidfile.php');
require_once('include/queue_fn.php');
load_config('config');
if(($argc > 1) && (intval($argv[1])))
$contact_id = intval($argv[1]);
+ if(($argc > 2) && ($argv[2] == "force"))
+ $force = true;
+
if(! $contact_id) {
logger('onepoll: no contact');
return;
}
- $lockpath = get_lockpath();
- if ($lockpath != '') {
- $pidfile = new pidfile($lockpath, 'onepoll'.$contact_id);
- if ($pidfile->is_already_running()) {
- logger("onepoll: Already running for contact ".$contact_id);
- if ($pidfile->running_time() > 9*60) {
- $pidfile->kill();
- logger("killed stale process");
- }
- exit;
- }
- }
+ // Don't check this stuff if the function is called by the poller
+ if (App::callstack() != "poller_run")
+ if (App::is_already_running('onepoll'.$contact_id, '', 540))
+ return;
$d = datetime_convert();
$contacts = q("SELECT `contact`.* FROM `contact`
WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
- AND NOT `network` IN ( '%s', '%s', '%s' )
+ AND NOT `network` IN ( '%s', '%s' )
AND `contact`.`id` = %d
AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0
AND `contact`.`archive` = 0 LIMIT 1",
intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND),
- dbesc(NETWORK_DIASPORA),
dbesc(NETWORK_FACEBOOK),
dbesc(NETWORK_PUMPIO),
intval($contact_id)
);
- if(! count($contacts)) {
+ if(! count($contacts))
return;
- }
$contact = $contacts[0];
+ // load current friends if possible.
+ if (($contact['poco'] != "") AND ($contact['success_update'] > $contact['failure_update'])) {
+ $r = q("SELECT count(*) as total from glink
+ where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
+ intval($contact['id'])
+ );
+ if (count($r))
+ if (!$r[0]['total'])
+ poco_load($contact['id'],$importer_uid,0,$contact['poco']);
+ }
+
+ /// @TODO Check why we don't poll the Diaspora feed at the moment (some guid problem in the items?)
+ /// @TODO Check whether this is possible with Redmatrix
+ if ($contact["network"] == NETWORK_DIASPORA) {
+ if (poco_do_update($contact["created"], $contact["last-item"], $contact["failure_update"], $contact["success_update"])) {
+ $last_updated = poco_last_updated($contact["url"]);
+ $updated = datetime_convert();
+ if ($last_updated) {
+ q("UPDATE `contact` SET `last-item` = '%s', `last-update` = '%s', `success_update` = '%s' WHERE `id` = %d",
+ dbesc($last_updated),
+ dbesc($updated),
+ dbesc($updated),
+ intval($contact['id'])
+ );
+ } else {
+ q("UPDATE `contact` SET `last-update` = '%s', `failure_update` = '%s' WHERE `id` = %d",
+ dbesc($updated),
+ dbesc($updated),
+ intval($contact['id'])
+ );
+ }
+ }
+ return;
+ }
+
$xml = false;
$t = $contact['last-update'];
);
// Update the contact entry
- if(($contact['network'] === NETWORK_OSTATUS) || ($contact['network'] === NETWORK_DIASPORA) || ($contact['network'] === NETWORK_DFRN))
- update_contact($contact["id"]);
+ if(($contact['network'] === NETWORK_OSTATUS) || ($contact['network'] === NETWORK_DIASPORA) || ($contact['network'] === NETWORK_DFRN)) {
+ if (!poco_reachable($contact['url'])) {
+ logger("Skipping probably dead contact ".$contact['url']);
+ return;
+ }
+
+ if (!update_contact($contact["id"])) {
+ mark_for_death($contact);
+ return;
+ } else
+ unmark_for_death($contact);
+ }
if($contact['network'] === NETWORK_DFRN) {
mark_for_death($contact);
// set the last-update so we don't keep polling
- $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d",
+ $r = q("UPDATE `contact` SET `last-update` = '%s', `failure_update` = '%s' WHERE `id` = %d",
+ dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($contact['id'])
);
mark_for_death($contact);
- $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d",
+ $r = q("UPDATE `contact` SET `last-update` = '%s', `failure_update` = '%s' WHERE `id` = %d",
+ dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($contact['id'])
);
// set the last-update so we don't keep polling
- $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d",
+ $r = q("UPDATE `contact` SET `last-update` = '%s', `failure_update` = '%s' WHERE `id` = %d",
+ dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($contact['id'])
);
if(($contact['duplex']) && strlen($contact['prvkey'])) {
openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']);
- } elseif($contact['pubkey']) {
+ }
+ else {
openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
- } else
- logger("No private or public key for contact ".$contact['id']." ".$contact['url']);
+ }
$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
if($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly'])
return;
- $xml = fetch_url($contact['poll']);
+ $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
+ $xml = fetch_url($contact['poll'], false, $redirects, 0, Null, $cookiejar);
+ unlink($cookiejar);
}
elseif($contact['network'] === NETWORK_MAIL || $contact['network'] === NETWORK_MAIL2) {
);
logger("Mail: Connected to " . $mailconf[0]['user']);
} else
- logger("Mail: Connection error ".$mailconf[0]['user']." ".print_r(imap_errors()));
+ logger("Mail: Connection error ".$mailconf[0]['user']." ".print_r(imap_errors(), true));
}
if($mbox) {
$refs_arr[$x] = "'" . msgid2iri(str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x]))) . "'";
}
$qstr = implode(',',$refs_arr);
- $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `uri` IN ( $qstr ) AND `uid` = %d LIMIT 1",
+ $r = q("SELECT `uri` , `parent-uri` FROM `item` USE INDEX (`uid_uri`) WHERE `uri` IN ($qstr) AND `uid` = %d LIMIT 1",
intval($importer_uid)
);
if(count($r))
// If it seems to be a reply but a header couldn't be found take the last message with matching subject
if(!x($datarray,'parent-uri') and $reply) {
- $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d ORDER BY `created` DESC LIMIT 1",
+ $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d AND `network` = '%s' ORDER BY `created` DESC LIMIT 1",
dbesc(protect_sprintf($datarray['title'])),
- intval($importer_uid));
+ intval($importer_uid),
+ dbesc(NETWORK_MAIL));
if(count($r))
$datarray['parent-uri'] = $r[0]['parent-uri'];
}
logger("Mail: Importing ".$msg_uid." for ".$mailconf[0]['user']);
// some mailing lists have the original author as 'from' - add this sender info to msg body.
- // todo: adding a gravatar for the original author would be cool
+ /// @TODO Adding a gravatar for the original author would be cool
if(! stristr($meta->from,$contact['addr'])) {
$from = imap_mime_header_decode($meta->from);
logger('poller: received xml : ' . $xml, LOGGER_DATA);
if(! strstr($xml,'<')) {
logger('poller: post_handshake: response from ' . $url . ' did not contain XML.');
- $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d",
+ $r = q("UPDATE `contact` SET `last-update` = '%s', `failure_update` = '%s' WHERE `id` = %d",
+ dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($contact['id'])
);
}
- consume_feed($xml,$importer,$contact,$hub,1,1);
+ logger("Consume feed of contact ".$contact['id']);
+ consume_feed($xml,$importer,$contact,$hub,1,1);
// do it twice. Ensures that children of parents which may be later in the stream aren't tossed
if(($contact['network'] === NETWORK_OSTATUS || $contact['network'] == NETWORK_FEED) && (! $contact['hub-verify']))
$hub_update = true;
+ if ($force)
+ $hub_update = true;
+
+ logger("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$contact['network']." Relation: ".$contact['rel']." Update: ".$hub_update);
+
if((strlen($hub)) && ($hub_update) && (($contact['rel'] != CONTACT_IS_FOLLOWER) || $contact['network'] == NETWORK_FEED) ) {
logger('poller: hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
$hubs = explode(',', $hub);
}
}
}
- }
- $updated = datetime_convert();
+ $updated = datetime_convert();
- $r = q("UPDATE `contact` SET `last-update` = '%s', `success_update` = '%s' WHERE `id` = %d",
- dbesc($updated),
- dbesc($updated),
- intval($contact['id'])
- );
+ $r = q("UPDATE `contact` SET `last-update` = '%s', `success_update` = '%s' WHERE `id` = %d",
+ dbesc($updated),
+ dbesc($updated),
+ intval($contact['id'])
+ );
+ q("UPDATE `gcontact` SET `last_contact` = '%s' WHERE `nurl` = '%s'",
+ dbesc($updated),
+ dbesc($contact['nurl'])
+ );
- // load current friends if possible.
+ } elseif (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_FEED))) {
+ $updated = datetime_convert();
- if($contact['poco']) {
- $r = q("SELECT count(*) as total from glink
- where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
+ $r = q("UPDATE `contact` SET `last-update` = '%s', `failure_update` = '%s' WHERE `id` = %d",
+ dbesc($updated),
+ dbesc($updated),
+ intval($contact['id'])
+ );
+
+ q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
+ dbesc($updated),
+ dbesc($contact['nurl'])
+ );
+ } else {
+ $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d",
+ dbesc($updated),
intval($contact['id'])
);
- }
- if(count($r)) {
- if(! $r[0]['total']) {
- poco_load($contact['id'],$importer_uid,0,$contact['poco']);
- }
}
return;
}
if (array_search(__file__,get_included_files())===0){
- onepoll_run($_SERVER["argv"],$_SERVER["argc"]);
- killme();
+ onepoll_run($_SERVER["argv"],$_SERVER["argc"]);
+ killme();
}