diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/dfrn_notify.php | 80 | ||||
| -rw-r--r-- | mod/item.php | 30 |
2 files changed, 62 insertions, 48 deletions
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 7f023ef22..142d13284 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -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']); diff --git a/mod/item.php b/mod/item.php index 7125ae1f4..38ef580af 100644 --- a/mod/item.php +++ b/mod/item.php @@ -1,11 +1,17 @@ <?php -// This is the POST destination for most all locally posted -// text stuff. This function handles status, wall-to-wall status, -// local comments, and remote coments - that are posted on this site -// (as opposed to being delivered in a feed). -// All of these become an "item" which is our basic unit of -// information. +/** + * + * This is the POST destination for most all locally posted + * text stuff. This function handles status, wall-to-wall status, + * local comments, and remote coments - that are posted on this site + * (as opposed to being delivered in a feed). + * All of these become an "item" which is our basic unit of + * information. + * Posts that originate externally or do not fall into the above + * posting categories go through item_store() instead of this function. + * + */ function item_post(&$a) { @@ -417,6 +423,12 @@ function item_post(&$a) { ); } } + else { + logger('mod_item: unable to retrieve post that was just stored.'); + notify( t('System error. Post not saved.')); + goaway($a->get_baseurl() . "/" . $_POST['return'] ); + // NOTREACHED + } $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); @@ -454,10 +466,8 @@ function item_post(&$a) { } } - - goaway($a->get_baseurl() . "/" . $_POST['return'] ); - return; // NOTREACHED + // NOTREACHED } @@ -551,7 +561,7 @@ function item_content(&$a) { proc_run($php_path,"include/notifier.php","drop","$drop_id"); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); - return; //NOTREACHED + //NOTREACHED } else { notice( t('Permission denied.') . EOL); |