Merge pull request #919 from annando/master

plink, disabling features, triming the content of parsed urls

diff --combined include/text.php
index 872bf74255179417a2d2156a3e3926cc0497c016,9761e5fc93d60a9e39765d697e89b8df484700bf..d5bf51b4758293f90845fc766931c7c069820b99
--- 1/include/text.php
--- 2/include/text.php
+++ b/include/text.php
@@@ -218,16 -218,14 +218,16 @@@ function xmlify($str) 
                                break;
                }       
        }*/
 -
 +      /*
        $buffer = mb_ereg_replace("&", "&", $str);
        $buffer = mb_ereg_replace("'", "'", $buffer);
 -      $buffer = mb_ereg_replace("\"", """, $buffer);
 +      $buffer = mb_ereg_replace('"', """, $buffer);
        $buffer = mb_ereg_replace("<", "&lt;", $buffer);
        $buffer = mb_ereg_replace(">", "&gt;", $buffer);
 -
 +      */
 +      $buffer = htmlspecialchars($str, ENT_QUOTES);
        $buffer = trim($buffer);
 +      
        return($buffer);
  }}
  
@@@ -240,13 -238,11 +240,13 @@@ if(! function_exists('unxmlify')) 
  function unxmlify($s) {
  //    $ret = str_replace('&amp;','&', $s);
  //    $ret = str_replace(array('&lt;','&gt;','&quot;','&apos;'),array('<','>','"',"'"),$ret);
 -      $ret = mb_ereg_replace('&amp;', '&', $s);
 +      /*$ret = mb_ereg_replace('&amp;', '&', $s);
        $ret = mb_ereg_replace('&apos;', "'", $ret);
        $ret = mb_ereg_replace('&quot;', '"', $ret);
        $ret = mb_ereg_replace('&lt;', "<", $ret);
        $ret = mb_ereg_replace('&gt;', ">", $ret);
 +      */
 +      $ret = htmlspecialchars_decode($s, ENT_QUOTES);
        return $ret;    
  }}
  
@@@ -1133,7 -1129,7 +1133,7 @@@ function smilies($s, $sample = false) 
                '<img class="smiley" src="' . $a->get_baseurl() . '/images/like.gif" alt=":like" />',
                '<img class="smiley" src="' . $a->get_baseurl() . '/images/dislike.gif" alt=":dislike" />',
                '<a href="http://friendica.com">~friendica <img class="smiley" src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
 -              '<a href="http://friendica.com">red <img class="smiley" src="' . $a->get_baseurl() . '/images/rhash-16.png" alt="red" /></a>'
 +              '<a href="http://redmatrix.me/">red <img class="smiley" src="' . $a->get_baseurl() . '/images/rhash-16.png" alt="red" /></a>'
        );
  
        $params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
@@@ -1612,16 -1608,19 +1612,19 @@@ if(! function_exists('get_plink')) 
   * @return boolean|array False if item has not plink, otherwise array('href'=>plink url, 'title'=>translated title)
   */
  function get_plink($item) {
-       $a = get_app(); 
-       if (x($item,'plink') && ($item['private'] != 1)) {
-               return array(
-                       'href' => $item['plink'],
+       $a = get_app();
+       $ret = array(
+                       'href' => $a->get_baseurl()."/display/".$a->user['nickname']."/".$item['id'],
                        'title' => t('link to source'),
                );
-       } 
-       else {
-               return false;
-       }
+ 
+       $ret["orig"] = $ret["href"];
+ 
+       //if (x($item,'plink') && ($item['private'] != 1))
+       if (x($item,'plink'))
+               $ret["href"] = $item['plink'];
+ 
+       return($ret);
  }}
  
  if(! function_exists('unamp')) {