tobias/friendica
1
0
Fork 0
Code Pull requests Activity

found the missing comment box bug

Browse source
This commit is contained in:
Mike Macgirvin 2010-09-09 05:25:01 -07:00
parent f1e17b1707
commit e8c39ff49f
4 changed files with 41 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/notifier.php
View file

@ -162,6 +162,12 @@
} }
else { else {
require_once('include/items.php');
$verb = construct_verb($item);
$actobj = construct_activity($item);
if($followup) { if($followup) {
foreach($items as $item) { foreach($items as $item) {
if($item['id'] == $item_id) { if($item['id'] == $item_id) {
@ -175,6 +181,10 @@
$item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')), $item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
'$updated' => xmlify(datetime_convert('UTC', 'UTC', '$updated' => xmlify(datetime_convert('UTC', 'UTC',
$item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')), $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
'$location' => xmlify($item['location']),
'$type' => 'text',
'$verb' => xmlify($verb),
'$actobj' => $actobj,
'$content' => xmlify($item['body']), '$content' => xmlify($item['body']),
'$parent_id' => xmlify($item['parent-uri']), '$parent_id' => xmlify($item['parent-uri']),
'$comment_allow' => 0 '$comment_allow' => 0
@ -209,6 +219,9 @@
'$updated' => xmlify(datetime_convert('UTC', 'UTC', '$updated' => xmlify(datetime_convert('UTC', 'UTC',
$item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')), $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
'$location' => xmlify($item['location']), '$location' => xmlify($item['location']),
'$type' => 'text',
'$verb' => xmlify($verb),
'$actobj' => $actobj,
'$content' =>xmlify($item['body']), '$content' =>xmlify($item['body']),
'$comment_allow' => (($item['last-child'] && strlen($contact['dfrn-id'])) ? 1 : 0) '$comment_allow' => (($item['last-child'] && strlen($contact['dfrn-id'])) ? 1 : 0)
)); ));
@ -225,6 +238,10 @@
'$updated' => xmlify(datetime_convert('UTC', 'UTC', '$updated' => xmlify(datetime_convert('UTC', 'UTC',
$item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')), $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
'$content' =>xmlify($item['body']), '$content' =>xmlify($item['body']),
'$location' =>xmlify($item['location']),
'$type' => 'text',
'$verb' => xmlify($verb),
'$actobj' => $actobj,
'$parent_id' => xmlify($item['parent-uri']), '$parent_id' => xmlify($item['parent-uri']),
'$comment_allow' => (($item['last-child']) ? 1 : 0) '$comment_allow' => (($item['last-child']) ? 1 : 0)
)); ));

18
include/poller.php
View file

@ -1,5 +1,6 @@
<?php <?php
$debugging = true;
require_once('boot.php'); require_once('boot.php');
@ -71,6 +72,8 @@
$importer = $r[0]; $importer = $r[0];
echo "IMPORTER: {$importer['name']}";
$last_update = (($contact['last-update'] == '0000-00-00 00:00:00') $last_update = (($contact['last-update'] == '0000-00-00 00:00:00')
? datetime_convert('UTC','UTC','now - 30 days','Y-m-d\TH:i:s\Z') ? datetime_convert('UTC','UTC','now - 30 days','Y-m-d\TH:i:s\Z')
: datetime_convert('UTC','UTC',$contact['last-update'],'Y-m-d\TH:i:s\Z')); : datetime_convert('UTC','UTC',$contact['last-update'],'Y-m-d\TH:i:s\Z'));
@ -212,10 +215,11 @@ echo "Length:" . strlen($xml) . "\r\n";
if($item['uri'] == $item['parent-uri']) { if($item['uri'] == $item['parent-uri']) {
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
`body` = '', `title` = '' `body` = '', `title` = ''
WHERE `parent-uri` = '%s'", WHERE `parent-uri` = '%s' AND `uid` = %d",
dbesc($when), dbesc($when),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc($item['uri']) dbesc($item['uri']),
intval($importer['uid'])
); );
} }
else { else {
@ -235,9 +239,10 @@ echo "Length:" . strlen($xml) . "\r\n";
intval($item['uid']) intval($item['uid'])
); );
// who is the last child now? // who is the last child now?
$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 $r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d
ORDER BY `edited` DESC LIMIT 1", ORDER BY `edited` DESC LIMIT 1",
dbesc($item['parent-uri']) dbesc($item['parent-uri']),
intval($importer['uid'])
); );
if(count($r)) { if(count($r)) {
q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1", q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
@ -274,9 +279,10 @@ echo "Length:" . strlen($xml) . "\r\n";
if(count($r)) { if(count($r)) {
$allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow'); $allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
if($allow && $allow[0]['data'] != $r[0]['last-child']) { if($allow && $allow[0]['data'] != $r[0]['last-child']) {
$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s'", $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc($parent_uri) dbesc($parent_uri),
intval($importer['uid'])
); );
$r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
intval($allow[0]['data']), intval($allow[0]['data']),

15
mod/dfrn_notify.php
View file

@ -129,10 +129,11 @@ function dfrn_notify_post(&$a) {
$item = $r[0]; $item = $r[0];
if($item['uri'] == $item['parent-uri']) { if($item['uri'] == $item['parent-uri']) {
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s'
WHERE `parent-uri` = '%s'", WHERE `parent-uri` = '%s' AND `uid` = %d",
dbesc($when), dbesc($when),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc($item['uri']) dbesc($item['uri']),
intval($importer['importer_uid'])
); );
} }
else { else {
@ -151,9 +152,10 @@ function dfrn_notify_post(&$a) {
intval($item['uid']) intval($item['uid'])
); );
// who is the last child now? // who is the last child now?
$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 $r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d
ORDER BY `edited` DESC LIMIT 1", ORDER BY `edited` DESC LIMIT 1",
dbesc($item['parent-uri']) dbesc($item['parent-uri']),
intval($importer['importer_uid'])
); );
if(count($r)) { if(count($r)) {
q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1", q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
@ -261,8 +263,9 @@ function dfrn_notify_post(&$a) {
if($importer['notify-flags'] & NOTIFY_COMMENT) { if($importer['notify-flags'] & NOTIFY_COMMENT) {
$myconv = q("SELECT `author-link` FROM `item` WHERE `parent-uri` = '%s'", $myconv = q("SELECT `author-link` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d",
dbesc($parent_uri) dbesc($parent_uri),
intval($importer['importer_uid'])
); );
if(count($myconv)) { if(count($myconv)) {
foreach($myconv as $conv) { foreach($myconv as $conv) {

5
mod/item.php
View file

@ -287,8 +287,9 @@ function item_content(&$a) {
intval($item['uid']) intval($item['uid'])
); );
// who is the last child now? // who is the last child now?
$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 ORDER BY `edited` DESC LIMIT 1", $r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d ORDER BY `edited` DESC LIMIT 1",
dbesc($item['parent-uri']) dbesc($item['parent-uri']),
intval($item['uid'])
); );
if(count($r)) { if(count($r)) {
q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1", q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",