X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fonepoll.php;h=9052937fdca03d05bd713107d70b9742edd35389;hb=15f43d8ca3be780e6ee7117696acaa7e198a096a;hp=f38f6b4c61d88fbf54528267d3940e52f64530d5;hpb=da9f20f3899ff3cc53e4f8c61ee0de0bf64a4ab7;p=friendica.git diff --git a/include/onepoll.php b/include/onepoll.php index f38f6b4c61..9052937fdc 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -58,9 +58,9 @@ function onepoll_run(&$argv, &$argc){ } // Test - $lockpath = get_config('system','lockpath'); + $lockpath = get_lockpath(); if ($lockpath != '') { - $pidfile = new pidfile($lockpath, 'onepoll'.$contact_id.'.lck'); + $pidfile = new pidfile($lockpath, 'onepoll'.$contact_id); if($pidfile->is_already_running()) { logger("onepoll: Already running for contact ".$contact_id); exit; @@ -76,7 +76,7 @@ function onepoll_run(&$argv, &$argc){ $contacts = q("SELECT `contact`.* FROM `contact` WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != '' - AND NOT `network` IN ( '%s', '%s' ) + AND NOT `network` IN ( '%s', '%s', '%s' ) AND `contact`.`id` = %d AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 AND `contact`.`archive` = 0 LIMIT 1", @@ -84,6 +84,7 @@ function onepoll_run(&$argv, &$argc){ intval(CONTACT_IS_FRIEND), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_FACEBOOK), + dbesc(NETWORK_PUMPIO), intval($contact_id) ); @@ -110,8 +111,8 @@ function onepoll_run(&$argv, &$argc){ $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", + + $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", intval($importer_uid) ); if(! count($r)) @@ -121,14 +122,14 @@ function onepoll_run(&$argv, &$argc){ logger("onepoll: poll: ({$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}"); - $last_update = (($contact['last-update'] === '0000-00-00 00:00:00') + $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; @@ -141,12 +142,12 @@ function onepoll_run(&$argv, &$argc){ // But this may be our first communication, so set the writable flag if it isn't set already. if(! intval($contact['writable'])) - q("update contact set writable = 1 where id = %d limit 1", intval($contact['id'])); + q("update contact set writable = 1 where id = %d", intval($contact['id'])); - $url = $contact['poll'] . '?dfrn_id=' . $idtosend - . '&dfrn_version=' . DFRN_PROTOCOL_VERSION - . '&type=data&last_update=' . $last_update + $url = $contact['poll'] . '?dfrn_id=' . $idtosend + . '&dfrn_version=' . DFRN_PROTOCOL_VERSION + . '&type=data&last_update=' . $last_update . '&perm=' . $perm ; $handshake_xml = fetch_url($url); @@ -159,13 +160,13 @@ function onepoll_run(&$argv, &$argc){ 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. + // 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", + $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), intval($contact['id']) ); @@ -178,7 +179,7 @@ function onepoll_run(&$argv, &$argc){ mark_for_death($contact); - $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1", + $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), intval($contact['id']) ); @@ -187,7 +188,7 @@ function onepoll_run(&$argv, &$argc){ $res = parse_xml_string($handshake_xml); - + if(intval($res->status) == 1) { logger("poller: $url replied status 1 - marking for death "); @@ -195,7 +196,7 @@ function onepoll_run(&$argv, &$argc){ // set the last-update so we don't keep polling - $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1", + $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), intval($contact['id']) ); @@ -212,7 +213,7 @@ function onepoll_run(&$argv, &$argc){ return; if(((float) $res->dfrn_version > 2.21) && ($contact['poco'] == '')) { - q("update contact set poco = '%s' where id = %d limit 1", + q("update contact set poco = '%s' where id = %d", dbesc(str_replace('/profile/','/poco/', $contact['url'])), intval($contact['id']) ); @@ -266,7 +267,7 @@ function onepoll_run(&$argv, &$argc){ $stat_writeable = 1; if($stat_writeable != $contact['writable']) { - q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1", + q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d", intval($stat_writeable), intval($contact['id']) ); @@ -304,7 +305,7 @@ function onepoll_run(&$argv, &$argc){ unset($password); logger("Mail: Connect to " . $mailconf[0]['user']); if($mbox) { - q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", + q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d", dbesc(datetime_convert()), intval($mailconf[0]['id']), intval($importer_uid) @@ -329,6 +330,8 @@ function onepoll_run(&$argv, &$argc){ logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA); $datarray = array(); + $datarray['verb'] = ACTIVITY_POST; + $datarray['object-type'] = ACTIVITY_OBJ_NOTE; // $meta = email_msg_meta($mbox,$msg_uid); // $headers = email_msg_headers($mbox,$msg_uid); @@ -346,7 +349,7 @@ function onepoll_run(&$argv, &$argc){ // Only delete when mails aren't automatically moved or deleted if (($mailconf[0]['action'] != 1) AND ($mailconf[0]['action'] != 3)) if($meta->deleted && ! $r[0]['deleted']) { - q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1", + q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), intval($r[0]['id']) ); @@ -422,7 +425,6 @@ function onepoll_run(&$argv, &$argc){ // 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 MATCH (`title`) AGAINST ('".'"%s"'."' IN BOOLEAN MODE) AND `uid` = %d ORDER BY `created` DESC LIMIT 1", $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d ORDER BY `created` DESC LIMIT 1", dbesc(protect_sprintf($datarray['title'])), intval($importer_uid)); @@ -495,7 +497,7 @@ function onepoll_run(&$argv, &$argc){ dbesc($datarray['parent-uri']), intval($importer_uid) ); - q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1", + q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d", intval($stored_item) ); switch ($mailconf[0]['action']) { @@ -526,13 +528,16 @@ function onepoll_run(&$argv, &$argc){ elseif($contact['network'] === NETWORK_FACEBOOK) { // This is picked up by the Facebook plugin on a cron hook. // Ignored here. + } elseif($contact['network'] === NETWORK_PUMPIO) { + // This is picked up by the pump.io plugin on a cron hook. + // Ignored here. } if($xml) { logger('poller: received xml : ' . $xml, LOGGER_DATA); if((! strstr($xml,'