Frost-mobile: media query in css for tablets

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 5c179bc7a187bc3c7ff063e12b1d5a25ba2f4de7..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;
 
@@ -730,10 +749,7 @@ function item_post(&$a) {
 
 
                        // Store the comment signature information in case we need to relay to Diaspora
-                       // May want to have this run for remote users too, in which case the function needs to be
-                       // expanded
-                       if($self)
-                               store_diaspora_comment_sig($datarray, $a->user, $a->get_baseurl(), $parent_item, $post_id);
+                       store_diaspora_comment_sig($datarray, $author, ($self ? $a->user['prvkey'] : false), $parent_item, $post_id);
 
                }
                else {
@@ -1027,14 +1043,12 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
 }
 
 
-function store_diaspora_comment_sig($datarray, $user, $baseurl, $parent_item, $post_id) {
+function store_diaspora_comment_sig($datarray, $author, $uprvkey, $parent_item, $post_id) {
        // We won't be able to sign Diaspora comments for authenticated visitors - we don't have their private key
 
-       // May want to have this run for remote users too, in which case the function needs to be
-       // expanded
-
        $enabled = intval(get_config('system','diaspora_enabled'));
        if(! $enabled) {
+               logger('mod_item: diaspora support disabled, not storing comment signature', LOGGER_DEBUG);
                return;
        }
 
@@ -1043,19 +1057,25 @@ function store_diaspora_comment_sig($datarray, $user, $baseurl, $parent_item, $p
 
        require_once('include/bb2diaspora.php');
        $signed_body = html_entity_decode(bb2diaspora($datarray['body']));
-       $myaddr = $user['nickname'] . '@' . substr($baseurl, strpos($baseurl,'://') + 3);
-       if($datarray['verb'] === ACTIVITY_LIKE) 
-               $signed_text = $datarray['guid'] . ';' . 'Post' . ';' . $parent_item['guid'] . ';' . 'true' . ';' . $myaddr;
-       else
-               $signed_text = $datarray['guid'] . ';' . $parent_item['guid'] . ';' . $signed_body . ';' . $myaddr;
 
-       $authorsig = base64_encode(rsa_sign($signed_text,$user['prvkey'],'sha256'));
+       // 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;
+
+       if( $uprvkey !== false )
+               $authorsig = base64_encode(rsa_sign($signed_text,$uprvkey,'sha256'));
+       else
+               $authorsig = '';
 
        q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
                intval($post_id),
                dbesc($signed_text),
                dbesc(base64_encode($authorsig)),
-               dbesc($myaddr)
+               dbesc($diaspora_handle)
        );
 
        return;