CS, ZH-CN: update to the strings

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index 77337fe0d9a9a0eb635cc1aef69aef31a11ed476..e8fc739cd0852839c5011cb4ec7a34de2ea25824 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -1350,6 +1350,9 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                return 0;
        }
 
+       // Store the unescaped version
+       $unescaped = $arr;
+
        dbesc_array($arr);
 
        logger('item_store: ' . print_r($arr,true), LOGGER_DATA);
@@ -1360,10 +1363,12 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                        . implode("', '", array_values($arr))
                        . "')" );
 
-       // find the item we just created
+       // And restore it
+       $arr = $unescaped;
 
+       // find the item we just created
        $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d ORDER BY `id` ASC ",
-               $arr['uri'],           // already dbesc'd
+               dbesc($arr['uri']),
                intval($arr['uid'])
        );
 
@@ -1374,8 +1379,12 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                // Add every contact to the global contact table
                // Contacts from the statusnet connector are also added since you could add them in OStatus as well.
                if (!$arr['private'] AND in_array($arr["network"],
-                       array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_STATUSNET, "")))
-                       poco_check($arr["author-link"], $arr["author-name"], $arr["network"], $arr["author-avatar"], "", $arr["received"], $arr['contact-id'], $arr['uid']);
+                       array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_STATUSNET, ""))) {
+                       poco_check($arr["author-link"], $arr["author-name"], $arr["network"], $arr["author-avatar"], "", "", "", "", "", $arr["received"], $arr["contact-id"], $arr["uid"]);
+
+                       // Maybe its a body with a shared item? Then extract a global contact from it.
+                       poco_contact_from_body($arr["body"], $arr["received"], $arr["contact-id"], $arr["uid"]);
+               }
 
                // Set "success_update" to the date of the last time we heard from this contact
                // This can be used to filter for inactive contacts and poco.
@@ -1437,7 +1446,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
        if(count($r) > 1) {
                logger('item_store: duplicated post occurred. Removing duplicates.');
                q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `id` != %d ",
-                       $arr['uri'],
+                       dbesc($arr['uri']),
                        intval($arr['uid']),
                        intval($current_post)
                );
@@ -2084,9 +2093,16 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {
                        $name_updated = $elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated'];
                        $new_name = $elems['name'][0]['data'];
+
+                       // Manually checking for changed contact names
+                       if (($new_name != $contact['name']) AND ($new_name != "") AND ($name_updated <= $contact['name-date'])) {
+                               $name_updated = date("c");
+                               $photo_timestamp = date("c");
+                       }
                }
                if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
-                       $photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
+                       if ($photo_timestamp == "")
+                               $photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
                        $photo_url = $elems['link'][0]['attribs']['']['href'];
                }
 
@@ -2706,6 +2722,10 @@ function item_is_remote_self($contact, &$datarray) {
        if ($datarray["app"] == $a->get_hostname())
                return false;
 
+       // Only forward posts
+       if ($datarray["verb"] != ACTIVITY_POST)
+               return false;
+
        if (($contact['network'] != NETWORK_FEED) AND $datarray['private'])
                return false;
 
@@ -2799,9 +2819,16 @@ function local_delivery($importer,$data) {
                if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {
                        $name_updated = $elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated'];
                        $new_name = $elems['name'][0]['data'];
+
+                       // Manually checking for changed contact names
+                       if (($new_name != $importer['name']) AND ($new_name != "") AND ($name_updated <= $importer['name-date'])) {
+                               $name_updated = date("c");
+                               $photo_timestamp = date("c");
+                       }
                }
                if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
-                       $photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
+                       if ($photo_timestamp == "")
+                               $photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
                        $photo_url = $elems['link'][0]['attribs']['']['href'];
                }
        }
@@ -2928,6 +2955,7 @@ function local_delivery($importer,$data) {
                                        thumb = '%s',
                                        micro = '%s',
                                        url = '%s',
+                                       nurl = '%s',
                                        request = '%s',
                                        confirm = '%s',
                                        notify = '%s',
@@ -2939,6 +2967,7 @@ function local_delivery($importer,$data) {
                                        dbesc($newloc['thumb']),
                                        dbesc($newloc['micro']),
                                        dbesc($newloc['url']),
+                                       dbesc(normalise_link($newloc['url'])),
                                        dbesc($newloc['request']),
                                        dbesc($newloc['confirm']),
                                        dbesc($newloc['notify']),