CS, ZH-CN: update to the strings

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index 45f762fa5907e846cf645382a90557039fea1a3a..e8fc739cd0852839c5011cb4ec7a34de2ea25824 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -1380,7 +1380,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
                // 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"]);
+                       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"]);
@@ -2093,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'];
                }
 
@@ -2715,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;
 
@@ -2808,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'];
                }
        }
@@ -2937,6 +2955,7 @@ function local_delivery($importer,$data) {
                                        thumb = '%s',
                                        micro = '%s',
                                        url = '%s',
+                                       nurl = '%s',
                                        request = '%s',
                                        confirm = '%s',
                                        notify = '%s',
@@ -2948,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']),