From 7cc2723e2d4a1326ed4492cf1cade608fa6b94b0 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 18 May 2014 18:57:31 +0200 Subject: [PATCH] Improvement for shortening of the new plaintext option. --- include/html2plain.php | 8 ++++---- include/plaintext.php | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/html2plain.php b/include/html2plain.php index 0398ea79b0..f09087e0b0 100644 --- a/include/html2plain.php +++ b/include/html2plain.php @@ -114,11 +114,11 @@ function html2plain($html, $wraplength = 75, $compact = false) $message = str_replace("\r", "", $html); // replace all hashtag addresses - if (get_config("system", "remove_hashtags_on_export")) { +/* if (get_config("system", "remove_hashtags_on_export")) { $pattern = '/#(.*?)<\/a>/is'; $message = preg_replace($pattern, '#$2', $message); } - +*/ $doc = new DOMDocument(); $doc->preserveWhiteSpace = false; @@ -185,8 +185,8 @@ function html2plain($html, $wraplength = 75, $compact = false) node2bbcode($doc, 'h6', array(), "\n\n*", "*\n"); // Problem: there is no reliable way to detect if it is a link to a tag or profile - //node2bbcode($doc, 'a', array('href'=>'/(.+)/'), ' $1 ', '', true); - node2bbcode($doc, 'a', array('href'=>'/(.+)/', 'rel'=>'oembed'), ' $1 ', '', true); + //node2bbcode($doc, 'a', array('href'=>'/(.+)/'), ' $1 ', ' ', true); + //node2bbcode($doc, 'a', array('href'=>'/(.+)/', 'rel'=>'oembed'), ' $1 ', '', true); //node2bbcode($doc, 'img', array('alt'=>'/(.+)/'), '$1', ''); //node2bbcode($doc, 'img', array('title'=>'/(.+)/'), '$1', ''); //node2bbcode($doc, 'img', array(), '', ''); diff --git a/include/plaintext.php b/include/plaintext.php index 0c985e05c0..76bcaa1f9a 100644 --- a/include/plaintext.php +++ b/include/plaintext.php @@ -168,6 +168,8 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false) { // Is the new message empty by now or is it a reshared message? elseif (($msg == "") OR (($row == 1) AND (substr($msg, 0, 4) == $recycle))) $msg = substr(substr(trim($msg."\n".$line), 0, $limit), 0, -3)."..."; + else + break; } } }