fix item type
This commit is contained in:
parent
1c60e6c553
commit
0a4c5a694d
132
mod/item.php
132
mod/item.php
|
@ -102,90 +102,84 @@ function item_post(&$a) {
|
||||||
|
|
||||||
$notify_type = (($parent) ? 'comment-new' : 'wall-new' );
|
$notify_type = (($parent) ? 'comment-new' : 'wall-new' );
|
||||||
|
|
||||||
if(($_POST['type'] == 'wall') || ($_POST['type'] == 'wall-comment') || ($_POST['type'] == 'net-comment')) {
|
do {
|
||||||
|
$dups = false;
|
||||||
|
$hash = random_string();
|
||||||
|
|
||||||
do {
|
$uri = "urn:X-dfrn:" . $a->get_hostname() . ':' . $profile_uid . ':' . $hash;
|
||||||
$dups = false;
|
|
||||||
$hash = random_string();
|
|
||||||
|
|
||||||
$uri = "urn:X-dfrn:" . $a->get_hostname() . ':' . $profile_uid . ':' . $hash;
|
|
||||||
|
|
||||||
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
|
|
||||||
dbesc($uri));
|
|
||||||
if(count($r))
|
|
||||||
$dups = true;
|
|
||||||
} while($dups == true);
|
|
||||||
|
|
||||||
|
|
||||||
$r = q("INSERT INTO `item` (`uid`,`type`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, `created`,
|
|
||||||
`edited`, `uri`, `title`, `body`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`)
|
|
||||||
VALUES( %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
|
|
||||||
intval($profile_uid),
|
|
||||||
dbesc($_POST['type']),
|
|
||||||
intval($contact_id),
|
|
||||||
dbesc($contact_record['name']),
|
|
||||||
dbesc($contact_record['url']),
|
|
||||||
dbesc($contact_record['thumb']),
|
|
||||||
datetime_convert(),
|
|
||||||
datetime_convert(),
|
|
||||||
dbesc($uri),
|
|
||||||
dbesc($title),
|
|
||||||
dbesc($body),
|
|
||||||
dbesc($str_contact_allow),
|
|
||||||
dbesc($str_group_allow),
|
|
||||||
dbesc($str_contact_deny),
|
|
||||||
dbesc($str_group_deny)
|
|
||||||
|
|
||||||
);
|
|
||||||
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
|
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
|
||||||
dbesc($uri));
|
dbesc($uri));
|
||||||
if(count($r)) {
|
if(count($r))
|
||||||
$post_id = $r[0]['id'];
|
$dups = true;
|
||||||
|
} while($dups == true);
|
||||||
|
|
||||||
if($parent) {
|
|
||||||
|
|
||||||
// This item is the last leaf and gets the comment box, clear any ancestors
|
$r = q("INSERT INTO `item` (`uid`,`type`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, `created`,
|
||||||
$r = q("UPDATE `item` SET `last-child` = 0 WHERE `parent` = %d ",
|
`edited`, `uri`, `title`, `body`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`)
|
||||||
intval($parent)
|
VALUES( %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
|
||||||
);
|
intval($profile_uid),
|
||||||
|
dbesc($post_type),
|
||||||
|
intval($contact_id),
|
||||||
|
dbesc($contact_record['name']),
|
||||||
|
dbesc($contact_record['url']),
|
||||||
|
dbesc($contact_record['thumb']),
|
||||||
|
datetime_convert(),
|
||||||
|
datetime_convert(),
|
||||||
|
dbesc($uri),
|
||||||
|
dbesc($title),
|
||||||
|
dbesc($body),
|
||||||
|
dbesc($str_contact_allow),
|
||||||
|
dbesc($str_group_allow),
|
||||||
|
dbesc($str_contact_deny),
|
||||||
|
dbesc($str_group_deny)
|
||||||
|
);
|
||||||
|
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
|
||||||
|
dbesc($uri));
|
||||||
|
if(count($r)) {
|
||||||
|
$post_id = $r[0]['id'];
|
||||||
|
|
||||||
// Inherit ACL's from the parent item.
|
if($parent) {
|
||||||
// TODO merge with subsequent UPDATE operation and save a db write
|
|
||||||
|
|
||||||
$r = q("UPDATE `item` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
|
// This item is the last leaf and gets the comment box, clear any ancestors
|
||||||
WHERE `id` = %d LIMIT 1",
|
$r = q("UPDATE `item` SET `last-child` = 0 WHERE `parent` = %d ",
|
||||||
dbesc($parent_item['allow_cid']),
|
intval($parent)
|
||||||
dbesc($parent_item['allow_gid']),
|
);
|
||||||
dbesc($parent_item['deny_cid']),
|
|
||||||
dbesc($parent_item['deny_gid']),
|
|
||||||
intval($post_id)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$parent = $post_id;
|
|
||||||
}
|
|
||||||
|
|
||||||
$r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `last-child` = 1, `visible` = 1
|
// Inherit ACL's from the parent item.
|
||||||
|
// TODO merge with subsequent UPDATE operation and save a db write
|
||||||
|
|
||||||
|
$r = q("UPDATE `item` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
|
||||||
WHERE `id` = %d LIMIT 1",
|
WHERE `id` = %d LIMIT 1",
|
||||||
intval($parent),
|
dbesc($parent_item['allow_cid']),
|
||||||
dbesc(($parent == $post_id) ? $uri : $parent_item['uri']),
|
dbesc($parent_item['allow_gid']),
|
||||||
|
dbesc($parent_item['deny_cid']),
|
||||||
|
dbesc($parent_item['deny_gid']),
|
||||||
intval($post_id)
|
intval($post_id)
|
||||||
);
|
);
|
||||||
// photo comments turn the corresponding item visible to the profile wall
|
}
|
||||||
if(! $parent_item['visible']) {
|
else {
|
||||||
$r = q("UPDATE `item` SET `visible = 1 WHERE `id` = %d LIMIT 1",
|
$parent = $post_id;
|
||||||
intval($parent_item['id'])
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$url = $a->get_baseurl();
|
$r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `last-child` = 1, `visible` = 1
|
||||||
|
WHERE `id` = %d LIMIT 1",
|
||||||
proc_close(proc_open("php include/notifier.php \"$url\" \"$notify_type\" \"$post_id\" > notify.log &",
|
intval($parent),
|
||||||
array(),$foo));
|
dbesc(($parent == $post_id) ? $uri : $parent_item['uri']),
|
||||||
|
intval($post_id)
|
||||||
|
);
|
||||||
|
// photo comments turn the corresponding item visible to the profile wall
|
||||||
|
if(! $parent_item['visible']) {
|
||||||
|
$r = q("UPDATE `item` SET `visible = 1 WHERE `id` = %d LIMIT 1",
|
||||||
|
intval($parent_item['id'])
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
$url = $a->get_baseurl();
|
||||||
|
|
||||||
|
proc_close(proc_open("php include/notifier.php \"$url\" \"$notify_type\" \"$post_id\" > notify.log &",
|
||||||
|
array(),$foo));
|
||||||
|
|
||||||
goaway($a->get_baseurl() . "/" . $_POST['return'] );
|
goaway($a->get_baseurl() . "/" . $_POST['return'] );
|
||||||
return; // NOTREACHED
|
return; // NOTREACHED
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue