Merge remote-tracking branch 'upstream/develop' into 1601-dfrn

diff --combined include/items.php
index 02942db97dea7ae13c5a622bc684a4920eb4be40,76ff6e8b0c5ff81e9b526ec393c4bd26534a428b..7931b8c3d4119ae61060ff6ccea24fc6766b8b06
--- 1/include/items.php
--- 2/include/items.php
+++ b/include/items.php
@@@ -19,7 -19,7 +19,7 @@@ require_once('mod/share.php')
  require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
  
  
 -function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0, $forpubsub = false) {
 +function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) {
  
  
        $sitefeed    = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic
@@@ -120,8 -120,18 +120,8 @@@
        else
                $sort = 'ASC';
  
 -      // Include answers to status.net posts in pubsub feeds
 -      if($forpubsub) {
 -              $sql_post_table = "INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`
 -                              LEFT JOIN `item` AS `thritem` ON `thritem`.`uri`=`item`.`thr-parent` AND `thritem`.`uid`=`item`.`uid`";
 -              $visibility = sprintf("AND (`item`.`parent` = `item`.`id`) OR (`item`.`network` = '%s' AND ((`thread`.`network`='%s') OR (`thritem`.`network` = '%s')))",
 -                                      dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_OSTATUS));
 -              $date_field = "`received`";
 -              $sql_order = "`item`.`received` DESC";
 -      } else {
 -              $date_field = "`changed`";
 -              $sql_order = "`item`.`parent` ".$sort.", `item`.`created` ASC";
 -      }
 +      $date_field = "`changed`";
 +      $sql_order = "`item`.`parent` ".$sort.", `item`.`created` ASC";
  
        if(! strlen($last_update))
                $last_update = 'now -30 days';
@@@ -945,8 -955,9 +945,9 @@@ function add_page_info_data($data) 
                $a = get_app();
                $hashtags = "\n";
                foreach ($data["keywords"] AS $keyword) {
-                       $hashtag = str_replace(array(" ", "+", "/", ".", "#", "'"),
-                                               array("","", "", "", "", ""), $keyword);
+                       /// @todo make a positive list of allowed characters
+                       $hashtag = str_replace(array(" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"),
+                                               array("","", "", "", "", "", "", "", "", "", "", ""), $keyword);
                        $hashtags .= "#[url=".$a->get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url] ";
                }
        }
@@@ -957,12 -968,7 +958,7 @@@
  function query_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") {
        require_once("mod/parse_url.php");
  
-       $data = Cache::get("parse_url:".$url);
-       if (is_null($data)){
-               $data = parseurl_getsiteinfo($url, true);
-               Cache::set("parse_url:".$url,serialize($data), CACHE_DAY);
-       } else
-               $data = unserialize($data);
+       $data = parseurl_getsiteinfo_cached($url, true);
  
        if ($photo != "")
                $data["images"][0]["src"] = $photo;
@@@ -1328,6 -1334,10 +1324,10 @@@ function item_store($arr,$force_parent 
                logger("item_store: Set network to ".$arr["network"]." for ".$arr["uri"], LOGGER_DEBUG);
        }
  
+       if ($arr["gcontact-id"] == 0)
+               $arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['author-link'], "network" => $arr['network'],
+                                                        "photo" => $arr['author-avatar'], "name" => $arr['author-name']));
+ 
        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);
@@@ -1599,6 -1609,14 +1599,14 @@@
                );
  
        if($dsprsig) {
+ 
+                 // Friendica servers lower than 3.4.3-2 had double encoded the signature ...
+               // We can check for this condition when we decode and encode the stuff again.
+               if (base64_encode(base64_decode(base64_decode($dsprsig->signature))) == base64_decode($dsprsig->signature)) {
+                       $dsprsig->signature = base64_decode($dsprsig->signature);
+                       logger("Repaired double encoded signature from handle ".$dsprsig->signer, LOGGER_DEBUG);
+               }
+ 
                q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
                        intval($current_post),
                        dbesc($dsprsig->signed_text),
@@@ -2633,7 -2651,7 +2641,7 @@@ function consume_feed($xml,$importer,&$
  
                logger('consume_feed: feed item count = ' . $feed->get_item_quantity());
  
-       // in inverse date order
+               // in inverse date order
                if ($datedir)
                        $items = array_reverse($feed->get_items());
                else