Merge https://github.com/friendica/friendica into pull

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index da9185cb8ed6d13626f4ef55f19cf49dbd95b444..6c1c06f99a901ea505dba9368252285ad821936e 100644 (file)
--- 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.
@@ -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']
                                ));
                        
                        }