From 624e3b1030eb63183932f8ed54724c129a84ac41 Mon Sep 17 00:00:00 2001 From: Rod Roark Date: Sun, 4 Oct 2015 09:14:25 -0700 Subject: [PATCH] Added HTML-to-text conversion of logged print data. --- interface/logview/logview.php | 3 +- library/ajax/log_print_action_ajax.php | 7 +- library/classes/html2text.class.php | 493 +++++++++++++++++++++++++++++++++ 3 files changed, 500 insertions(+), 3 deletions(-) create mode 100644 library/classes/html2text.class.php diff --git a/interface/logview/logview.php b/interface/logview/logview.php index 34f8665ea..0c0bc73c8 100644 --- a/interface/logview/logview.php +++ b/interface/logview/logview.php @@ -330,7 +330,7 @@ if ($ret = getEvents(array('sdate' => $get_sdate,'edate' => $get_edate, 'user' = - + @@ -406,4 +406,3 @@ Calendar.setup({inputField:"end_date", ifFormat:"%Y-%m-%d %H:%M:%S", button:"img - diff --git a/library/ajax/log_print_action_ajax.php b/library/ajax/log_print_action_ajax.php index 45552152e..ff23c88b7 100644 --- a/library/ajax/log_print_action_ajax.php +++ b/library/ajax/log_print_action_ajax.php @@ -25,6 +25,11 @@ $sanitize_all_escapes = true; require_once("../../interface/globals.php"); require_once("$srcdir/log.inc"); +require_once("$srcdir/classes/html2text.class.php"); -newEvent("print", $_SESSION['authUser'], $_SESSION['authProvider'], 1, strip_tags($_POST['comments'])); +$h2t =& new html2text($_POST['comments']); +$h2t->width = 0; +$h2t->_convert(false); + +newEvent("print", $_SESSION['authUser'], $_SESSION['authProvider'], 1, $h2t->get_text()); ?> diff --git a/library/classes/html2text.class.php b/library/classes/html2text.class.php new file mode 100644 index 000000000..e8a695f35 --- /dev/null +++ b/library/classes/html2text.class.php @@ -0,0 +1,493 @@ + * + * All rights reserved. * + * * + * This script is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * The GNU General Public License can be found at * + * http://www.gnu.org/copyleft/gpl.html. * + * * + * This script is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * Author(s): Jon Abernathy * + * * + * Last modified: 08/08/07 * + * * + *************************************************************************/ + + +/** + * Takes HTML and converts it to formatted, plain text. + * + * Thanks to Alexander Krug (http://www.krugar.de/) to pointing out and + * correcting an error in the regexp search array. Fixed 7/30/03. + * + * Updated set_html() function's file reading mechanism, 9/25/03. + * + * Thanks to Joss Sanglier (http://www.dancingbear.co.uk/) for adding + * several more HTML entity codes to the $search and $replace arrays. + * Updated 11/7/03. + * + * Thanks to Darius Kasperavicius (http://www.dar.dar.lt/) for + * suggesting the addition of $allowed_tags and its supporting function + * (which I slightly modified). Updated 3/12/04. + * + * Thanks to Justin Dearing for pointing out that a replacement for the + * tag was missing, and suggesting an appropriate fix. + * Updated 8/25/04. + * + * Thanks to Mathieu Collas (http://www.myefarm.com/) for finding a + * display/formatting bug in the _build_link_list() function: email + * readers would show the left bracket and number ("[1") as part of the + * rendered email address. + * Updated 12/16/04. + * + * Thanks to Wojciech Bajon (http://histeria.pl/) for submitting code + * to handle relative links, which I hadn't considered. I modified his + * code a bit to handle normal HTTP links and MAILTO links. Also for + * suggesting three additional HTML entity codes to search for. + * Updated 03/02/05. + * + * Thanks to Jacob Chandler for pointing out another link condition + * for the _build_link_list() function: "https". + * Updated 04/06/05. + * + * Thanks to Marc Bertrand (http://www.dresdensky.com/) for + * suggesting a revision to the word wrapping functionality; if you + * specify a $width of 0 or less, word wrapping will be ignored. + * Updated 11/02/06. + * + * *** Big housecleaning updates below: + * + * Thanks to Colin Brown (http://www.sparkdriver.co.uk/) for + * suggesting the fix to handle and blank lines (whitespace). + * Christian Basedau (http://www.movetheweb.de/) also suggested the + * blank lines fix. + * + * Special thanks to Marcus Bointon (http://www.synchromedia.co.uk/), + * Christian Basedau, Norbert Laposa (http://ln5.co.uk/), + * Bas van de Weijer, and Marijn van Butselaar + * for pointing out my glaring error in the handling. Marcus also + * supplied a host of fixes. + * + * Thanks to Jeffrey Silverman (http://www.newtnotes.com/) for pointing + * out that extra spaces should be compressed--a problem addressed with + * Marcus Bointon's fixes but that I had not yet incorporated. + * + * Thanks to Daniel Schledermann (http://www.typoconsult.dk/) for + * suggesting a valuable fix with tag handling. + * + * Thanks to Wojciech Bajon (again!) for suggesting fixes and additions, + * including the tag handling that Daniel Schledermann pointed + * out but that I had not yet incorporated. I haven't (yet) + * incorporated all of Wojciech's changes, though I may at some + * future time. + * + * *** End of the housecleaning updates. Updated 08/08/07. + * + * Modified 2015-10-04 by Rod Roark + * Added an argument to the _convert function to allow omission of the + * links at the end. + * + * @author Jon Abernathy + * @version 1.0.0 + * @since PHP 4.0.2 + */ +class html2text +{ + + /** + * Contains the HTML content to convert. + * + * @var string $html + * @access public + */ + var $html; + + /** + * Contains the converted, formatted text. + * + * @var string $text + * @access public + */ + var $text; + + /** + * Maximum width of the formatted text, in columns. + * + * Set this value to 0 (or less) to ignore word wrapping + * and not constrain text to a fixed-width column. + * + * @var integer $width + * @access public + */ + var $width = 70; + + /** + * List of preg* regular expression patterns to search for, + * used in conjunction with $replace. + * + * @var array $search + * @access public + * @see $replace + */ + var $search = array( + "/\r/", // Non-legal carriage return + "/[\n\t]+/", // Newlines and tabs + '/[ ]{2,}/', // Runs of spaces, pre-handling + '/]*>.*?<\/script>/i', //