Frost-mobile: media query in css for tablets

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 000f466446969e8b14531b7b92cd127d7864cece..436adec50acac647bfd75ba9672d78d4caa31927 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) {
 
@@ -216,6 +217,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 +244,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 +438,7 @@ function item_post(&$a) {
 
        $body = bb_translate_video($body);
 
+
        /**
         * Fold multi-line [code] sequences
         */
@@ -430,6 +447,8 @@ function item_post(&$a) {
 
        $body = scale_external_images($body,false);
 
+
+
        /**
         * Look for any tags and linkify them
         */
@@ -561,7 +580,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;
 
@@ -1039,16 +1058,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;
-       }
+       // 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;