Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: break up poller into separate processes add tooltip title to common_tabs PRIVACY: if wall is blocked, don't provide public keywords in HTML meta Diabook-dark update, it's almost useable now (if you're lenient). Added "important changes" to admin menu for admins who don't follow the github properly. * master:
This commit is contained in:
Simon L'nu
commit
c661dc502f
10 changed files with 548 additions and 445 deletions
519
include/onepoll.php
Normal file
519
include/onepoll.php
Normal file
|
|
@ -0,0 +1,519 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
require_once("boot.php");
|
||||||
|
|
||||||
|
function onepoll_run($argv, $argc){
|
||||||
|
global $a, $db;
|
||||||
|
|
||||||
|
if(is_null($a)) {
|
||||||
|
$a = new App;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(is_null($db)) {
|
||||||
|
@include(".htconfig.php");
|
||||||
|
require_once("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');
|
||||||
|
|
||||||
|
load_config('config');
|
||||||
|
load_config('system');
|
||||||
|
|
||||||
|
$a->set_baseurl(get_config('system','url'));
|
||||||
|
|
||||||
|
load_hooks();
|
||||||
|
|
||||||
|
logger('onepoll: start');
|
||||||
|
|
||||||
|
$abandon_days = intval(get_config('system','account_abandon_days'));
|
||||||
|
if($abandon_days < 1)
|
||||||
|
$abandon_days = 0;
|
||||||
|
|
||||||
|
|
||||||
|
$manual_id = 0;
|
||||||
|
$generation = 0;
|
||||||
|
$hub_update = false;
|
||||||
|
$force = false;
|
||||||
|
$restart = false;
|
||||||
|
|
||||||
|
if(($argc > 1) && (intval($argv[1])))
|
||||||
|
$contact_id = intval($argv[1]);
|
||||||
|
|
||||||
|
if(! $contact_id) {
|
||||||
|
logger('onepoll: no contact');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$d = datetime_convert();
|
||||||
|
|
||||||
|
// Only poll from those with suitable relationships,
|
||||||
|
// and which have a polling address and ignore Diaspora since
|
||||||
|
// we are unable to match those posts with a Diaspora GUID and prevent duplicates.
|
||||||
|
|
||||||
|
$abandon_sql = (($abandon_days)
|
||||||
|
? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days))
|
||||||
|
: ''
|
||||||
|
);
|
||||||
|
|
||||||
|
$contacts = q("SELECT `contact`.* FROM `contact`
|
||||||
|
WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
|
||||||
|
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),
|
||||||
|
intval($contact_id)
|
||||||
|
);
|
||||||
|
|
||||||
|
if(! count($contacts)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$contact = $contacts[0];
|
||||||
|
|
||||||
|
|
||||||
|
$xml = false;
|
||||||
|
|
||||||
|
$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;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
$hub_update = false;
|
||||||
|
|
||||||
|
|
||||||
|
$importer_uid = $contact['uid'];
|
||||||
|
|
||||||
|
$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
|
||||||
|
intval($importer_uid)
|
||||||
|
);
|
||||||
|
if(! count($r))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
$importer = $r[0];
|
||||||
|
|
||||||
|
logger("onepoll: poll: ({$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
|
||||||
|
|
||||||
|
$last_update = (($contact['last-update'] === '0000-00-00 00:00:00')
|
||||||
|
? datetime_convert('UTC','UTC','now - 7 days', ATOM_TIME)
|
||||||
|
: datetime_convert('UTC','UTC',$contact['last-update'], ATOM_TIME)
|
||||||
|
);
|
||||||
|
|
||||||
|
if($contact['network'] === NETWORK_DFRN) {
|
||||||
|
|
||||||
|
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
|
||||||
|
if(intval($contact['duplex']) && $contact['dfrn-id'])
|
||||||
|
$idtosend = '0:' . $orig_id;
|
||||||
|
if(intval($contact['duplex']) && $contact['issued-id'])
|
||||||
|
$idtosend = '1:' . $orig_id;
|
||||||
|
|
||||||
|
// they have permission to write to us. We already filtered this in the contact query.
|
||||||
|
$perm = 'rw';
|
||||||
|
|
||||||
|
$url = $contact['poll'] . '?dfrn_id=' . $idtosend
|
||||||
|
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
|
||||||
|
. '&type=data&last_update=' . $last_update
|
||||||
|
. '&perm=' . $perm ;
|
||||||
|
|
||||||
|
$handshake_xml = fetch_url($url);
|
||||||
|
|
||||||
|
logger('onepoll: handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA);
|
||||||
|
|
||||||
|
|
||||||
|
if(! $handshake_xml) {
|
||||||
|
logger("poller: $url appears to be dead - marking for death ");
|
||||||
|
// dead connection - might be a transient event, or this might
|
||||||
|
// mean the software was uninstalled or the domain expired.
|
||||||
|
// Will keep trying for one month.
|
||||||
|
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 LIMIT 1",
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
intval($contact['id'])
|
||||||
|
);
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(! strstr($handshake_xml,'<?xml')) {
|
||||||
|
logger('poller: response from ' . $url . ' did not contain XML.');
|
||||||
|
$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
intval($contact['id'])
|
||||||
|
);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$res = parse_xml_string($handshake_xml);
|
||||||
|
|
||||||
|
if(intval($res->status) == 1) {
|
||||||
|
logger("poller: $url replied status 1 - marking for death ");
|
||||||
|
|
||||||
|
// we may not be friends anymore. Will keep trying for one month.
|
||||||
|
// set the last-update so we don't keep polling
|
||||||
|
|
||||||
|
|
||||||
|
$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
intval($contact['id'])
|
||||||
|
);
|
||||||
|
mark_for_death($contact);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if($contact['term-date'] != '0000-00-00 00:00:00') {
|
||||||
|
logger("poller: $url back from the dead - removing mark for death");
|
||||||
|
unmark_for_death($contact);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if(((float) $res->dfrn_version > 2.21) && ($contact['poco'] == '')) {
|
||||||
|
q("update contact set poco = '%s' where id = %d limit 1",
|
||||||
|
dbesc(str_replace('/profile/','/poco/', $contact['url'])),
|
||||||
|
intval($contact['id'])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$postvars = array();
|
||||||
|
|
||||||
|
$sent_dfrn_id = hex2bin((string) $res->dfrn_id);
|
||||||
|
$challenge = hex2bin((string) $res->challenge);
|
||||||
|
|
||||||
|
$final_dfrn_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']);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
|
||||||
|
openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
|
||||||
|
|
||||||
|
if(strpos($final_dfrn_id,':') == 1)
|
||||||
|
$final_dfrn_id = substr($final_dfrn_id,2);
|
||||||
|
|
||||||
|
if($final_dfrn_id != $orig_id) {
|
||||||
|
logger('poller: ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id);
|
||||||
|
// did not decode properly - cannot trust this site
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$postvars['dfrn_id'] = $idtosend;
|
||||||
|
$postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
|
||||||
|
$postvars['perm'] = 'rw';
|
||||||
|
|
||||||
|
$xml = post_url($contact['poll'],$postvars);
|
||||||
|
|
||||||
|
}
|
||||||
|
elseif(($contact['network'] === NETWORK_OSTATUS)
|
||||||
|
|| ($contact['network'] === NETWORK_DIASPORA)
|
||||||
|
|| ($contact['network'] === NETWORK_FEED) ) {
|
||||||
|
|
||||||
|
// Upgrading DB fields from an older Friendica version
|
||||||
|
// Will only do this once per notify-enabled OStatus contact
|
||||||
|
// or if relationship changes
|
||||||
|
|
||||||
|
$stat_writeable = ((($contact['notify']) && ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['rel'] == CONTACT_IS_FRIEND)) ? 1 : 0);
|
||||||
|
|
||||||
|
if($stat_writeable != $contact['writable']) {
|
||||||
|
q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1",
|
||||||
|
intval($stat_writeable),
|
||||||
|
intval($contact['id'])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Are we allowed to import from this person?
|
||||||
|
|
||||||
|
if($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly'])
|
||||||
|
continue;
|
||||||
|
|
||||||
|
$xml = fetch_url($contact['poll']);
|
||||||
|
}
|
||||||
|
elseif($contact['network'] === NETWORK_MAIL || $contact['network'] === NETWORK_MAIL2) {
|
||||||
|
|
||||||
|
logger("onepoll: mail: Fetching", LOGGER_DEBUG);
|
||||||
|
|
||||||
|
$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
|
||||||
|
if($mail_disabled)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
logger("onepoll: Mail: Enabled", LOGGER_DEBUG);
|
||||||
|
|
||||||
|
$mbox = null;
|
||||||
|
$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1",
|
||||||
|
intval($importer_uid)
|
||||||
|
);
|
||||||
|
$mailconf = q("SELECT * FROM `mailacct` WHERE `server` != '' AND `uid` = %d LIMIT 1",
|
||||||
|
intval($importer_uid)
|
||||||
|
);
|
||||||
|
if(count($x) && count($mailconf)) {
|
||||||
|
$mailbox = construct_mailbox_name($mailconf[0]);
|
||||||
|
$password = '';
|
||||||
|
openssl_private_decrypt(hex2bin($mailconf[0]['pass']),$password,$x[0]['prvkey']);
|
||||||
|
$mbox = email_connect($mailbox,$mailconf[0]['user'],$password);
|
||||||
|
unset($password);
|
||||||
|
logger("Mail: Connect");
|
||||||
|
if($mbox) {
|
||||||
|
q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
intval($mailconf[0]['id']),
|
||||||
|
intval($importer_uid)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if($mbox) {
|
||||||
|
|
||||||
|
$msgs = email_poll($mbox,$contact['addr']);
|
||||||
|
|
||||||
|
if(count($msgs)) {
|
||||||
|
logger("Mail: Parsing ".count($msgs)." mails.", LOGGER_DEBUG);
|
||||||
|
|
||||||
|
foreach($msgs as $msg_uid) {
|
||||||
|
logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA);
|
||||||
|
|
||||||
|
$datarray = array();
|
||||||
|
$meta = email_msg_meta($mbox,$msg_uid);
|
||||||
|
$headers = email_msg_headers($mbox,$msg_uid);
|
||||||
|
|
||||||
|
// look for a 'references' header and try and match with a parent item we have locally.
|
||||||
|
|
||||||
|
$raw_refs = ((x($headers,'references')) ? str_replace("\t",'',$headers['references']) : '');
|
||||||
|
$datarray['uri'] = msgid2iri(trim($meta->message_id,'<>'));
|
||||||
|
|
||||||
|
if($raw_refs) {
|
||||||
|
$refs_arr = explode(' ', $raw_refs);
|
||||||
|
if(count($refs_arr)) {
|
||||||
|
for($x = 0; $x < count($refs_arr); $x ++)
|
||||||
|
$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",
|
||||||
|
intval($importer_uid)
|
||||||
|
);
|
||||||
|
if(count($r))
|
||||||
|
$datarray['parent-uri'] = $r[0]['uri'];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if(! x($datarray,'parent-uri'))
|
||||||
|
$datarray['parent-uri'] = $datarray['uri'];
|
||||||
|
|
||||||
|
// Have we seen it before?
|
||||||
|
$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
|
||||||
|
intval($importer_uid),
|
||||||
|
dbesc($datarray['uri'])
|
||||||
|
);
|
||||||
|
|
||||||
|
if(count($r)) {
|
||||||
|
// logger("Mail: Seen before ".$msg_uid);
|
||||||
|
if($meta->deleted && ! $r[0]['deleted']) {
|
||||||
|
q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
intval($r[0]['id'])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
switch ($mailconf[0]['action']) {
|
||||||
|
case 0:
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
logger("Mail: Deleting ".$msg_uid);
|
||||||
|
imap_delete($mbox, $msg_uid, FT_UID);
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
logger("Mail: Mark as seen ".$msg_uid);
|
||||||
|
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']);
|
||||||
|
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
|
||||||
|
if ($mailconf[0]['movetofolder'] != "")
|
||||||
|
imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Decoding the header
|
||||||
|
$subject = imap_mime_header_decode($meta->subject);
|
||||||
|
$datarray['title'] = "";
|
||||||
|
foreach($subject as $subpart)
|
||||||
|
if ($subpart->charset != "default")
|
||||||
|
$datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text);
|
||||||
|
else
|
||||||
|
$datarray['title'] .= $subpart->text;
|
||||||
|
|
||||||
|
$datarray['title'] = notags(trim($datarray['title']));
|
||||||
|
|
||||||
|
//$datarray['title'] = notags(trim($meta->subject));
|
||||||
|
$datarray['created'] = datetime_convert('UTC','UTC',$meta->date);
|
||||||
|
|
||||||
|
// Is it reply?
|
||||||
|
$reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or
|
||||||
|
(substr(strtolower($datarray['title']), 0, 3) == "re-") or
|
||||||
|
(raw_refs != ""));
|
||||||
|
|
||||||
|
$r = email_get_msg($mbox,$msg_uid, $reply);
|
||||||
|
if(! $r) {
|
||||||
|
logger("Mail: can't fetch msg ".$msg_uid);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$datarray['body'] = escape_tags($r['body']);
|
||||||
|
|
||||||
|
logger("Mail: Importing ".$msg_uid);
|
||||||
|
|
||||||
|
// 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
|
||||||
|
|
||||||
|
if(! stristr($meta->from,$contact['addr'])) {
|
||||||
|
$from = imap_mime_header_decode($meta->from);
|
||||||
|
$fromdecoded = "";
|
||||||
|
foreach($from as $frompart)
|
||||||
|
if ($frompart->charset != "default")
|
||||||
|
$fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text);
|
||||||
|
else
|
||||||
|
$fromdecoded .= $frompart->text;
|
||||||
|
|
||||||
|
$datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body'];
|
||||||
|
}
|
||||||
|
|
||||||
|
$datarray['uid'] = $importer_uid;
|
||||||
|
$datarray['contact-id'] = $contact['id'];
|
||||||
|
if($datarray['parent-uri'] === $datarray['uri'])
|
||||||
|
$datarray['private'] = 1;
|
||||||
|
if(($contact['network'] === NETWORK_MAIL) && (! get_pconfig($importer_uid,'system','allow_public_email_replies'))) {
|
||||||
|
$datarray['private'] = 1;
|
||||||
|
$datarray['allow_cid'] = '<' . $contact['id'] . '>';
|
||||||
|
}
|
||||||
|
$datarray['author-name'] = $contact['name'];
|
||||||
|
$datarray['author-link'] = 'mailbox';
|
||||||
|
$datarray['author-avatar'] = $contact['photo'];
|
||||||
|
|
||||||
|
$stored_item = item_store($datarray);
|
||||||
|
q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d",
|
||||||
|
dbesc($datarray['parent-uri']),
|
||||||
|
intval($importer_uid)
|
||||||
|
);
|
||||||
|
q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
|
||||||
|
intval($stored_item)
|
||||||
|
);
|
||||||
|
switch ($mailconf[0]['action']) {
|
||||||
|
case 0:
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
logger("Mail: Deleting ".$msg_uid);
|
||||||
|
imap_delete($mbox, $msg_uid, FT_UID);
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
logger("Mail: Mark as seen ".$msg_uid);
|
||||||
|
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']);
|
||||||
|
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
|
||||||
|
if ($mailconf[0]['movetofolder'] != "")
|
||||||
|
imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
imap_close($mbox);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
elseif($contact['network'] === NETWORK_FACEBOOK) {
|
||||||
|
// This is picked up by the Facebook plugin on a cron hook.
|
||||||
|
// Ignored here.
|
||||||
|
}
|
||||||
|
|
||||||
|
if($xml) {
|
||||||
|
logger('poller: received xml : ' . $xml, LOGGER_DATA);
|
||||||
|
if(! strstr($xml,'<?xml')) {
|
||||||
|
logger('poller: post_handshake: response from ' . $url . ' did not contain XML.');
|
||||||
|
$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
intval($contact['id'])
|
||||||
|
);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
consume_feed($xml,$importer,$contact,$hub,1,2);
|
||||||
|
|
||||||
|
$hubmode = 'subscribe';
|
||||||
|
if($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly'])
|
||||||
|
$hubmode = 'unsubscribe';
|
||||||
|
|
||||||
|
if((strlen($hub)) && ($hub_update) && ($contact['rel'] != CONTACT_IS_FOLLOWER)) {
|
||||||
|
logger('poller: hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
|
||||||
|
$hubs = explode(',', $hub);
|
||||||
|
if(count($hubs)) {
|
||||||
|
foreach($hubs as $h) {
|
||||||
|
$h = trim($h);
|
||||||
|
if(! strlen($h))
|
||||||
|
continue;
|
||||||
|
subscribe_to_hub($h,$importer,$contact,$hubmode);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$updated = datetime_convert();
|
||||||
|
|
||||||
|
$r = q("UPDATE `contact` SET `last-update` = '%s', `success_update` = '%s' WHERE `id` = %d LIMIT 1",
|
||||||
|
dbesc($updated),
|
||||||
|
dbesc($updated),
|
||||||
|
intval($contact['id'])
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
// load current friends if possible.
|
||||||
|
|
||||||
|
if($contact['poco']) {
|
||||||
|
$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,$contact['poco']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (array_search(__file__,get_included_files())===0){
|
||||||
|
onepoll_run($argv,$argc);
|
||||||
|
killme();
|
||||||
|
}
|
||||||
|
|
@ -113,6 +113,8 @@ function poller_run($argv, $argc){
|
||||||
$force = true;
|
$force = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval')));
|
||||||
|
|
||||||
$sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
|
$sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
|
||||||
|
|
||||||
reload_plugins();
|
reload_plugins();
|
||||||
|
|
@ -136,6 +138,7 @@ function poller_run($argv, $argc){
|
||||||
AND NOT `network` IN ( '%s', '%s' )
|
AND NOT `network` IN ( '%s', '%s' )
|
||||||
$sql_extra
|
$sql_extra
|
||||||
AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0
|
AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0
|
||||||
|
AND `contact`.`archive` = 0
|
||||||
AND `user`.`account_expired` = 0 $abandon_sql ORDER BY RAND()",
|
AND `user`.`account_expired` = 0 $abandon_sql ORDER BY RAND()",
|
||||||
intval(CONTACT_IS_SHARING),
|
intval(CONTACT_IS_SHARING),
|
||||||
intval(CONTACT_IS_FRIEND),
|
intval(CONTACT_IS_FRIEND),
|
||||||
|
|
@ -224,440 +227,12 @@ function poller_run($argv, $argc){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check to see if we are running out of memory - if so spawn a new process and kill this one
|
proc_run('php','include/onepoll.php',$contact['id']);
|
||||||
|
if($interval)
|
||||||
$avail_memory = return_bytes(ini_get('memory_limit'));
|
@time_sleep_until(microtime(true) + (float) $interval);
|
||||||
$memused = memory_get_peak_usage(true);
|
|
||||||
if(intval($avail_memory)) {
|
|
||||||
if(($memused / $avail_memory) > 0.95) {
|
|
||||||
if($generation + 1 > 10) {
|
|
||||||
logger('poller: maximum number of spawns exceeded. Terminating.');
|
|
||||||
killme();
|
|
||||||
}
|
|
||||||
logger('poller: memory exceeded. ' . $memused . ' bytes used. Spawning new poll.');
|
|
||||||
proc_run('php', 'include/poller.php', 'restart', (string) $generation + 1);
|
|
||||||
killme();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$importer_uid = $contact['uid'];
|
|
||||||
|
|
||||||
$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
|
|
||||||
intval($importer_uid)
|
|
||||||
);
|
|
||||||
if(! count($r))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
$importer = $r[0];
|
|
||||||
|
|
||||||
logger("poller: poll: ({$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
|
|
||||||
|
|
||||||
$last_update = (($contact['last-update'] === '0000-00-00 00:00:00')
|
|
||||||
? datetime_convert('UTC','UTC','now - 30 days', ATOM_TIME)
|
|
||||||
: datetime_convert('UTC','UTC',$contact['last-update'], ATOM_TIME)
|
|
||||||
);
|
|
||||||
|
|
||||||
if($contact['network'] === NETWORK_DFRN) {
|
|
||||||
|
|
||||||
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
|
|
||||||
|
|
||||||
if(intval($contact['duplex']) && $contact['dfrn-id'])
|
|
||||||
$idtosend = '0:' . $orig_id;
|
|
||||||
if(intval($contact['duplex']) && $contact['issued-id'])
|
|
||||||
$idtosend = '1:' . $orig_id;
|
|
||||||
|
|
||||||
// they have permission to write to us. We already filtered this in the contact query.
|
|
||||||
$perm = 'rw';
|
|
||||||
|
|
||||||
$url = $contact['poll'] . '?dfrn_id=' . $idtosend
|
|
||||||
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
|
|
||||||
. '&type=data&last_update=' . $last_update
|
|
||||||
. '&perm=' . $perm ;
|
|
||||||
|
|
||||||
$handshake_xml = fetch_url($url);
|
|
||||||
|
|
||||||
logger('poller: handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA);
|
|
||||||
|
|
||||||
|
|
||||||
if(! $handshake_xml) {
|
|
||||||
logger("poller: $url appears to be dead - marking for death ");
|
|
||||||
// dead connection - might be a transient event, or this might
|
|
||||||
// mean the software was uninstalled or the domain expired.
|
|
||||||
// Will keep trying for one month.
|
|
||||||
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 LIMIT 1",
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
intval($contact['id'])
|
|
||||||
);
|
|
||||||
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(! strstr($handshake_xml,'<?xml')) {
|
|
||||||
logger('poller: response from ' . $url . ' did not contain XML.');
|
|
||||||
$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
intval($contact['id'])
|
|
||||||
);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$res = parse_xml_string($handshake_xml);
|
|
||||||
|
|
||||||
if(intval($res->status) == 1) {
|
|
||||||
logger("poller: $url replied status 1 - marking for death ");
|
|
||||||
|
|
||||||
// we may not be friends anymore. Will keep trying for one month.
|
|
||||||
// set the last-update so we don't keep polling
|
|
||||||
|
|
||||||
$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
intval($contact['id'])
|
|
||||||
);
|
|
||||||
|
|
||||||
mark_for_death($contact);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if($contact['term-date'] != '0000-00-00 00:00:00') {
|
|
||||||
logger("poller: $url back from the dead - removing mark for death");
|
|
||||||
unmark_for_death($contact);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if(((float) $res->dfrn_version > 2.21) && ($contact['poco'] == '')) {
|
|
||||||
q("update contact set poco = '%s' where id = %d limit 1",
|
|
||||||
dbesc(str_replace('/profile/','/poco/', $contact['url'])),
|
|
||||||
intval($contact['id'])
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
$postvars = array();
|
|
||||||
|
|
||||||
$sent_dfrn_id = hex2bin((string) $res->dfrn_id);
|
|
||||||
$challenge = hex2bin((string) $res->challenge);
|
|
||||||
|
|
||||||
$final_dfrn_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']);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
|
|
||||||
openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
|
|
||||||
}
|
|
||||||
|
|
||||||
$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
|
|
||||||
|
|
||||||
if(strpos($final_dfrn_id,':') == 1)
|
|
||||||
$final_dfrn_id = substr($final_dfrn_id,2);
|
|
||||||
|
|
||||||
if($final_dfrn_id != $orig_id) {
|
|
||||||
logger('poller: ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id);
|
|
||||||
// did not decode properly - cannot trust this site
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
$postvars['dfrn_id'] = $idtosend;
|
|
||||||
$postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
|
|
||||||
$postvars['perm'] = 'rw';
|
|
||||||
|
|
||||||
$xml = post_url($contact['poll'],$postvars);
|
|
||||||
}
|
|
||||||
elseif(($contact['network'] === NETWORK_OSTATUS)
|
|
||||||
|| ($contact['network'] === NETWORK_DIASPORA)
|
|
||||||
|| ($contact['network'] === NETWORK_FEED) ) {
|
|
||||||
|
|
||||||
// Upgrading DB fields from an older Friendica version
|
|
||||||
// Will only do this once per notify-enabled OStatus contact
|
|
||||||
// or if relationship changes
|
|
||||||
|
|
||||||
$stat_writeable = ((($contact['notify']) && ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['rel'] == CONTACT_IS_FRIEND)) ? 1 : 0);
|
|
||||||
|
|
||||||
if($stat_writeable != $contact['writable']) {
|
|
||||||
q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1",
|
|
||||||
intval($stat_writeable),
|
|
||||||
intval($contact['id'])
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Are we allowed to import from this person?
|
|
||||||
|
|
||||||
if($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly'])
|
|
||||||
continue;
|
|
||||||
|
|
||||||
$xml = fetch_url($contact['poll']);
|
|
||||||
}
|
|
||||||
elseif($contact['network'] === NETWORK_MAIL || $contact['network'] === NETWORK_MAIL2) {
|
|
||||||
|
|
||||||
logger("Mail: Fetching");
|
|
||||||
|
|
||||||
$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
|
|
||||||
if($mail_disabled)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
logger("Mail: Enabled");
|
|
||||||
|
|
||||||
$mbox = null;
|
|
||||||
$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1",
|
|
||||||
intval($importer_uid)
|
|
||||||
);
|
|
||||||
$mailconf = q("SELECT * FROM `mailacct` WHERE `server` != '' AND `uid` = %d LIMIT 1",
|
|
||||||
intval($importer_uid)
|
|
||||||
);
|
|
||||||
if(count($x) && count($mailconf)) {
|
|
||||||
$mailbox = construct_mailbox_name($mailconf[0]);
|
|
||||||
$password = '';
|
|
||||||
openssl_private_decrypt(hex2bin($mailconf[0]['pass']),$password,$x[0]['prvkey']);
|
|
||||||
$mbox = email_connect($mailbox,$mailconf[0]['user'],$password);
|
|
||||||
unset($password);
|
|
||||||
logger("Mail: Connect");
|
|
||||||
if($mbox) {
|
|
||||||
q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
intval($mailconf[0]['id']),
|
|
||||||
intval($importer_uid)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if($mbox) {
|
|
||||||
logger("Mail: mbox");
|
|
||||||
|
|
||||||
$msgs = email_poll($mbox,$contact['addr']);
|
|
||||||
|
|
||||||
if(count($msgs)) {
|
|
||||||
logger("Mail: Parsing ".count($msgs)." mails.");
|
|
||||||
|
|
||||||
foreach($msgs as $msg_uid) {
|
|
||||||
logger("Mail: Parsing mail ".$msg_uid);
|
|
||||||
|
|
||||||
$datarray = array();
|
|
||||||
$meta = email_msg_meta($mbox,$msg_uid);
|
|
||||||
$headers = email_msg_headers($mbox,$msg_uid);
|
|
||||||
|
|
||||||
// look for a 'references' header and try and match with a parent item we have locally.
|
|
||||||
|
|
||||||
$raw_refs = ((x($headers,'references')) ? str_replace("\t",'',$headers['references']) : '');
|
|
||||||
$datarray['uri'] = msgid2iri(trim($meta->message_id,'<>'));
|
|
||||||
|
|
||||||
if($raw_refs) {
|
|
||||||
$refs_arr = explode(' ', $raw_refs);
|
|
||||||
if(count($refs_arr)) {
|
|
||||||
for($x = 0; $x < count($refs_arr); $x ++)
|
|
||||||
$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",
|
|
||||||
intval($importer_uid)
|
|
||||||
);
|
|
||||||
if(count($r))
|
|
||||||
$datarray['parent-uri'] = $r[0]['uri'];
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if(! x($datarray,'parent-uri'))
|
|
||||||
$datarray['parent-uri'] = $datarray['uri'];
|
|
||||||
|
|
||||||
// Have we seen it before?
|
|
||||||
$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
|
|
||||||
intval($importer_uid),
|
|
||||||
dbesc($datarray['uri'])
|
|
||||||
);
|
|
||||||
|
|
||||||
if(count($r)) {
|
|
||||||
logger("Mail: Seen before ".$msg_uid);
|
|
||||||
if($meta->deleted && ! $r[0]['deleted']) {
|
|
||||||
q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
intval($r[0]['id'])
|
|
||||||
);
|
|
||||||
}
|
|
||||||
switch ($mailconf[0]['action']) {
|
|
||||||
case 0:
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
logger("Mail: Deleting ".$msg_uid);
|
|
||||||
imap_delete($mbox, $msg_uid, FT_UID);
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
logger("Mail: Mark as seen ".$msg_uid);
|
|
||||||
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']);
|
|
||||||
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
|
|
||||||
if ($mailconf[0]['movetofolder'] != "")
|
|
||||||
imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Decoding the header
|
|
||||||
$subject = imap_mime_header_decode($meta->subject);
|
|
||||||
$datarray['title'] = "";
|
|
||||||
foreach($subject as $subpart)
|
|
||||||
if ($subpart->charset != "default")
|
|
||||||
$datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text);
|
|
||||||
else
|
|
||||||
$datarray['title'] .= $subpart->text;
|
|
||||||
|
|
||||||
$datarray['title'] = notags(trim($datarray['title']));
|
|
||||||
|
|
||||||
//$datarray['title'] = notags(trim($meta->subject));
|
|
||||||
$datarray['created'] = datetime_convert('UTC','UTC',$meta->date);
|
|
||||||
|
|
||||||
// Is it reply?
|
|
||||||
$reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or
|
|
||||||
(substr(strtolower($datarray['title']), 0, 3) == "re-") or
|
|
||||||
(raw_refs != ""));
|
|
||||||
|
|
||||||
$r = email_get_msg($mbox,$msg_uid, $reply);
|
|
||||||
if(! $r) {
|
|
||||||
logger("Mail: can't fetch msg ".$msg_uid);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$datarray['body'] = escape_tags($r['body']);
|
|
||||||
|
|
||||||
logger("Mail: Importing ".$msg_uid);
|
|
||||||
|
|
||||||
// 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
|
|
||||||
|
|
||||||
if(! stristr($meta->from,$contact['addr'])) {
|
|
||||||
$from = imap_mime_header_decode($meta->from);
|
|
||||||
$fromdecoded = "";
|
|
||||||
foreach($from as $frompart)
|
|
||||||
if ($frompart->charset != "default")
|
|
||||||
$fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text);
|
|
||||||
else
|
|
||||||
$fromdecoded .= $frompart->text;
|
|
||||||
|
|
||||||
$datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body'];
|
|
||||||
}
|
|
||||||
|
|
||||||
$datarray['uid'] = $importer_uid;
|
|
||||||
$datarray['contact-id'] = $contact['id'];
|
|
||||||
if($datarray['parent-uri'] === $datarray['uri'])
|
|
||||||
$datarray['private'] = 1;
|
|
||||||
if(($contact['network'] === NETWORK_MAIL) && (! get_pconfig($importer_uid,'system','allow_public_email_replies'))) {
|
|
||||||
$datarray['private'] = 1;
|
|
||||||
$datarray['allow_cid'] = '<' . $contact['id'] . '>';
|
|
||||||
}
|
|
||||||
$datarray['author-name'] = $contact['name'];
|
|
||||||
$datarray['author-link'] = 'mailbox';
|
|
||||||
$datarray['author-avatar'] = $contact['photo'];
|
|
||||||
|
|
||||||
$stored_item = item_store($datarray);
|
|
||||||
q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d",
|
|
||||||
dbesc($datarray['parent-uri']),
|
|
||||||
intval($importer_uid)
|
|
||||||
);
|
|
||||||
q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
|
|
||||||
intval($stored_item)
|
|
||||||
);
|
|
||||||
switch ($mailconf[0]['action']) {
|
|
||||||
case 0:
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
logger("Mail: Deleting ".$msg_uid);
|
|
||||||
imap_delete($mbox, $msg_uid, FT_UID);
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
logger("Mail: Mark as seen ".$msg_uid);
|
|
||||||
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']);
|
|
||||||
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
|
|
||||||
if ($mailconf[0]['movetofolder'] != "")
|
|
||||||
imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
imap_close($mbox);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
elseif($contact['network'] === NETWORK_FACEBOOK) {
|
|
||||||
// This is picked up by the Facebook plugin on a cron hook.
|
|
||||||
// Ignored here.
|
|
||||||
}
|
|
||||||
|
|
||||||
if($xml) {
|
|
||||||
logger('poller: received xml : ' . $xml, LOGGER_DATA);
|
|
||||||
|
|
||||||
if(! strstr($xml,'<?xml')) {
|
|
||||||
logger('poller: post_handshake: response from ' . $url . ' did not contain XML.');
|
|
||||||
$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
intval($contact['id'])
|
|
||||||
);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
consume_feed($xml,$importer,$contact,$hub,1,2);
|
|
||||||
|
|
||||||
$hubmode = 'subscribe';
|
|
||||||
if($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly'])
|
|
||||||
$hubmode = 'unsubscribe';
|
|
||||||
|
|
||||||
if((strlen($hub)) && ($hub_update) && ($contact['rel'] != CONTACT_IS_FOLLOWER)) {
|
|
||||||
logger('poller: hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
|
|
||||||
$hubs = explode(',', $hub);
|
|
||||||
if(count($hubs)) {
|
|
||||||
foreach($hubs as $h) {
|
|
||||||
$h = trim($h);
|
|
||||||
if(! strlen($h))
|
|
||||||
continue;
|
|
||||||
subscribe_to_hub($h,$importer,$contact,$hubmode);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$updated = datetime_convert();
|
|
||||||
|
|
||||||
$r = q("UPDATE `contact` SET `last-update` = '%s', `success_update` = '%s' WHERE `id` = %d LIMIT 1",
|
|
||||||
dbesc($updated),
|
|
||||||
dbesc($updated),
|
|
||||||
intval($contact['id'])
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
// load current friends if possible.
|
|
||||||
|
|
||||||
if($contact['poco']) {
|
|
||||||
$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,$contact['poco']);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// loop - next contact
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -235,6 +235,7 @@ function admin_page_site_post(&$a){
|
||||||
$proxyuser = ((x($_POST,'proxyuser')) ? notags(trim($_POST['proxyuser'])) : '');
|
$proxyuser = ((x($_POST,'proxyuser')) ? notags(trim($_POST['proxyuser'])) : '');
|
||||||
$proxy = ((x($_POST,'proxy')) ? notags(trim($_POST['proxy'])) : '');
|
$proxy = ((x($_POST,'proxy')) ? notags(trim($_POST['proxy'])) : '');
|
||||||
$timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60);
|
$timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60);
|
||||||
|
$delivery_interval = ((x($_POST,'delivery_interval'))? intval(trim($_POST['delivery_interval'])) : 0);
|
||||||
$dfrn_only = ((x($_POST,'dfrn_only')) ? True : False);
|
$dfrn_only = ((x($_POST,'dfrn_only')) ? True : False);
|
||||||
$ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False);
|
$ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False);
|
||||||
$diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False);
|
$diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False);
|
||||||
|
|
@ -281,7 +282,7 @@ function admin_page_site_post(&$a){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
set_config('system','ssl_policy',$ssl_policy);
|
set_config('system','ssl_policy',$ssl_policy);
|
||||||
|
set_config('system','delivery_interval',$delivery_interval);
|
||||||
set_config('config','sitename',$sitename);
|
set_config('config','sitename',$sitename);
|
||||||
if ($banner==""){
|
if ($banner==""){
|
||||||
// don't know why, but del_config doesn't work...
|
// don't know why, but del_config doesn't work...
|
||||||
|
|
@ -425,6 +426,7 @@ function admin_page_site(&$a) {
|
||||||
'$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""),
|
'$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""),
|
||||||
'$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""),
|
'$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""),
|
||||||
'$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")),
|
'$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")),
|
||||||
|
'$delivery_interval' => array('delivery_interval', t("Delivery interval"), (x(get_config('system','delivery_interval'))?get_config('system','delivery_interval'):2), t("Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.")),
|
||||||
|
|
||||||
'$form_security_token' => get_form_security_token("admin_site"),
|
'$form_security_token' => get_form_security_token("admin_site"),
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,8 @@ function profile_init(&$a) {
|
||||||
|
|
||||||
profile_load($a,$which,$profile);
|
profile_load($a,$which,$profile);
|
||||||
|
|
||||||
|
$userblock = (($a->profile['hidewall'] && (! local_user()) && (! remote_user())) ? true : false);
|
||||||
|
|
||||||
if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
|
if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
|
||||||
$a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
|
$a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
|
||||||
}
|
}
|
||||||
|
|
@ -41,8 +43,8 @@ function profile_init(&$a) {
|
||||||
$delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
|
$delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
|
||||||
$a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
|
$a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
|
||||||
}
|
}
|
||||||
|
// site block
|
||||||
if(! $blocked) {
|
if((! $blocked) && (! $userblock)) {
|
||||||
$keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
|
$keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
|
||||||
$keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords);
|
$keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords);
|
||||||
if(strlen($keywords))
|
if(strlen($keywords))
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@
|
||||||
|
|
||||||
<ul class='admin linklist'>
|
<ul class='admin linklist'>
|
||||||
<li class='admin link button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
|
<li class='admin link button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
|
||||||
|
<li class='admin link button $admin.update.2'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -80,6 +80,7 @@
|
||||||
{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
|
{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
|
||||||
{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
|
{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
|
||||||
{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
|
{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
|
||||||
|
{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
|
||||||
{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
|
{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
|
||||||
|
|
||||||
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
|
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<ul class="tabs">
|
<ul class="tabs">
|
||||||
{{ for $tabs as $tab }}
|
{{ for $tabs as $tab }}
|
||||||
<li><a href="$tab.url" class="tab button $tab.sel">$tab.label</a></li>
|
<li><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
|
||||||
{{ endfor }}
|
{{ endfor }}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -1431,7 +1431,7 @@ transition: all 0.2s ease-in-out;
|
||||||
|
|
||||||
.wall-item-comment-wrapper {
|
.wall-item-comment-wrapper {
|
||||||
margin: 1px 5px 5px 80px;
|
margin: 1px 5px 5px 80px;
|
||||||
background-color: #fff;
|
background-color: #444;
|
||||||
width: 500px;
|
width: 500px;
|
||||||
}
|
}
|
||||||
.wall-item-comment-wrapper .comment-edit-photo {
|
.wall-item-comment-wrapper .comment-edit-photo {
|
||||||
|
|
@ -1442,14 +1442,14 @@ transition: all 0.2s ease-in-out;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
color: #999999;
|
color: #999999;
|
||||||
border: 1px solid #DDD;
|
border: 1px solid #2e2e2f;
|
||||||
padding: 0.3em;
|
padding: 0.3em;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
}
|
}
|
||||||
.wall-item-comment-wrapper .comment-edit-text-full {
|
.wall-item-comment-wrapper .comment-edit-text-full {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
height: 4em;
|
height: 4em;
|
||||||
color: #2e2f2e;
|
color: #eec;
|
||||||
border: 1px solid #2e2f2e;
|
border: 1px solid #2e2f2e;
|
||||||
}
|
}
|
||||||
.comment-edit-preview {
|
.comment-edit-preview {
|
||||||
|
|
@ -1596,8 +1596,8 @@ transition: all 0.2s ease-in-out;
|
||||||
height: 2.0em;
|
height: 2.0em;
|
||||||
width: 99%;
|
width: 99%;
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
color: #999999;
|
color: #eec;
|
||||||
border: 1px solid #DDD;
|
border: 1px solid #444;
|
||||||
padding: 0.3em;
|
padding: 0.3em;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -540,7 +540,7 @@ header #banner a:active,
|
||||||
header #banner a:visited,
|
header #banner a:visited,
|
||||||
header #banner a:link,
|
header #banner a:link,
|
||||||
header #banner a:hover {
|
header #banner a:hover {
|
||||||
color: #2e2f2e;
|
color: #eec;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
outline: none;
|
outline: none;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
|
|
@ -661,7 +661,7 @@ nav .nav-menu-icon {
|
||||||
border-radius: 5px 5px 0 0;
|
border-radius: 5px 5px 0 0;
|
||||||
}
|
}
|
||||||
nav .nav-menu-icon:hover {
|
nav .nav-menu-icon:hover {
|
||||||
background-color: #eec;
|
background-color: #308dbf;
|
||||||
position: relative;
|
position: relative;
|
||||||
height: 22px;
|
height: 22px;
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
|
|
@ -776,7 +776,7 @@ nav #nav-apps-link.selected {
|
||||||
}
|
}
|
||||||
|
|
||||||
.notify-seen {
|
.notify-seen {
|
||||||
background: none repeat scroll 0 0 #DDDDDD;
|
background: none repeat scroll 0 0 #666;
|
||||||
}
|
}
|
||||||
|
|
||||||
ul.menu-popup {
|
ul.menu-popup {
|
||||||
|
|
@ -1424,7 +1424,7 @@ transition: all 0.2s ease-in-out;
|
||||||
.wall-item-comment-wrapper .comment-edit-text-full {
|
.wall-item-comment-wrapper .comment-edit-text-full {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
height: 4em;
|
height: 4em;
|
||||||
color: #2e302;
|
color: #eec;
|
||||||
border: 1px solid #2e302;
|
border: 1px solid #2e302;
|
||||||
}
|
}
|
||||||
.comment-edit-preview {
|
.comment-edit-preview {
|
||||||
|
|
@ -1571,10 +1571,11 @@ transition: all 0.2s ease-in-out;
|
||||||
height: 2.0em;
|
height: 2.0em;
|
||||||
width: 99%;
|
width: 99%;
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
color: #999999;
|
color: #eec;
|
||||||
border: 1px solid #DDD;
|
border: 1px solid #DDD;
|
||||||
padding: 0.3em;
|
padding: 0.3em;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
|
background: #444;
|
||||||
}
|
}
|
||||||
.grey
|
.grey
|
||||||
{
|
{
|
||||||
|
|
@ -1667,6 +1668,7 @@ transition: all 0.2s ease-in-out;
|
||||||
margin: 0 0 5px;
|
margin: 0 0 5px;
|
||||||
width: 60%;
|
width: 60%;
|
||||||
border: 1px solid #d2d2d2;
|
border: 1px solid #d2d2d2;
|
||||||
|
background: #444;
|
||||||
}
|
}
|
||||||
#profile-jot-form #jot-title:-webkit-input-placeholder {
|
#profile-jot-form #jot-title:-webkit-input-placeholder {
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
|
|
|
||||||
|
|
@ -1671,6 +1671,7 @@ body .pageheader{
|
||||||
height: 2.0em;
|
height: 2.0em;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
|
background: #444;
|
||||||
color: #999999;
|
color: #999999;
|
||||||
border: 1px solid #DDD;
|
border: 1px solid #DDD;
|
||||||
padding: 0.3em;
|
padding: 0.3em;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue