onepoll.php is reworked

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index 946b285f8178c1b0026dd7a91f39cc6abdf7b983..d1c91b940345d2738ce7b41adb043e8d46c124c4 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -364,9 +364,13 @@ function item_add_language_opt(&$arr) {
                $postopts = "";
        }
 
+       require_once('library/langdet/Text/LanguageDetect.php');
+
        $naked_body = preg_replace('/\[(.+?)\]/','', $arr['body']);
-       $LanguageDetect = new Text_LanguageDetect();
-       $lng = $LanguageDetect->detect($naked_body, 3);
+       $l = new Text_LanguageDetect();
+       //$lng = $l->detectConfidence($naked_body);
+       //$arr['postopts'] = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
+       $lng = $l->detect($naked_body, 3);
 
        if (sizeof($lng) > 0) {
                if ($postopts != "") $postopts .= '&'; // arbitrary separator, to be reviewed
@@ -393,15 +397,24 @@ function uri_to_guid($uri, $host = "") {
        // We have to avoid that different routines could accidentally create the same value
        $parsed = parse_url($uri);
 
+       // When the hostname isn't given, we take it from the uri
        if ($host == "") {
-               $host = $parsed["host"];
+               // Is it in the format data@host.tld?
+               if ((count($parsed) == 1) && strstr($uri, '@')) {
+                       $mailparts = explode('@', $uri);
+                       $host = array_pop($mailparts);
+               } else {
+                       $host = $parsed["host"];
+               }
        }
 
+       // We use a hash of the hostname as prefix for the guid
        $guid_prefix = hash("crc32", $host);
 
        // Remove the scheme to make sure that "https" and "http" doesn't make a difference
        unset($parsed["scheme"]);
 
+       // Glue it together to be able to make a hash from it
        $host_id = implode("/", $parsed);
 
        // We could use any hash algorithm since it isn't a security issue
@@ -559,7 +572,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
        $expire_interval = Config::get('system', 'dbclean-expire-days', 0);
 
        $r = dba::select('user', array('expire'), array('uid' => $uid), array("limit" => 1));
-       if (dbm::is_result($r) && ($r['expire'] > 0) && ($r['expire'] < $expire_interval)) {
+       if (dbm::is_result($r) && ($r['expire'] > 0) && (($r['expire'] < $expire_interval) || ($expire_interval == 0))) {
                $expire_interval = $r['expire'];
        }
 
@@ -748,10 +761,20 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
                $arr["author-id"] = get_contact($arr["author-link"], 0);
        }
 
+       if (blockedContact($arr["author-id"])) {
+               logger('Contact '.$arr["author-id"].' is blocked, item '.$arr["uri"].' will not be stored');
+               return 0;
+       }
+
        if ($arr["owner-id"] == 0) {
                $arr["owner-id"] = get_contact($arr["owner-link"], 0);
        }
 
+       if (blockedContact($arr["owner-id"])) {
+               logger('Contact '.$arr["owner-id"].' is blocked, item '.$arr["uri"].' will not be stored');
+               return 0;
+       }
+
        if ($arr['guid'] != "") {
                // Checking if there is already an item with the same guid
                logger('checking for an item for user '.$arr['uid'].' on network '.$arr['network'].' with the guid '.$arr['guid'], LOGGER_DEBUG);
@@ -1680,7 +1703,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
                        intval($importer['uid'])
                );
 
-               if (dbm::is_result($r) && !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
+               if (dbm::is_result($r) && !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY))) {
 
                        // create notification
                        $hash = random_string();
@@ -1716,7 +1739,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
                                ));
 
                        }
-               } elseif (dbm::is_result($r) && in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
+               } elseif (dbm::is_result($r) && in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY))) {
                        $r = q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1",
                                        intval($importer['uid']),
                                        dbesc($url)