*/
namespace Friendica\Worker;
+use Friendica\BaseObject;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
+use Friendica\Database\dba;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\XML;
-use dba;
require_once 'include/dba.php';
class OnePoll
{
- public static function execute($contact_id = 0, $command = '') {
- global $a;
+ public static function execute($contact_id = 0, $command = '')
+ {
+ $a = BaseObject::getApp();
require_once 'include/items.php';
$last_updated = $contact['last-item'];
}
- $fields = ['last-item' => $last_updated, 'last-update' => $updated, 'success_update' => $updated];
+ $fields = ['last-item' => DateTimeFormat::utc($last_updated), 'last-update' => $updated, 'success_update' => $updated];
self::updateContact($contact, $fields);
Contact::unmarkForArchival($contact);
} else {
$ret = Network::curl($url);
- if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+ if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
// set the last-update so we don't keep polling
dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
Contact::markForArchival($contact);
$ret = Network::curl($contact['poll'], false, $redirects, ['cookiejar' => $cookiejar]);
unlink($cookiejar);
- if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+ if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
// set the last-update so we don't keep polling
dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
Contact::markForArchival($contact);
// Have we seen it before?
$fields = ['deleted', 'id'];
$condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']];
- $item = dba::selectFirst('item', $fields, $condition);
+ $item = Item::selectFirst($fields, $condition);
if (DBM::is_result($item)) {
logger("Mail: Seen before ".$msg_uid." for ".$mailconf['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],LOGGER_DEBUG);
$refs_arr = explode(' ', $raw_refs);
if (count($refs_arr)) {
for ($x = 0; $x < count($refs_arr); $x ++) {
- $refs_arr[$x] = "'" . Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''],dbesc($refs_arr[$x]))) . "'";
+ $refs_arr[$x] = Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''], $refs_arr[$x]));
}
}
- $qstr = implode(',', $refs_arr);
- $r = q("SELECT `parent-uri` FROM `item` USE INDEX (`uid_uri`) WHERE `uri` IN ($qstr) AND `uid` = %d LIMIT 1",
- intval($importer_uid)
- );
- if (DBM::is_result($r)) {
- $datarray['parent-uri'] = $r[0]['parent-uri']; // Set the parent as the top-level item
+ $condition = ['uri' => $refs_arr, 'uid' => $importer_uid];
+ $parent = Item::selectFirst(['parent-uri'], $condition);
+ if (DBM::is_result($parent)) {
+ $datarray['parent-uri'] = $parent['parent-uri']; // Set the parent as the top-level item
}
}
// If it seems to be a reply but a header couldn't be found take the last message with matching subject
if (empty($datarray['parent-uri']) && $reply) {
- $r = q("SELECT `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),
- dbesc(NETWORK_MAIL));
- if (DBM::is_result($r)) {
- $datarray['parent-uri'] = $r[0]['parent-uri'];
+ $condition = ['title' => $datarray['title'], 'uid' => importer_uid, 'network' => NETWORK_MAIL];
+ $params = ['order' => ['created' => true]];
+ $parent = Item::selectFirst(['parent-uri'], $condition, $params);
+ if (DBM::is_result($parent)) {
+ $datarray['parent-uri'] = $parent['parent-uri'];
}
}
return;
}
- private static function RemoveReply($subject) {
+ private static function RemoveReply($subject)
+ {
while (in_array(strtolower(substr($subject, 0, 3)), ["re:", "aw:"])) {
$subject = trim(substr($subject, 4));
}
* @param array $contact The personal contact entry
* @param array $fields The fields that are updated
*/
- private static function updateContact($contact, $fields) {
+ private static function updateContact($contact, $fields)
+ {
dba::update('contact', $fields, ['id' => $contact['id']]);
dba::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]);
}