From 27cbb830a7bd72f13181acc5999a6bed4f74f5ae Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Fri, 15 Apr 2011 23:40:43 -0700
Subject: [PATCH] more work on email contacts
---
boot.php | 2 +-
database.sql | 4 ++
include/{imap.php => email.php} | 29 ++++----
include/poller.php | 113 +++++++++++++++++++++-----------
update.php | 9 +++
5 files changed, 105 insertions(+), 52 deletions(-)
rename include/{imap.php => email.php} (83%)
diff --git a/boot.php b/boot.php
index 0c2c3163..eeaf5139 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
define ( 'FRIENDIKA_VERSION', '2.1.950' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
-define ( 'DB_UPDATE_VERSION', 1051 );
+define ( 'DB_UPDATE_VERSION', 1052 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
diff --git a/database.sql b/database.sql
index b88e5e5f..e134d743 100644
--- a/database.sql
+++ b/database.sql
@@ -64,6 +64,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
`issued-id` char(255) NOT NULL,
`dfrn-id` char(255) NOT NULL,
`url` char(255) NOT NULL,
+ `addr` char(255) NOT NULL,
`alias` char(255) NOT NULL,
`pubkey` text NOT NULL,
`prvkey` text NOT NULL,
@@ -508,6 +509,9 @@ CREATE TABLE IF NOT EXISTS `mailacct` (
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
`uid` INT NOT NULL,
`server` CHAR( 255 ) NOT NULL ,
+`port` INT NOT NULL,
+`ssltype` CHAR( 16 ) NOT NULL,
+`mailbox` CHAR( 255 ) NOT NULL,
`user` CHAR( 255 ) NOT NULL ,
`pass` CHAR( 255 ) NOT NULL ,
`reply_to` CHAR( 255 ) NOT NULL ,
diff --git a/include/imap.php b/include/email.php
similarity index 83%
rename from include/imap.php
rename to include/email.php
index 01872763..c7a006da 100644
--- a/include/imap.php
+++ b/include/email.php
@@ -1,28 +1,31 @@
<?php
-
-function f9_imap_connect($mailbox,$username,$password) {
-
+function email_connect($mailbox,$username,$password) {
if(! (local_user() && function_exists('imap_open')))
return false;
$mbox = imap_open($mailbox,$username,$password);
return $mbox;
-
}
+function email_poll($mbox,$email_addr) {
-function f9_imap_poll_from($mbox,$str) {
-
- if(! ($mbox && $str))
+ if(! ($mbox && $email_addr))
return false;
- $search = imap_search($mbox,'FROM "' . $str . '"', SE_UID);
-
+ $search = imap_search($mbox,'FROM "' . $email_addr . '"', SE_UID);
return $search;
}
-
+
+
+function construct_mailbox_name($mailacct) {
+ $ret = '{' . $mailacct['server'] . (($mailacct['port']) ? ':' . $mailacct['port'] : '');
+ $ret .= (($mailacct['ssltype']) ? '/' . $mailacct['ssltype'] . '/novalidate-cert' : '');
+ $ret .= '}' . $mailacct['mailbox'];
+ return $ret;
+}
+
function getmsg($mbox,$mid) {
// input $mbox = IMAP stream, $mid = message id
@@ -84,9 +87,9 @@ function getpart($mbox,$mid,$p,$partno) {
// Messages may be split in different parts because of inline attachments,
// so append parts together with blank row.
if (strtolower($p->subtype)=='plain')
- $plainmsg. = trim($data) ."\n\n";
+ $plainmsg .= trim($data) ."\n\n";
else
- $htmlmsg. = $data ."<br><br>";
+ $htmlmsg .= $data ."<br><br>";
$charset = $params['charset']; // assume all parts are same charset
}
@@ -96,7 +99,7 @@ function getpart($mbox,$mid,$p,$partno) {
// 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";
+ $plainmsg .= $data."\n\n";
}
// SUBPART RECURSION
diff --git a/include/poller.php b/include/poller.php
index b878ef29..37109f17 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -1,4 +1,5 @@
<?php
+
require_once("boot.php");
function poller_run($argv, $argc){
@@ -15,11 +16,14 @@ function poller_run($argv, $argc){
unset($db_host, $db_user, $db_pass, $db_data);
};
+ $mbox = null;
+
require_once('session.php');
require_once('datetime.php');
require_once('simplepie/simplepie.inc');
require_once('include/items.php');
require_once('include/Contact.php');
+ require_once('include/email.php');
$a->set_baseurl(get_config('system','url'));
@@ -85,6 +89,9 @@ function poller_run($argv, $argc){
continue;
foreach($res as $contact) {
+
+ $xml = false;
+
if($manual_id)
$contact['last-update'] = '0000-00-00 00:00:00';
@@ -158,7 +165,7 @@ function poller_run($argv, $argc){
: datetime_convert('UTC','UTC',$contact['last-update'], ATOM_TIME)
);
- if($contact['network'] === 'dfrn') {
+ if($contact['network'] === NETWORK_DFRN) {
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
@@ -175,12 +182,12 @@ function poller_run($argv, $argc){
. '&type=data&last_update=' . $last_update
. '&perm=' . $perm ;
- $xml = fetch_url($url);
+ $handshake_xml = fetch_url($url);
- logger('poller: handshake with url ' . $url . ' returns xml: ' . $xml, LOGGER_DATA);
+ logger('poller: handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA);
- if(! $xml) {
+ 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.
@@ -197,7 +204,7 @@ function poller_run($argv, $argc){
continue;
}
- if(! strstr($xml,'<?xml')) {
+ 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()),
@@ -207,7 +214,7 @@ function poller_run($argv, $argc){
}
- $res = parse_xml_string($xml);
+ $res = parse_xml_string($handshake_xml);
if(intval($res->status) == 1) {
logger("poller: $url replied status 1 - marking for death ");
@@ -265,51 +272,81 @@ function poller_run($argv, $argc){
$xml = post_url($contact['poll'],$postvars);
}
- else {
+ elseif(($contact['network'] === NETWORK_OSTATUS)
+ || ($contact['network'] === NETWORK_DIASPORA)
+ || ($contact['network'] === NETWORK_FEED) ) {
- // $contact['network'] !== 'dfrn'
+ // Upgrading DB fields from an older Friendika version
+ // Will only do this once per notify-enabled OStatus contact
if(($contact['notify']) && (! $contact['writable'])) {
q("UPDATE `contact` SET `writable` = 1 WHERE `id` = %d LIMIT 1",
intval($contact['id'])
);
}
+
$xml = fetch_url($contact['poll']);
}
-
- 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, true);
-
- // 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);
-
-
- if((strlen($hub)) && ($hub_update)
- && (($contact['rel'] == REL_BUD) || (($contact['network'] === 'stat') && (! $contact['readonly'])))) {
- logger('poller: subscribing to hub(s) : ' . $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);
+ elseif($contact['network'] === NETWORK_MAIL) {
+ if(! $mbox) {
+ $x = q("SELECT `prvkey` FROM `user` WHERE `uid` = $d LIMIT 1",
+ intval($importer_uid)
+ );
+ $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+ intval($importer_uid)
+ );
+ if(count($x) && count($r)) {
+ $mailbox = construct_mailbox_name($r[0]);
+ $password = '';
+ openssl_private_decrypt($r[0]['pass'],$password,$x[0]['prvkey']);
+ $mbox = email_connect($mailbox,$r[0]['user'],$password);
+ unset($password);
+ }
+ }
+ if($mbox) {
+ $msgs = email_poll($mbox,$contact['addr']);
+ if(count($msgs)) {
+ // TODO: loop through, fetch, check duplicates, and import
}
}
}
+ elseif($contact['network'] === NETWORK_FACEBOOK) {
+ // TODO: work in progress
+ }
+ 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, true);
+
+ // 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);
+
+
+ if((strlen($hub)) && ($hub_update) && (($contact['rel'] == REL_BUD) || (($contact['network'] === NETWORK_OSTATUS) && (! $contact['readonly'])))) {
+ logger('poller: subscribing to hub(s) : ' . $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);
+ }
+ }
+ }
+ }
$updated = datetime_convert();
diff --git a/update.php b/update.php
index 763b8f26..35f4364e 100644
--- a/update.php
+++ b/update.php
@@ -460,3 +460,12 @@ function update_1050() {
) ENGINE = MYISAM ");
}
+
+function update_1051() {
+ q("ALTER TABLE `mailacct` ADD `port` INT NOT NULL AFTER `server` ,
+ ADD `ssltype` CHAR( 16 ) NOT NULL AFTER `port` ,
+ ADD `mailbox` CHAR( 255 ) NOT NULL AFTER `ssltype` ");
+
+ q("ALTER TABLE `contact` ADD `addr` CHAR( 255 ) NOT NULL AFTER `url` ");
+}
+