Merge branch 'tobiasd-master'

[friendica.git] / mod / dfrn_notify.php

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 1eb2ff725a2174db48a38c234c38085e95b8b9dd..142d1328450d20e06b14a838fd4bb4e3db267914 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -24,7 +24,7 @@ function dfrn_notify_post(&$a) {
                dbesc($challenge)
        );
        if(! count($r)) {
-               logger('dfrn_notify: could not match challenge to dfrn_id ' . $dfrn_id);
+               logger('dfrn_notify: could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge);
                xml_status(3);
        }
 
@@ -91,7 +91,7 @@ function dfrn_notify_post(&$a) {
                logger('rino: md5 raw key: ' . md5($rawkey));
                $final_key = '';
 
-               if($dfrn_version > 2.1) {
+               if($dfrn_version >= 2.1) {
                        if((($importer['duplex']) && strlen($importer['cprvkey'])) || (! strlen($importer['cpubkey']))) {
                                openssl_private_decrypt($rawkey,$final_key,$importer['cprvkey']);
                        }
@@ -289,54 +289,58 @@ function dfrn_notify_post(&$a) {
                                        $datarray['last-child'] = 0;
                                }
                                $posted_id = item_store($datarray);
+                               $parent = 0;
 
                                if($posted_id) {
+                                       $r = q("SELECT `parent` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                                               intval($posted_id),
+                                               intval($importer['importer_uid'])
+                                       );
+                                       if(count($r))
+                                               $parent = $r[0]['parent'];
+                               
                                        if(! $is_like) {
-                                               $r = q("SELECT `parent` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                                                       intval($posted_id),
-                                                       intval($importer['importer_uid'])
+                                               $r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
+                                                       dbesc(datetime_convert()),
+                                                       intval($importer['importer_uid']),
+                                                       intval($r[0]['parent'])
                                                );
-                                               if(count($r)) {
-                                                       $r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
-                                                               dbesc(datetime_convert()),
-                                                               intval($importer['importer_uid']),
-                                                               intval($r[0]['parent'])
-                                                       );
-                                               }
+
                                                $r2 = q("UPDATE `item` SET `last-child` = 1, `changed` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
-                                                               dbesc(datetime_convert()),
-                                                               intval($importer['importer_uid']),
-                                                               intval($posted_id)
+                                                       dbesc(datetime_convert()),
+                                                       intval($importer['importer_uid']),
+                                                       intval($posted_id)
                                                );
                                        }
 
-                                       $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+                                       if($posted_id && $parent) {
+                               
+                                               $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 
-                                       //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"comment-import\" \"$posted_id\" &", array(),$foo));
-                                       proc_run($php_path,"include/notifier.php","comment-import","$posted_id");
+                                               proc_run($php_path,"include/notifier.php","comment-import","$posted_id");
                                        
-                                       if((! $is_like) && ($importer['notify-flags'] & NOTIFY_COMMENT) && (! $importer['self'])) {
-                                               require_once('bbcode.php');
-                                               $from = stripslashes($datarray['author-name']);
-                                               $tpl = load_view_file('view/cmnt_received_eml.tpl');                    
-                                               $email_tpl = replace_macros($tpl, array(
-                                                       '$sitename' => $a->config['sitename'],
-                                                       '$siteurl' =>  $a->get_baseurl(),
-                                                       '$username' => $importer['username'],
-                                                       '$email' => $importer['email'],
-                                                       '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id, 
-                                                       '$from' => $from,
-                                                       '$body' => strip_tags(bbcode(stripslashes($datarray['body'])))
-                                               ));
-       
-                                               $res = mail($importer['email'], $from . t(' commented on an item at ') . $a->config['sitename'],
-                                                       $email_tpl, "From: " . t('Administrator') . '@' . $a->get_hostname() );
+                                               if((! $is_like) && ($importer['notify-flags'] & NOTIFY_COMMENT) && (! $importer['self'])) {
+                                                       require_once('bbcode.php');
+                                                       $from = stripslashes($datarray['author-name']);
+                                                       $tpl = load_view_file('view/cmnt_received_eml.tpl');                    
+                                                       $email_tpl = replace_macros($tpl, array(
+                                                               '$sitename' => $a->config['sitename'],
+                                                               '$siteurl' =>  $a->get_baseurl(),
+                                                               '$username' => $importer['username'],
+                                                               '$email' => $importer['email'],
+                                                               '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id, 
+                                                               '$from' => $from,
+                                                               '$body' => strip_tags(bbcode(stripslashes($datarray['body'])))
+                                                       ));
+               
+                                                       $res = mail($importer['email'], $from . t(' commented on an item at ') . $a->config['sitename'],
+                                                               $email_tpl, "From: " . t('Administrator') . '@' . $a->get_hostname() );
+                                               }
                                        }
-                               }
-
-                               xml_status(0);
-                               // NOTREACHED
 
+                                       xml_status(0);
+                                       // NOTREACHED
+                               }
                        }
                        else {
                                // regular comment that is part of this total conversation. Have we seen it? If not, import it.
@@ -375,13 +379,13 @@ function dfrn_notify_post(&$a) {
                        
                                if(($datarray['type'] != 'activity') && ($importer['notify-flags'] & NOTIFY_COMMENT)) {
 
-                                       $myconv = q("SELECT `author-link` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d",
+                                       $myconv = q("SELECT `author-link` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
                                                dbesc($parent_uri),
                                                intval($importer['importer_uid'])
                                        );
                                        if(count($myconv)) {
                                                foreach($myconv as $conv) {
-                                                       if($conv['author-link'] != $importer['url'])
+                                                       if(! link_compare($conv['author-link'],$importer['url']))
                                                                continue;
                                                        require_once('bbcode.php');
                                                        $from = stripslashes($datarray['author-name']);
@@ -468,12 +472,13 @@ function dfrn_notify_content(&$a) {
                $r = q("DELETE FROM `challenge` WHERE `expire` < " . intval(time()));
 
                $r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` )
-                       VALUES( '%s', '%s', '%s') ",
+                       VALUES( '%s', '%s', %d ) ",
                        dbesc($hash),
                        dbesc($dfrn_id),
-                       intval(time() + 60 )
+                       intval(time() + 90 )
                );
 
+               logger('dfrn_notify: challenge=' . $hash );
 
                $sql_extra = '';
                switch($direction) {