X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=ac8abac996e36ac9826c8c1f4f0eab8570458882;hb=dbcfe58ea84059ebdd976eaae4a3f61230b12da3;hp=d04ab71deae41e9bd2cfdc8f1797eae92dbd37ad;hpb=77bc4cd0dc165a1bcdf7edf60a0b4b144a8fc93a;p=friendica.git
diff --git a/mod/item.php b/mod/item.php
index d04ab71dea..ac8abac996 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -3,22 +3,25 @@
/**
*
* 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
+ * 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).
- * Also processed here are posts and comments coming through the
- * statusnet/twitter API.
- * All of these become an "item" which is our basic unit of
+ * Also processed here are posts and comments coming through the
+ * statusnet/twitter API.
+ * 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.
+ * Posts that originate externally or do not fall into the above
+ * posting categories go through item_store() instead of this function.
*
- */
+ */
require_once('include/crypto.php');
require_once('include/enotify.php');
require_once('include/email.php');
require_once('library/langdet/Text/LanguageDetect.php');
+require_once('include/tags.php');
+require_once('include/files.php');
+require_once('include/threads.php');
function item_post(&$a) {
@@ -43,6 +46,9 @@ function item_post(&$a) {
logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
$api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
+
+ $message_id = ((x($_REQUEST,'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : '');
+
$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
$preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0);
@@ -102,7 +108,7 @@ function item_post(&$a) {
if(($r === false) || (! count($r))) {
notice( t('Unable to locate original post.') . EOL);
- if(x($_REQUEST,'return'))
+ if(x($_REQUEST,'return'))
goaway($a->get_baseurl() . "/" . $return_path );
killme();
}
@@ -137,7 +143,7 @@ function item_post(&$a) {
if((x($_REQUEST,'commenter')) && ((! $parent) || (! $parent_item['wall']))) {
notice( t('Permission denied.') . EOL) ;
- if(x($_REQUEST,'return'))
+ if(x($_REQUEST,'return'))
goaway($a->get_baseurl() . "/" . $return_path );
killme();
}
@@ -153,7 +159,7 @@ function item_post(&$a) {
if((! can_write_wall($a,$profile_uid)) && (! $allow_moderated)) {
notice( t('Permission denied.') . EOL) ;
- if(x($_REQUEST,'return'))
+ if(x($_REQUEST,'return'))
goaway($a->get_baseurl() . "/" . $return_path );
killme();
}
@@ -196,9 +202,10 @@ function item_post(&$a) {
$body = escape_tags(trim($_REQUEST['body']));
$private = $orig_post['private'];
$pubmail_enable = $orig_post['pubmail'];
+ $network = $orig_post['network'];
+ $guid = $orig_post['guid'];
- }
- else {
+ } else {
// if coming from the API and no privacy settings are set,
// use the user default permissions - as they won't have
@@ -230,15 +237,31 @@ function item_post(&$a) {
$verb = notags(trim($_REQUEST['verb']));
$emailcc = notags(trim($_REQUEST['emailcc']));
$body = escape_tags(trim($_REQUEST['body']));
+ $network = notags(trim($_REQUEST['network']));
+ $guid = get_guid(32);
$naked_body = preg_replace('/\[(.+?)\]/','',$body);
if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
$l = new Text_LanguageDetect;
- $lng = $l->detectConfidence($naked_body);
+ //$lng = $l->detectConfidence($naked_body);
+ //$postopts = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
- $postopts = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
+ $lng = $l->detect($naked_body, 3);
+
+ if (sizeof($lng) > 0) {
+ $postopts = "";
+
+ foreach ($lng as $language => $score) {
+ if ($postopts == "")
+ $postopts = "lang=";
+ else
+ $postopts .= ":";
+
+ $postopts .= $language.";".$score;
+ }
+ }
logger('mod_item: detect language' . print_r($lng,true) . $naked_body, LOGGER_DATA);
}
@@ -257,10 +280,16 @@ function item_post(&$a) {
if($parent_item) {
$private = 0;
- if(($parent_item['private'])
- || strlen($parent_item['allow_cid'])
- || strlen($parent_item['allow_gid'])
- || strlen($parent_item['deny_cid'])
+ // for non native networks use the network of the original post as network of the item
+ if (($parent_item['network'] != NETWORK_DIASPORA)
+ AND ($parent_item['network'] != NETWORK_OSTATUS)
+ AND ($network == ""))
+ $network = $parent_item['network'];
+
+ if(($parent_item['private'])
+ || strlen($parent_item['allow_cid'])
+ || strlen($parent_item['allow_gid'])
+ || strlen($parent_item['deny_cid'])
|| strlen($parent_item['deny_gid'])) {
$private = (($parent_item['private']) ? $parent_item['private'] : 1);
}
@@ -270,7 +299,6 @@ function item_post(&$a) {
$str_contact_deny = $parent_item['deny_cid'];
$str_group_deny = $parent_item['deny_gid'];
}
-
$pubmail_enable = ((x($_REQUEST,'pubmail_enable') && intval($_REQUEST['pubmail_enable']) && (! $private)) ? 1 : 0);
// if using the API, we won't see pubmail_enable - figure out if it should be set
@@ -290,7 +318,7 @@ function item_post(&$a) {
if($preview)
killme();
info( t('Empty post discarded.') . EOL );
- if(x($_REQUEST,'return'))
+ if(x($_REQUEST,'return'))
goaway($a->get_baseurl() . "/" . $return_path );
killme();
}
@@ -343,7 +371,7 @@ function item_post(&$a) {
break;
}
}
- }
+ }
if($contact_id) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($contact_id)
@@ -357,7 +385,7 @@ function item_post(&$a) {
}
// get contact info for owner
-
+
if($profile_uid == local_user()) {
$contact_record = $author;
}
@@ -382,7 +410,7 @@ function item_post(&$a) {
/**
*
- * When a photo was uploaded into the message using the (profile wall) ajax
+ * When a photo was uploaded into the message using the (profile wall) ajax
* uploader, The permissions are initially set to disallow anybody but the
* owner from seeing it. This is because the permissions may not yet have been
* set for the post. If it's private, the photo permissions should be set
@@ -415,7 +443,7 @@ function item_post(&$a) {
if(! count($r))
continue;
-
+
$r = q("UPDATE `photo` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
WHERE `resource-id` = '%s' AND `uid` = %d AND `album` = '%s' ",
@@ -427,7 +455,7 @@ function item_post(&$a) {
intval($profile_uid),
dbesc( t('Wall Photos'))
);
-
+
}
}
}
@@ -446,10 +474,10 @@ function item_post(&$a) {
$r = q("SELECT * FROM `attach` WHERE `uid` = %d AND `id` = %d LIMIT 1",
intval($profile_uid),
intval($attach)
- );
+ );
if(count($r)) {
$r = q("UPDATE `attach` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
- WHERE `uid` = %d AND `id` = %d LIMIT 1",
+ WHERE `uid` = %d AND `id` = %d",
dbesc($str_contact_allow),
dbesc($str_group_allow),
dbesc($str_contact_deny),
@@ -501,7 +529,7 @@ function item_post(&$a) {
&& ($parent_contact['nick']) && (! in_array('@' . $parent_contact['nick'],$tags))) {
$body = '@' . $parent_contact['nick'] . ' ' . $body;
$tags[] = '@' . $parent_contact['nick'];
- }
+ }
$tagged = array();
@@ -537,7 +565,7 @@ function item_post(&$a) {
// we tagged a private forum in a top level post and the message was public.
// Restrict it.
$private = 1;
- $str_contact_allow = '<' . $private_id . '>';
+ $str_contact_allow = '<' . $private_id . '>';
}
$attachments = '';
@@ -566,16 +594,19 @@ function item_post(&$a) {
if(! strlen($verb))
$verb = ACTIVITY_POST ;
+ if ($network == "")
+ $network = NETWORK_DFRN;
+
$gravity = (($parent) ? 6 : 0 );
// even if the post arrived via API we are considering that it
// originated on this site by default for determining relayability.
$origin = ((x($_REQUEST,'origin')) ? intval($_REQUEST['origin']) : 1);
-
+
$notify_type = (($parent) ? 'comment-new' : 'wall-new' );
- $uri = item_new_uri($a->get_hostname(),$profile_uid);
+ $uri = (($message_id) ? $message_id : item_new_uri($a->get_hostname(),$profile_uid));
// Fallback so that we alway have a thr-parent
if(!$thr_parent)
@@ -586,6 +617,7 @@ function item_post(&$a) {
$datarray['type'] = $post_type;
$datarray['wall'] = $wall;
$datarray['gravity'] = $gravity;
+ $datarray['network'] = $network;
$datarray['contact-id'] = $contact_id;
$datarray['owner-name'] = $contact_record['name'];
$datarray['owner-link'] = $contact_record['url'];
@@ -598,6 +630,7 @@ function item_post(&$a) {
$datarray['commented'] = datetime_convert();
$datarray['received'] = datetime_convert();
$datarray['changed'] = datetime_convert();
+ $datarray['guid'] = $guid;
$datarray['uri'] = $uri;
$datarray['title'] = $title;
$datarray['body'] = $body;
@@ -633,8 +666,6 @@ function item_post(&$a) {
if($orig_post)
$datarray['edit'] = true;
- else
- $datarray['guid'] = get_guid();
// preview mode - prepare the body for display and send it via json
@@ -665,17 +696,22 @@ function item_post(&$a) {
if($orig_post) {
- $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `attach` = '%s', `file` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `attach` = '%s', `file` = '%s', `edited` = '%s', `changed` = '%s' WHERE `id` = %d AND `uid` = %d",
dbesc($datarray['title']),
dbesc($datarray['body']),
dbesc($datarray['tag']),
dbesc($datarray['attach']),
dbesc($datarray['file']),
dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
intval($post_id),
intval($profile_uid)
);
+ create_tags_from_item($post_id);
+ create_files_from_item($post_id);
+ update_thread($post_id);
+
// update filetags in pconfig
file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
@@ -690,15 +726,16 @@ function item_post(&$a) {
$post_id = 0;
- $r = q("INSERT INTO `item` (`guid`, `uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`,
+ $r = q("INSERT INTO `item` (`guid`, `uid`,`type`,`wall`,`gravity`, `network`, `contact-id`,`owner-name`,`owner-link`,`owner-avatar`,
`author-name`, `author-link`, `author-avatar`, `created`, `edited`, `commented`, `received`, `changed`, `uri`, `thr-parent`, `title`, `body`, `app`, `location`, `coord`,
`tag`, `inform`, `verb`, `postopts`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach`, `bookmark`,`origin`, `moderated`, `file` )
- VALUES( '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, '%s' )",
+ VALUES( '%s', %d, '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, '%s' )",
dbesc($datarray['guid']),
intval($datarray['uid']),
dbesc($datarray['type']),
intval($datarray['wall']),
intval($datarray['gravity']),
+ dbesc($datarray['network']),
intval($datarray['contact-id']),
dbesc($datarray['owner-name']),
dbesc($datarray['owner-link']),
@@ -740,10 +777,22 @@ function item_post(&$a) {
if(count($r)) {
$post_id = $r[0]['id'];
logger('mod_item: saved item ' . $post_id);
+ add_thread($post_id);
// update filetags in pconfig
file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
+ // Store the fresh generated item into the cache
+ $cachefile = get_cachefile($datarray["guid"]."-".hash("md5", $datarray['body']));
+
+ if (($cachefile != '') AND !file_exists($cachefile)) {
+ $s = prepare_text($datarray['body']);
+ $stamp1 = microtime(true);
+ file_put_contents($cachefile, $s);
+ $a->save_timestamp($stamp1, "file");
+ logger('mod_item: put item '.$r[0]['id'].' into cachefile '.$cachefile);
+ }
+
if($parent) {
// This item is the last leaf and gets the comment box, clear any ancestors
@@ -751,11 +800,12 @@ function item_post(&$a) {
dbesc(datetime_convert()),
intval($parent)
);
+ update_thread($parent, true);
- // Inherit ACL's from the parent item.
+ // Inherit ACLs from the parent item.
$r = q("UPDATE `item` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `private` = %d
- WHERE `id` = %d LIMIT 1",
+ WHERE `id` = %d",
dbesc($parent_item['allow_cid']),
dbesc($parent_item['allow_gid']),
dbesc($parent_item['deny_cid']),
@@ -773,7 +823,8 @@ function item_post(&$a) {
'to_email' => $user['email'],
'uid' => $user['uid'],
'item' => $datarray,
- 'link' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+ //'link' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+ 'link' => $a->get_baseurl().'/display/'.$datarray['guid'],
'source_name' => $datarray['author-name'],
'source_link' => $datarray['author-link'],
'source_photo' => $datarray['author-avatar'],
@@ -782,15 +833,14 @@ function item_post(&$a) {
'parent' => $parent,
'parent_uri' => $parent_item['uri']
));
-
+
}
// Store the comment signature information in case we need to relay to Diaspora
store_diaspora_comment_sig($datarray, $author, ($self ? $a->user['prvkey'] : false), $parent_item, $post_id);
- }
- else {
+ } else {
$parent = $post_id;
if($contact_record != $author) {
@@ -802,7 +852,8 @@ function item_post(&$a) {
'to_email' => $user['email'],
'uid' => $user['uid'],
'item' => $datarray,
- 'link' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+ //'link' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+ 'link' => $a->get_baseurl().'/display/'.$datarray['guid'],
'source_name' => $datarray['author-name'],
'source_link' => $datarray['author-link'],
'source_photo' => $datarray['author-avatar'],
@@ -818,10 +869,11 @@ function item_post(&$a) {
$parent = $post_id;
$r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `plink` = '%s', `changed` = '%s', `last-child` = 1, `visible` = 1
- WHERE `id` = %d LIMIT 1",
+ WHERE `id` = %d",
intval($parent),
dbesc(($parent == $post_id) ? $uri : $parent_item['uri']),
- dbesc($a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id),
+ //dbesc($a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id),
+ dbesc($a->get_baseurl().'/display/'.$datarray['guid']),
dbesc(datetime_convert()),
intval($post_id)
);
@@ -831,9 +883,10 @@ function item_post(&$a) {
// They will show up as people comment on them.
if(! $parent_item['visible']) {
- $r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d LIMIT 1",
+ $r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d",
intval($parent_item['id'])
);
+ update_thread($parent_item['id']);
}
}
else {
@@ -845,17 +898,23 @@ function item_post(&$a) {
// update the commented timestamp on the parent
- q("UPDATE `item` set `commented` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
+ q("UPDATE `item` set `commented` = '%s', `changed` = '%s' WHERE `id` = %d",
dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($parent)
);
+ update_thread($parent);
$datarray['id'] = $post_id;
- $datarray['plink'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id;
+ //$datarray['plink'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id;
+ $datarray['plink'] = $a->get_baseurl().'/display/'.$datarray['guid'];
call_hooks('post_local_end', $datarray);
+ // if no auto update is enabled, then disable it temporarily
+ if (get_pconfig($profile_uid, "system", "no_auto_update") == 1)
+ set_pconfig($profile_uid, "system", "no_auto_update", -1);
+
if(strlen($emailcc) && $profile_uid == local_user()) {
$erecips = explode(',', $emailcc);
if(count($erecips)) {
@@ -872,18 +931,28 @@ function item_post(&$a) {
} else {
$subject = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']),'UTF-8');
}
- $headers = 'From: ' . email_header_encode($a->user['username'],'UTF-8') . ' <' . $a->user['email'] . '>' . "\n";
- $headers .= 'MIME-Version: 1.0' . "\n";
- $headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
- $headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
$link = '
';
$html = prepare_body($datarray);
$message = '