Merge branch 'master' of https://github.com/fabrixxm/friendika into fabrixxm-master
This commit is contained in:
Friendika
commit
3f97344560
|
|
@ -689,6 +689,7 @@ function item_store($arr,$force_parent = false) {
|
|||
}
|
||||
|
||||
$parent_id = $r[0]['id'];
|
||||
$parent_deleted = $r[0]['deleted'];
|
||||
$allow_cid = $r[0]['allow_cid'];
|
||||
$allow_gid = $r[0]['allow_gid'];
|
||||
$deny_cid = $r[0]['deny_cid'];
|
||||
|
|
@ -739,7 +740,7 @@ function item_store($arr,$force_parent = false) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
if($arr['parent-uri'] === $arr['uri'])
|
||||
if((! $parent_id) || ($arr['parent-uri'] === $arr['uri']))
|
||||
$parent_id = $current_post;
|
||||
|
||||
if(strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid))
|
||||
|
|
@ -750,13 +751,14 @@ function item_store($arr,$force_parent = false) {
|
|||
// Set parent id - and also make sure to inherit the parent's ACL's.
|
||||
|
||||
$r = q("UPDATE `item` SET `parent` = %d, `allow_cid` = '%s', `allow_gid` = '%s',
|
||||
`deny_cid` = '%s', `deny_gid` = '%s', `private` = %d WHERE `id` = %d LIMIT 1",
|
||||
`deny_cid` = '%s', `deny_gid` = '%s', `private` = %d, `deleted` = %d WHERE `id` = %d LIMIT 1",
|
||||
intval($parent_id),
|
||||
dbesc($allow_cid),
|
||||
dbesc($allow_gid),
|
||||
dbesc($deny_cid),
|
||||
dbesc($deny_gid),
|
||||
intval($private),
|
||||
intval($parent_deleted),
|
||||
intval($current_post)
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@ function notifier_run($argv, $argc){
|
|||
$a = new App;
|
||||
}
|
||||
|
||||
if(is_null($db)){
|
||||
if(is_null($db)) {
|
||||
@include(".htconfig.php");
|
||||
require_once("dba.php");
|
||||
$db = new dba($db_host, $db_user, $db_pass, $db_data);
|
||||
unset($db_host, $db_user, $db_pass, $db_data);
|
||||
};
|
||||
}
|
||||
|
||||
require_once("session.php");
|
||||
require_once("datetime.php");
|
||||
|
|
@ -62,11 +62,12 @@ function notifier_run($argv, $argc){
|
|||
$r = q("SELECT `parent`, `uid`, `edited` FROM `item` WHERE `id` = %d LIMIT 1",
|
||||
intval($item_id)
|
||||
);
|
||||
if(! count($r)){
|
||||
|
||||
if((! count($r)) || (! intval($r[0]['parent']))) {
|
||||
return;
|
||||
}
|
||||
|
||||
$parent_id = $r[0]['parent'];
|
||||
$parent_id = intval($r[0]['parent']);
|
||||
$uid = $r[0]['uid'];
|
||||
$updated = $r[0]['edited'];
|
||||
|
||||
|
|
@ -77,6 +78,13 @@ function notifier_run($argv, $argc){
|
|||
if(! count($items)){
|
||||
return;
|
||||
}
|
||||
|
||||
// avoid race condition with deleting entries
|
||||
|
||||
if($items[0]['deleted']) {
|
||||
foreach($items as $item)
|
||||
$item['deleted'] = 1;
|
||||
}
|
||||
}
|
||||
|
||||
$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags`
|
||||
|
|
@ -220,6 +228,8 @@ function notifier_run($argv, $argc){
|
|||
else {
|
||||
if($followup) {
|
||||
foreach($items as $item) { // there is only one item
|
||||
if(! $item['parent'])
|
||||
continue;
|
||||
if($item['id'] == $item_id) {
|
||||
logger('notifier: followup: item: ' . print_r($item,true), LOGGER_DATA);
|
||||
$slap = atom_entry($item,'html',$owner,$owner,false);
|
||||
|
|
@ -229,6 +239,9 @@ function notifier_run($argv, $argc){
|
|||
}
|
||||
else {
|
||||
foreach($items as $item) {
|
||||
if(! $item['parent'])
|
||||
continue;
|
||||
|
||||
$contact = get_item_contact($item,$contacts);
|
||||
if(! $contact)
|
||||
continue;
|
||||
|
|
|
|||
|
|
@ -289,20 +289,23 @@ function dfrn_notify_post(&$a) {
|
|||
$datarray['last-child'] = 0;
|
||||
}
|
||||
$posted_id = item_store($datarray);
|
||||
$parent = 0;
|
||||
|
||||
if($posted_id) {
|
||||
if(! $is_like) {
|
||||
$r = q("SELECT `parent` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($posted_id),
|
||||
intval($importer['importer_uid'])
|
||||
);
|
||||
if(count($r)) {
|
||||
if(count($r))
|
||||
$parent = $r[0]['parent'];
|
||||
|
||||
if(! $is_like) {
|
||||
$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']),
|
||||
|
|
@ -310,9 +313,10 @@ function dfrn_notify_post(&$a) {
|
|||
);
|
||||
}
|
||||
|
||||
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");
|
||||
|
||||
if((! $is_like) && ($importer['notify-flags'] & NOTIFY_COMMENT) && (! $importer['self'])) {
|
||||
|
|
@ -336,7 +340,7 @@ function dfrn_notify_post(&$a) {
|
|||
|
||||
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']);
|
||||
|
|
|
|||
30
mod/item.php
30
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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue