diff options
| -rw-r--r-- | boot.php | 7 | ||||
| -rw-r--r-- | database.sql | 8 | ||||
| -rw-r--r-- | include/acl_selectors.php | 2 | ||||
| -rw-r--r-- | include/diaspora.php | 76 | ||||
| -rw-r--r-- | include/message.php | 12 | ||||
| -rw-r--r-- | include/notifier.php | 10 | ||||
| -rw-r--r-- | update.php | 11 |
7 files changed, 115 insertions, 11 deletions
@@ -11,7 +11,7 @@ require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_VERSION', '2.3.1186' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); -define ( 'DB_UPDATE_VERSION', 1109 ); +define ( 'DB_UPDATE_VERSION', 1110 ); define ( 'EOL', "<br />\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -21,8 +21,9 @@ define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); * * Image storage quality. Lower numbers save space at cost of image detail. * For ease of upgrade, please do not change here. Change jpeg quality with - * set_config('system','jpeg_quality',n) in .htconfig.php - * where n is netween 1 and 100, and with very poor results below about 50 + * $a->config['system']['jpeg_quality'] = n; + * in .htconfig.php, where n is netween 1 and 100, and with very poor results + * below about 50 * */ diff --git a/database.sql b/database.sql index 18fe5f8c3..cdbc8a93b 100644 --- a/database.sql +++ b/database.sql @@ -714,5 +714,11 @@ CREATE TABLE IF NOT EXISTS `conv` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , `guid` CHAR( 64 ) NOT NULL , `recips` MEDIUMTEXT NOT NULL , - `uid` INT NOT NULL + `uid` INT NOT NULL, + `creator` CHAR( 255 ) NOT NULL , + `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + `updated` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + `subject` MEDIUMTEXT NOT NULL, + INDEX ( `created` ), + INDEX ( `updated` ) ) ENGINE = MyISAM DEFAULT CHARSET=utf8; diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 66fe104ea..d8f530daf 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -167,7 +167,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p } if($privmail) { - $sql_extra .= " AND `network` IN ( 'dfrn' ) "; + $sql_extra .= " AND `network` IN ( 'dfrn', 'dspr' ) "; } elseif($privatenet) { $sql_extra .= " AND `network` IN ( 'dfrn', 'mail', 'face', 'dspr' ) "; diff --git a/include/diaspora.php b/include/diaspora.php index fe853b5df..a8fd43024 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1096,9 +1096,13 @@ function diaspora_conversation($importer,$xml,$msg) { if(count($c)) $conversation = $c[0]; else { - $r = q("insert into conv (uid,guid,recips) values(%d, '%s', '%s') ", + $r = q("insert into conv (uid,guid,creator,created,updated,subject,recips) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ", intval($importer['uid']), dbesc($guid), + dbesc($diaspora_handle), + dbesc(datetime_convert('UTC','UTC',$created_at)), + dbesc(datetime_convert()), + dbesc($subject), dbesc($participant_handles) ); if($r) @@ -1203,6 +1207,10 @@ function diaspora_conversation($importer,$xml,$msg) { dbesc($msg_created_at) ); + q("updated conv set updated = '%s' where id = %d limit 1", + dbesc(datetime_convert()), + intval($conversation['id']) + ); } return; @@ -1943,7 +1951,73 @@ function diaspora_send_retraction($item,$owner,$contact,$public_batch = false) { return(diaspora_transmit($owner,$contact,$slap,$public_batch)); } +function diaspora_send_mail($item,$owner,$contact) { + + $a = get_app(); + $myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + + $r = q("select * from conv where id = %d and uid = %d limit 1", + intval($item['convid']), + intval($item['uid']) + ); + + if(! count($r)) { + logger('diaspora_send_mail: conversation not found.'); + return; + } + $cnv = $r[0]; + + $parent = null; + + if($item['parent-uri'] != $item['uri']) { + $r = q("select * from mail where uri = '%s' and uid = %d limit 1", + dbesc($item['parent-uri']), + intval($item['uid']) + ); + $parent = $r[0]; + } + $conv = array( + 'guid' => xmlify($cnv['guid']), + 'subject' => xmlify($cnv['subject']), + 'created_at' => xmlify(datetime_convert('UTC','UTC',$cnv['created'],'Y-m-d H:i:s \U\T\C')), + 'diaspora_handle' => xmlify($cnv['creator']), + 'participant_handles' => xmlify($cnv['recips']) + ); + + $body = bb2diaspora($item['body']); + $created = datetime_convert('UTC','UTC',$item['created'],'Y-m-d H:i:s \U\T\C'); + $parent_guid = (($item['parent-uri'] == $item['uri']) ? $cnv['guid'] : $parent['guid']); + + $signed_text = $item['guid'] . ';' . $parent_guid . ';' . $body . ';' + . $created . ';' . $myaddr . ';' . $cnv['guid']; + + $sig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256')); + + $msg = array( + 'guid' => xmlify($item['guid']), + 'parent_guid' => (($item['parent-uri'] == $item['uri']) ? xmlify($cnv['guid']) : xmlify($parent['guid'])), + 'parent_author_signature' => (($item['parent-uri'] == $item['uri']) ? xmlify($sig) : null), + 'author_signature' => xmlify($sig), + 'text' => xmlify($body), + 'created_at' => xmlify($created), + 'diaspora_handle' => xmlify($myaddr), + 'conversation_guid' => xmlify($cnv['guid']) + ); + + $conv['messages'] = array($msg); + + $tpl = get_markup_template('diaspora_conversation.tpl'); + $msg = replace_macros($tpl, array('$conv' => $conv)); + + logger('diaspora_conversation: ' . print_r($msg,true)); + + $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],false))); + + return(diaspora_transmit($owner,$contact,$slap,false)); + + +} function diaspora_transmit($owner,$contact,$slap,$public_batch) { diff --git a/include/message.php b/include/message.php index baf1bb2d5..58789d688 100644 --- a/include/message.php +++ b/include/message.php @@ -58,11 +58,16 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){ $handles = $recip_handle . ';' . $sender_handle; - $r = q("insert into conv (uid,guid,recips) values (%d, '%s', '%s') ", + $r = q("insert into conv (uid,guid,creator,created,updated,subject,recips) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ", intval(local_user()), dbesc($conv_guid), + dbesc($sender_handle), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc($subject), dbesc($handles) ); + $r = q("select * from conv where guid = '%s' and uid = %d limit 1", dbesc($conv_guid), intval(local_user()) @@ -76,10 +81,11 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){ return -4; } - $r = q("INSERT INTO `mail` ( `uid`, `convid`, `from-name`, `from-photo`, `from-url`, + $r = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`, `contact-id`, `title`, `body`, `seen`, `replied`, `uri`, `parent-uri`, `created`) - VALUES ( %d, %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s', '%s', '%s' )", + VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s', '%s', '%s' )", intval(local_user()), + dbesc(get_guid()), intval($convid), dbesc($me[0]['name']), dbesc($me[0]['thumb']), diff --git a/include/notifier.php b/include/notifier.php index 945ba95e7..2562f09eb 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -663,7 +663,15 @@ function notifier_run($argv, $argc){ case NETWORK_DIASPORA: require_once('include/diaspora.php'); - if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode)) + if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled'))) + break; + + if($mail) { + diaspora_send_mail($item,$owner,$contact); + break; + } + + if(! $normal_mode) break; // special handling for followup to public post diff --git a/update.php b/update.php index d94bf82d1..ca8874e82 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1109 ); +define( 'UPDATE_VERSION' , 1110 ); /** * @@ -928,3 +928,12 @@ function update_1108() { ADD INDEX ( `hidden` ) "); } + +function update_1109() { + q("ALTER TABLE `conv` ADD `creator` CHAR( 255 ) NOT NULL , + ADD `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + ADD `updated` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + ADD `subject` MEDIUMTEXT NOT NULL, + ADD INDEX ( `created` ), ADD INDEX ( `updated` ) "); +} + |