X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=6c1c06f99a901ea505dba9368252285ad821936e;hb=e51440ec98541d707a38ed094c52faa31616cb6a;hp=aa022d37d8eda0387476e90ebdfe62caca12e8d7;hpb=0f0fb2e2f3b9819e4f1b65c3ea1b96e78c008381;p=friendica.git

diff --git a/mod/item.php b/mod/item.php
index aa022d37d8..6c1c06f99a 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -18,6 +18,7 @@
 require_once('include/crypto.php');
 require_once('include/enotify.php');
 require_once('include/email.php');
+require_once('Text/LanguageDetect.php');
 
 function item_post(&$a) {
 
@@ -78,6 +79,7 @@ function item_post(&$a) {
 		// if this isn't the real parent of the conversation, find it
 		if($r !== false && count($r)) {
 			$parid = $r[0]['parent'];
+			$parent_uri = $r[0]['uri'];
 			if($r[0]['id'] != $r[0]['parent']) {
 				$r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1",
 					intval($parid)
@@ -95,7 +97,7 @@ function item_post(&$a) {
 		$parent = $r[0]['id'];
 
 		// multi-level threading - preserve the info but re-parent to our single level threading
-		if(($parid) && ($parid != $parent))
+		//if(($parid) && ($parid != $parent))
 			$thr_parent = $parent_uri;
 
 		if($parent_item['contact-id'] && $uid) {
@@ -216,6 +218,21 @@ function item_post(&$a) {
 		$emailcc           = notags(trim($_REQUEST['emailcc']));
 		$body              = escape_tags(trim($_REQUEST['body']));
 
+
+		$naked_body = preg_replace('/\[(.+?)\]/','',$body);
+
+		if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+			$l = new Text_LanguageDetect;
+			$lng = $l->detectConfidence($naked_body);
+
+			$postopts = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
+
+			logger('mod_item: detect language' . print_r($lng,true) . $naked_body, LOGGER_DATA);
+		}
+		else
+			$postopts = '';
+
+
 		$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
 
 		// If this is a comment, set the permissions from the parent.
@@ -228,7 +245,7 @@ function item_post(&$a) {
 				|| strlen($parent_item['allow_gid']) 
 				|| strlen($parent_item['deny_cid']) 
 				|| strlen($parent_item['deny_gid'])) {
-				$private = 1;
+				$private = (($parent_item['private']) ? $parent_item['private'] : 1);
 			}
 
 			$str_contact_allow = $parent_item['allow_cid'];
@@ -422,6 +439,7 @@ function item_post(&$a) {
 
 	$body = bb_translate_video($body);
 
+
 	/**
 	 * Fold multi-line [code] sequences
 	 */
@@ -430,6 +448,8 @@ function item_post(&$a) {
 
 	$body = scale_external_images($body,false);
 
+
+
 	/**
 	 * Look for any tags and linkify them
 	 */
@@ -525,6 +545,10 @@ function item_post(&$a) {
 
 	$uri = item_new_uri($a->get_hostname(),$profile_uid);
 
+	// Fallback so that we alway have a thr-parent
+	if(!$thr_parent)
+		$thr_parent = $uri;
+
 	$datarray = array();
 	$datarray['uid']           = $profile_uid;
 	$datarray['type']          = $post_type;
@@ -561,7 +585,7 @@ function item_post(&$a) {
 	$datarray['attach']        = $attachments;
 	$datarray['bookmark']      = intval($bookmark);
 	$datarray['thr-parent']    = $thr_parent;
-	$datarray['postopts']      = '';
+	$datarray['postopts']      = $postopts;
 	$datarray['origin']        = $origin;
 	$datarray['moderated']     = $allow_moderated;
 
@@ -584,7 +608,7 @@ function item_post(&$a) {
 
 	if($preview) {
 		require_once('include/conversation.php');
-		$o = conversation($a,array(array_merge($contact_record,$datarray)),'search',false,true);
+		$o = conversation($a,array(array_merge($contact_record,$datarray)),'search', false);
 		logger('preview: ' . $o);
 		echo json_encode(array('preview' => $o));
 		killme();
@@ -724,6 +748,7 @@ function item_post(&$a) {
 					'verb'         => ACTIVITY_POST,
 					'otype'        => 'item',
 					'parent'       => $parent,
+					'parent_uri'   => $parent_item['uri']
 				));
 			
 			}
@@ -1039,16 +1064,11 @@ function store_diaspora_comment_sig($datarray, $author, $uprvkey, $parent_item,
 	require_once('include/bb2diaspora.php');
 	$signed_body = html_entity_decode(bb2diaspora($datarray['body']));
 
-//	$myaddr = $user['nickname'] . '@' . substr($baseurl, strpos($baseurl,'://') + 3);
-//	if( $author['network'] === NETWORK_DIASPORA)
-//		$diaspora_handle = $author['addr'];
-//	else {
 	// Only works for NETWORK_DFRN
 	$contact_baseurl_start = strpos($author['url'],'://') + 3;
 	$contact_baseurl_length = strpos($author['url'],'/profile') - $contact_baseurl_start;
 	$contact_baseurl = substr($author['url'], $contact_baseurl_start, $contact_baseurl_length);
 	$diaspora_handle = $author['nick'] . '@' . $contact_baseurl;
-//	}
 
 	$signed_text = $datarray['guid'] . ';' . $parent_item['guid'] . ';' . $signed_body . ';' . $diaspora_handle;