mirror of
https://github.com/friendica/friendica
synced 2025-04-26 00:30:12 +00:00
Michael Vogel
GitHub
commit
b5d24b5ac3
14 changed files with 428 additions and 390 deletions
|
|
@ -15,6 +15,7 @@ use Friendica\Core\Cache;
|
|||
use Friendica\Core\Config;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Object\Profile;
|
||||
use Friendica\Protocol\Email;
|
||||
use Friendica\Util\XML;
|
||||
|
||||
use dba;
|
||||
|
|
@ -22,7 +23,6 @@ use DomXPath;
|
|||
use DOMDocument;
|
||||
|
||||
require_once 'include/feed.php';
|
||||
require_once 'include/email.php';
|
||||
require_once 'include/network.php';
|
||||
|
||||
/**
|
||||
|
|
@ -1517,16 +1517,16 @@ class Probe
|
|||
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
|
||||
|
||||
if (DBM::is_result($x) && DBM::is_result($r)) {
|
||||
$mailbox = construct_mailbox_name($r[0]);
|
||||
$mailbox = Email::constructMailboxName($r[0]);
|
||||
$password = '';
|
||||
openssl_private_decrypt(hex2bin($r[0]['pass']), $password, $x[0]['prvkey']);
|
||||
$mbox = email_connect($mailbox, $r[0]['user'], $password);
|
||||
$mbox = Email::connect($mailbox, $r[0]['user'], $password);
|
||||
if (!mbox) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
$msgs = email_poll($mbox, $uri);
|
||||
$msgs = Email::poll($mbox, $uri);
|
||||
logger('searching '.$uri.', '.count($msgs).' messages found.', LOGGER_DEBUG);
|
||||
|
||||
if (!count($msgs)) {
|
||||
|
|
@ -1546,7 +1546,7 @@ class Probe
|
|||
$data["notify"] = 'smtp '.random_string();
|
||||
$data["poll"] = 'email '.random_string();
|
||||
|
||||
$x = email_msg_meta($mbox, $msgs[0]);
|
||||
$x = Email::messageMeta($mbox, $msgs[0]);
|
||||
if (stristr($x[0]->from, $uri)) {
|
||||
$adr = imap_rfc822_parse_adrlist($x[0]->from, '');
|
||||
} elseif (stristr($x[0]->to, $uri)) {
|
||||
|
|
|
|||
377
src/Protocol/Email.php
Normal file
377
src/Protocol/Email.php
Normal file
|
|
@ -0,0 +1,377 @@
|
|||
<?php
|
||||
/**
|
||||
* @file src/Protocol/Email.php
|
||||
*/
|
||||
namespace Friendica\Protocol;
|
||||
|
||||
require_once 'include/html2plain.php';
|
||||
require_once 'include/msgclean.php';
|
||||
require_once 'include/quoteconvert.php';
|
||||
|
||||
/**
|
||||
* @brief Email class
|
||||
*/
|
||||
class Email
|
||||
{
|
||||
/**
|
||||
* @param string $mailbox The mailbox name
|
||||
* @param string $username The username
|
||||
* @param string $password The password
|
||||
* @return object
|
||||
*/
|
||||
public static function connect($mailbox, $username, $password)
|
||||
{
|
||||
if (! function_exists('imap_open')) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$mbox = @imap_open($mailbox, $username, $password);
|
||||
|
||||
return $mbox;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param object $mbox mailbox
|
||||
* @param string $email_addr email
|
||||
* @return array
|
||||
*/
|
||||
public static function poll($mbox, $email_addr)
|
||||
{
|
||||
if (! ($mbox && $email_addr))
|
||||
return array();
|
||||
|
||||
$search1 = @imap_search($mbox, 'FROM "' . $email_addr . '"', SE_UID);
|
||||
if (!$search1) {
|
||||
$search1 = array();
|
||||
} else {
|
||||
logger("Found mails from ".$email_addr, LOGGER_DEBUG);
|
||||
}
|
||||
|
||||
$search2 = @imap_search($mbox, 'TO "' . $email_addr . '"', SE_UID);
|
||||
if (!$search2) {
|
||||
$search2 = array();
|
||||
} else {
|
||||
logger("Found mails to ".$email_addr, LOGGER_DEBUG);
|
||||
}
|
||||
|
||||
$search3 = @imap_search($mbox, 'CC "' . $email_addr . '"', SE_UID);
|
||||
if (!$search3) {
|
||||
$search3 = array();
|
||||
} else {
|
||||
logger("Found mails cc ".$email_addr, LOGGER_DEBUG);
|
||||
}
|
||||
|
||||
$res = array_unique(array_merge($search1, $search2, $search3));
|
||||
|
||||
return $res;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $mailacct mail account
|
||||
* @return object
|
||||
*/
|
||||
public static function constructMailboxName($mailacct)
|
||||
{
|
||||
$ret = '{' . $mailacct['server'] . ((intval($mailacct['port'])) ? ':' . $mailacct['port'] : '');
|
||||
$ret .= (($mailacct['ssltype']) ? '/' . $mailacct['ssltype'] . '/novalidate-cert' : '');
|
||||
$ret .= '}' . $mailacct['mailbox'];
|
||||
return $ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param object $mbox mailbox
|
||||
* @param integer $uid user id
|
||||
* @return mixed
|
||||
*/
|
||||
public static function messageMeta($mbox, $uid)
|
||||
{
|
||||
$ret = (($mbox && $uid) ? @imap_fetch_overview($mbox, $uid, FT_UID) : array(array())); // POSSIBLE CLEANUP --> array(array()) is probably redundant now
|
||||
return (count($ret)) ? $ret : array();
|
||||
}
|
||||
|
||||
/**
|
||||
* @param object $mbox mailbox
|
||||
* @param integer $uid user id
|
||||
* @param string $reply reply
|
||||
* @return array
|
||||
*/
|
||||
public static function getMessage($mbox, $uid, $reply)
|
||||
{
|
||||
$ret = array();
|
||||
|
||||
$struc = (($mbox && $uid) ? @imap_fetchstructure($mbox, $uid, FT_UID) : null);
|
||||
|
||||
if (! $struc) {
|
||||
return $ret;
|
||||
}
|
||||
|
||||
if (! $struc->parts) {
|
||||
$ret['body'] = self::messageGetPart($mbox, $uid, $struc, 0, 'html');
|
||||
$html = $ret['body'];
|
||||
|
||||
if (trim($ret['body']) == '') {
|
||||
$ret['body'] = self::messageGetPart($mbox, $uid, $struc, 0, 'plain');
|
||||
} else {
|
||||
$ret['body'] = html2bbcode($ret['body']);
|
||||
}
|
||||
} else {
|
||||
$text = '';
|
||||
$html = '';
|
||||
foreach ($struc->parts as $ptop => $p) {
|
||||
$x = self::messageGetPart($mbox, $uid, $p, $ptop + 1, 'plain');
|
||||
if ($x) {
|
||||
$text .= $x;
|
||||
}
|
||||
|
||||
$x = self::messageGetPart($mbox, $uid, $p, $ptop + 1, 'html');
|
||||
if ($x) {
|
||||
$html .= $x;
|
||||
}
|
||||
}
|
||||
if (trim($html) != '') {
|
||||
$ret['body'] = html2bbcode($html);
|
||||
} else {
|
||||
$ret['body'] = $text;
|
||||
}
|
||||
}
|
||||
|
||||
$ret['body'] = removegpg($ret['body']);
|
||||
$msg = removesig($ret['body']);
|
||||
$ret['body'] = $msg['body'];
|
||||
$ret['body'] = convertquote($ret['body'], $reply);
|
||||
|
||||
if (trim($html) != '') {
|
||||
$ret['body'] = removelinebreak($ret['body']);
|
||||
}
|
||||
|
||||
$ret['body'] = unifyattributionline($ret['body']);
|
||||
|
||||
return $ret;
|
||||
}
|
||||
|
||||
// At the moment - only return plain/text.
|
||||
// Later we'll repackage inline images as data url's and make the HTML safe
|
||||
/**
|
||||
* @param object $mbox mailbox
|
||||
* @param integer $uid user id
|
||||
* @param object $p parts
|
||||
* @param integer $partno part number
|
||||
* @param string $subtype sub type
|
||||
* @return string
|
||||
*/
|
||||
private static function messageGetPart($mbox, $uid, $p, $partno, $subtype)
|
||||
{
|
||||
// $partno = '1', '2', '2.1', '2.1.3', etc for multipart, 0 if simple
|
||||
global $htmlmsg,$plainmsg,$charset,$attachments;
|
||||
|
||||
//echo $partno."\n";
|
||||
|
||||
// DECODE DATA
|
||||
$data = ($partno)
|
||||
? @imap_fetchbody($mbox, $uid, $partno, FT_UID|FT_PEEK)
|
||||
: @imap_body($mbox, $uid, FT_UID|FT_PEEK);
|
||||
|
||||
// Any part may be encoded, even plain text messages, so check everything.
|
||||
if ($p->encoding==4) {
|
||||
$data = quoted_printable_decode($data);
|
||||
} elseif ($p->encoding==3) {
|
||||
$data = base64_decode($data);
|
||||
}
|
||||
|
||||
// PARAMETERS
|
||||
// get all parameters, like charset, filenames of attachments, etc.
|
||||
$params = array();
|
||||
if ($p->parameters) {
|
||||
foreach ($p->parameters as $x) {
|
||||
$params[strtolower($x->attribute)] = $x->value;
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($p->dparameters) && $p->dparameters) {
|
||||
foreach ($p->dparameters as $x) {
|
||||
$params[strtolower($x->attribute)] = $x->value;
|
||||
}
|
||||
}
|
||||
|
||||
// ATTACHMENT
|
||||
// Any part with a filename is an attachment,
|
||||
// so an attached text file (type 0) is not mistaken as the message.
|
||||
|
||||
if ((isset($params['filename']) && $params['filename']) || (isset($params['name']) && $params['name'])) {
|
||||
// filename may be given as 'Filename' or 'Name' or both
|
||||
$filename = ($params['filename'])? $params['filename'] : $params['name'];
|
||||
// filename may be encoded, so see imap_mime_header_decode()
|
||||
$attachments[$filename] = $data; // this is a problem if two files have same name
|
||||
}
|
||||
|
||||
// TEXT
|
||||
if ($p->type == 0 && $data) {
|
||||
// Messages may be split in different parts because of inline attachments,
|
||||
// so append parts together with blank row.
|
||||
if (strtolower($p->subtype)==$subtype) {
|
||||
$data = iconv($params['charset'], 'UTF-8//IGNORE', $data);
|
||||
return (trim($data) ."\n\n");
|
||||
} else {
|
||||
$data = '';
|
||||
}
|
||||
|
||||
// $htmlmsg .= $data ."<br><br>";
|
||||
$charset = $params['charset']; // assume all parts are same charset
|
||||
}
|
||||
|
||||
// EMBEDDED MESSAGE
|
||||
// Many bounce notifications embed the original message as type 2,
|
||||
// but AOL uses type 1 (multipart), which is not handled here.
|
||||
// There are no PHP functions to parse embedded messages,
|
||||
// so this just appends the raw source to the main message.
|
||||
// elseif ($p->type==2 && $data) {
|
||||
// $plainmsg .= $data."\n\n";
|
||||
// }
|
||||
|
||||
// SUBPART RECURSION
|
||||
if (isset($p->parts) && $p->parts) {
|
||||
$x = "";
|
||||
foreach ($p->parts as $partno0 => $p2) {
|
||||
$x .= self::messageGetPart($mbox, $uid, $p2, $partno . '.' . ($partno0+1), $subtype); // 1.2, 1.2.1, etc.
|
||||
//if ($x) {
|
||||
// return $x;
|
||||
//}
|
||||
}
|
||||
return $x;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $in_str in string
|
||||
* @param string $charset character set
|
||||
* @return string
|
||||
*/
|
||||
public static function encodeHeader($in_str, $charset)
|
||||
{
|
||||
$out_str = $in_str;
|
||||
$need_to_convert = false;
|
||||
|
||||
for ($x = 0; $x < strlen($in_str); $x ++) {
|
||||
if ((ord($in_str[$x]) == 0) || ((ord($in_str[$x]) > 128))) {
|
||||
$need_to_convert = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (! $need_to_convert) {
|
||||
return $in_str;
|
||||
}
|
||||
|
||||
if ($out_str && $charset) {
|
||||
// define start delimimter, end delimiter and spacer
|
||||
$end = "?=";
|
||||
$start = "=?" . $charset . "?B?";
|
||||
$spacer = $end . "\r\n " . $start;
|
||||
|
||||
// determine length of encoded text within chunks
|
||||
// and ensure length is even
|
||||
$length = 75 - strlen($start) - strlen($end);
|
||||
|
||||
/*
|
||||
[EDIT BY danbrown AT php DOT net: The following
|
||||
is a bugfix provided by (gardan AT gmx DOT de)
|
||||
on 31-MAR-2005 with the following note:
|
||||
"This means: $length should not be even,
|
||||
but divisible by 4. The reason is that in
|
||||
base64-encoding 3 8-bit-chars are represented
|
||||
by 4 6-bit-chars. These 4 chars must not be
|
||||
split between two encoded words, according
|
||||
to RFC-2047.
|
||||
*/
|
||||
$length = $length - ($length % 4);
|
||||
|
||||
// encode the string and split it into chunks
|
||||
// with spacers after each chunk
|
||||
$out_str = base64_encode($out_str);
|
||||
$out_str = chunk_split($out_str, $length, $spacer);
|
||||
|
||||
// remove trailing spacer and
|
||||
// add start and end delimiters
|
||||
$spacer = preg_quote($spacer, '/');
|
||||
$out_str = preg_replace("/" . $spacer . "$/", "", $out_str);
|
||||
$out_str = $start . $out_str . $end;
|
||||
}
|
||||
return $out_str;
|
||||
}
|
||||
|
||||
/**
|
||||
* Function send is used by NETWORK_EMAIL and NETWORK_EMAIL2 code
|
||||
* (not to notify the user, but to send items to email contacts)
|
||||
*
|
||||
* @param string $addr address
|
||||
* @param string $subject subject
|
||||
* @param string $headers headers
|
||||
* @param array $item item
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
* @todo This could be changed to use the Emailer class
|
||||
*/
|
||||
public static function send($addr, $subject, $headers, $item)
|
||||
{
|
||||
//$headers .= 'MIME-Version: 1.0' . "\n";
|
||||
//$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
|
||||
//$headers .= 'Content-Type: text/plain; charset=UTF-8' . "\n";
|
||||
//$headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
|
||||
|
||||
$part = uniqid("", true);
|
||||
|
||||
$html = prepare_body($item);
|
||||
|
||||
$headers .= "Mime-Version: 1.0\n";
|
||||
$headers .= 'Content-Type: multipart/alternative; boundary="=_'.$part.'"'."\n\n";
|
||||
|
||||
$body = "\n--=_".$part."\n";
|
||||
$body .= "Content-Transfer-Encoding: 8bit\n";
|
||||
$body .= "Content-Type: text/plain; charset=utf-8; format=flowed\n\n";
|
||||
|
||||
$body .= html2plain($html)."\n";
|
||||
|
||||
$body .= "--=_".$part."\n";
|
||||
$body .= "Content-Transfer-Encoding: 8bit\n";
|
||||
$body .= "Content-Type: text/html; charset=utf-8\n\n";
|
||||
|
||||
$body .= '<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">'.$html."</body></html>\n";
|
||||
|
||||
$body .= "--=_".$part."--";
|
||||
|
||||
//$message = '<html><body>' . $html . '</body></html>';
|
||||
//$message = html2plain($html);
|
||||
logger('notifier: email delivery to ' . $addr);
|
||||
mail($addr, $subject, $body, $headers);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $iri string
|
||||
* @return string
|
||||
*/
|
||||
public static function iri2msgid($iri)
|
||||
{
|
||||
if (!strpos($iri, "@")) {
|
||||
$msgid = preg_replace("/urn:(\S+):(\S+)\.(\S+):(\d+):(\S+)/i", "urn!$1!$4!$5@$2.$3", $iri);
|
||||
} else {
|
||||
$msgid = $iri;
|
||||
}
|
||||
|
||||
return($msgid);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $msgid msgid
|
||||
* @return string
|
||||
*/
|
||||
public static function msgid2iri($msgid)
|
||||
{
|
||||
if (strpos($msgid, "@")) {
|
||||
$iri = preg_replace("/urn!(\S+)!(\d+)!(\S+)@(\S+)\.(\S+)/i", "urn:$1:$4.$5:$2:$3", $msgid);
|
||||
} else {
|
||||
$iri = $msgid;
|
||||
}
|
||||
|
||||
return($iri);
|
||||
}
|
||||
}
|
||||
|
|
@ -5,11 +5,10 @@
|
|||
namespace Friendica\Util;
|
||||
|
||||
use Friendica\Core\PConfig;
|
||||
|
||||
require_once 'include/email.php';
|
||||
use Friendica\Protocol\Email;
|
||||
|
||||
/**
|
||||
* @breif class to handle emailing
|
||||
* @brief class to handle emailing
|
||||
*/
|
||||
class Emailer
|
||||
{
|
||||
|
|
@ -38,8 +37,8 @@ class Emailer
|
|||
$email_textonly = PConfig::get($params['uid'], "system", "email_textonly");
|
||||
}
|
||||
|
||||
$fromName = email_header_encode(html_entity_decode($params['fromName'], ENT_QUOTES, 'UTF-8'), 'UTF-8');
|
||||
$messageSubject = email_header_encode(html_entity_decode($params['messageSubject'], ENT_QUOTES, 'UTF-8'), 'UTF-8');
|
||||
$fromName = Email::encodeHeader(html_entity_decode($params['fromName'], ENT_QUOTES, 'UTF-8'), 'UTF-8');
|
||||
$messageSubject = Email::encodeHeader(html_entity_decode($params['messageSubject'], ENT_QUOTES, 'UTF-8'), 'UTF-8');
|
||||
|
||||
// generate a mime boundary
|
||||
$mimeBoundary =rand(0, 9)."-"
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@ use Friendica\Database\DBM;
|
|||
use Friendica\Object\Contact;
|
||||
use Friendica\Protocol\Diaspora;
|
||||
use Friendica\Protocol\DFRN;
|
||||
use Friendica\Protocol\Email;
|
||||
|
||||
require_once 'include/queue_fn.php';
|
||||
require_once 'include/html2plain.php';
|
||||
require_once 'include/datetime.php';
|
||||
require_once 'include/items.php';
|
||||
require_once 'include/bbcode.php';
|
||||
require_once 'include/email.php';
|
||||
|
||||
/// @todo This is some ugly code that needs to be split into several methods
|
||||
|
||||
|
|
@ -418,36 +418,36 @@ class Delivery {
|
|||
if ($r1 && $r1[0]['reply_to'])
|
||||
$reply_to = $r1[0]['reply_to'];
|
||||
|
||||
$subject = (($it['title']) ? email_header_encode($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
|
||||
$subject = (($it['title']) ? Email::encodeHeader($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
|
||||
|
||||
// only expose our real email address to true friends
|
||||
|
||||
if (($contact['rel'] == CONTACT_IS_FRIEND) && !$contact['blocked']) {
|
||||
if ($reply_to) {
|
||||
$headers = 'From: '.email_header_encode($local_user[0]['username'],'UTF-8').' <'.$reply_to.'>'."\n";
|
||||
$headers = 'From: '.Email::encodeHeader($local_user[0]['username'],'UTF-8').' <'.$reply_to.'>'."\n";
|
||||
$headers .= 'Sender: '.$local_user[0]['email']."\n";
|
||||
} else {
|
||||
$headers = 'From: '.email_header_encode($local_user[0]['username'],'UTF-8').' <'.$local_user[0]['email'].'>'."\n";
|
||||
$headers = 'From: '.Email::encodeHeader($local_user[0]['username'],'UTF-8').' <'.$local_user[0]['email'].'>'."\n";
|
||||
}
|
||||
} else {
|
||||
$headers = 'From: '. email_header_encode($local_user[0]['username'],'UTF-8') .' <'. t('noreply') .'@'.$a->get_hostname() .'>'. "\n";
|
||||
$headers = 'From: '. Email::encodeHeader($local_user[0]['username'],'UTF-8') .' <'. t('noreply') .'@'.$a->get_hostname() .'>'. "\n";
|
||||
}
|
||||
|
||||
//if ($reply_to)
|
||||
// $headers .= 'Reply-to: '.$reply_to . "\n";
|
||||
|
||||
$headers .= 'Message-Id: <'. iri2msgid($it['uri']).'>'. "\n";
|
||||
$headers .= 'Message-Id: <'. Email::iri2msgid($it['uri']).'>'. "\n";
|
||||
|
||||
//logger("Mail: uri: ".$it['uri']." parent-uri ".$it['parent-uri'], LOGGER_DEBUG);
|
||||
//logger("Mail: Data: ".print_r($it, true), LOGGER_DEBUG);
|
||||
//logger("Mail: Data: ".print_r($it, true), LOGGER_DATA);
|
||||
|
||||
if ($it['uri'] !== $it['parent-uri']) {
|
||||
$headers .= "References: <".iri2msgid($it["parent-uri"]).">";
|
||||
$headers .= "References: <".Email::iri2msgid($it["parent-uri"]).">";
|
||||
|
||||
// If Threading is enabled, write down the correct parent
|
||||
if (($it["thr-parent"] != "") && ($it["thr-parent"] != $it["parent-uri"]))
|
||||
$headers .= " <".iri2msgid($it["thr-parent"]).">";
|
||||
$headers .= " <".Email::iri2msgid($it["thr-parent"]).">";
|
||||
$headers .= "\n";
|
||||
|
||||
if (!$it['title']) {
|
||||
|
|
@ -469,7 +469,7 @@ class Delivery {
|
|||
if (strncasecmp($subject,'RE:',3))
|
||||
$subject = 'Re: '.$subject;
|
||||
}
|
||||
email_send($addr, $subject, $headers, $it);
|
||||
Email::send($addr, $subject, $headers, $it);
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ require_once 'include/salmon.php';
|
|||
require_once 'include/datetime.php';
|
||||
require_once 'include/items.php';
|
||||
require_once 'include/bbcode.php';
|
||||
require_once 'include/email.php';
|
||||
|
||||
/*
|
||||
* This file was at one time responsible for doing all deliveries, but this caused
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ use Friendica\Core\Config;
|
|||
use Friendica\Core\PConfig;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Object\Contact;
|
||||
use Friendica\Protocol\Email;
|
||||
use Friendica\Protocol\PortableContact;
|
||||
use dba;
|
||||
|
||||
|
|
@ -20,7 +21,6 @@ Class OnePoll
|
|||
|
||||
require_once 'include/datetime.php';
|
||||
require_once 'include/items.php';
|
||||
require_once 'include/email.php';
|
||||
require_once 'include/queue_fn.php';
|
||||
|
||||
logger('onepoll: start');
|
||||
|
|
@ -328,10 +328,10 @@ Class OnePoll
|
|||
$condition = array("`server` != '' AND `uid` = ?", $importer_uid);
|
||||
$mailconf = dba::select('mailacct', array(), $condition, array('limit' => 1));
|
||||
if (DBM::is_result($x) && DBM::is_result($mailconf)) {
|
||||
$mailbox = construct_mailbox_name($mailconf);
|
||||
$mailbox = Email::constructMailboxName($mailconf);
|
||||
$password = '';
|
||||
openssl_private_decrypt(hex2bin($mailconf['pass']), $password, $x['prvkey']);
|
||||
$mbox = email_connect($mailbox, $mailconf['user'], $password);
|
||||
$mbox = Email::connect($mailbox, $mailconf['user'], $password);
|
||||
unset($password);
|
||||
logger("Mail: Connect to " . $mailconf['user']);
|
||||
if ($mbox) {
|
||||
|
|
@ -344,12 +344,12 @@ Class OnePoll
|
|||
}
|
||||
|
||||
if ($mbox) {
|
||||
$msgs = email_poll($mbox, $contact['addr']);
|
||||
$msgs = Email::poll($mbox, $contact['addr']);
|
||||
|
||||
if (count($msgs)) {
|
||||
logger("Mail: Parsing ".count($msgs)." mails from ".$contact['addr']." for ".$mailconf['user'], LOGGER_DEBUG);
|
||||
|
||||
$metas = email_msg_meta($mbox,implode(',', $msgs));
|
||||
$metas = Email::messageMeta($mbox, implode(',', $msgs));
|
||||
if (count($metas) != count($msgs)) {
|
||||
logger("onepoll: for " . $mailconf['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", LOGGER_DEBUG);
|
||||
} else {
|
||||
|
|
@ -361,10 +361,9 @@ Class OnePoll
|
|||
$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);
|
||||
// $meta = Email::messageMeta($mbox, $msg_uid);
|
||||
|
||||
$datarray['uri'] = msgid2iri(trim($meta->message_id, '<>'));
|
||||
$datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));
|
||||
|
||||
// Have we seen it before?
|
||||
$fields = array('deleted', 'id');
|
||||
|
|
@ -416,7 +415,7 @@ Class OnePoll
|
|||
$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]))) . "'";
|
||||
$refs_arr[$x] = "'" . Email::msgid2iri(str_replace(array('<', '>', ' '),array('', '', ''),dbesc($refs_arr[$x]))) . "'";
|
||||
}
|
||||
}
|
||||
$qstr = implode(',', $refs_arr);
|
||||
|
|
@ -466,7 +465,7 @@ Class OnePoll
|
|||
$datarray['parent-uri'] = $datarray['uri'];
|
||||
}
|
||||
|
||||
$r = email_get_msg($mbox, $msg_uid, $reply);
|
||||
$r = Email::getMessage($mbox, $msg_uid, $reply);
|
||||
if (!$r) {
|
||||
logger("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']);
|
||||
continue;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue