Replaced static html2text class by Composer package. Replaced some more $rootpaths by our Config class.
This commit is contained in:
parent
15f91e2ffc
commit
5af15744c2
@ -9,7 +9,8 @@
|
||||
"symfony/dependency-injection": "dev-master",
|
||||
"symfony/yaml": "dev-master",
|
||||
"symfony/config": "dev-master",
|
||||
"ccampbell/chromephp": "dev-master"
|
||||
"ccampbell/chromephp": "dev-master",
|
||||
"html2text/html2text": "dev-master"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": { "": "lib/" },
|
||||
|
||||
35
htdocs/composer.lock
generated
35
htdocs/composer.lock
generated
@ -3,7 +3,7 @@
|
||||
"This file locks the dependencies of your project to a known state",
|
||||
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
|
||||
],
|
||||
"hash": "480b83d0fda088d1cec81d930c5d4754",
|
||||
"hash": "d857a06bd833ddddbe3148052e35b7cc",
|
||||
"packages": [
|
||||
{
|
||||
"name": "ccampbell/chromephp",
|
||||
@ -93,6 +93,36 @@
|
||||
],
|
||||
"time": "2013-02-18 00:04:08"
|
||||
},
|
||||
{
|
||||
"name": "html2text/html2text",
|
||||
"version": "dev-master",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/mtibben/html2text.git",
|
||||
"reference": "2a78b855d82953c1e3bd39bc46d17fdccf68025f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/mtibben/html2text/zipball/2a78b855d82953c1e3bd39bc46d17fdccf68025f",
|
||||
"reference": "2a78b855d82953c1e3bd39bc46d17fdccf68025f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "~3.7"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
"Html2Text": "lib/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"GPLv2"
|
||||
],
|
||||
"description": "Converts HTML to formatted plain text",
|
||||
"time": "2013-12-26 04:38:06"
|
||||
},
|
||||
{
|
||||
"name": "ocpl/okapi",
|
||||
"version": "dev-master",
|
||||
@ -341,7 +371,8 @@
|
||||
"symfony/dependency-injection": 20,
|
||||
"symfony/yaml": 20,
|
||||
"symfony/config": 20,
|
||||
"ccampbell/chromephp": 20
|
||||
"ccampbell/chromephp": 20,
|
||||
"html2text/html2text": 20
|
||||
},
|
||||
"platform": {
|
||||
"php": ">=5.3.0"
|
||||
|
||||
@ -24,16 +24,6 @@
|
||||
global $interface_output, $dblink_slave;
|
||||
if (!isset($interface_output)) $interface_output = 'plain';
|
||||
|
||||
if (isset($opt['rootpath']))
|
||||
$rootpath = $opt['rootpath'];
|
||||
else if (isset($rootpath))
|
||||
$opt['rootpath'] = $rootpath;
|
||||
else
|
||||
{
|
||||
$rootpath = './';
|
||||
$opt['rootpath'] = $rootpath;
|
||||
}
|
||||
|
||||
// yepp, we will use UTF-8
|
||||
mb_internal_encoding('UTF-8');
|
||||
mb_regex_encoding('UTF-8');
|
||||
@ -47,10 +37,10 @@
|
||||
define('regex_statpic_text', '^[a-zA-Z0-9\.\-_ @äüöÄÜÖß=)(\/\\\&*\$+~#!§%;,-?:\[\]{}¹²³\'\"`\|µ°]{0,29}$');
|
||||
|
||||
//load default webserver-settings and common includes
|
||||
require_once($opt['rootpath'] . 'lib/settings.inc.php');
|
||||
require_once($opt['rootpath'] . 'lib/calculation.inc.php');
|
||||
require_once($opt['rootpath'] . 'lib/consts.inc.php');
|
||||
require_once($opt['rootpath'] . 'lib2/errorhandler.inc.php');
|
||||
require_once($GLOBALS['container']->get('ocde.config')->getBaseDir() . '/lib/settings.inc.php');
|
||||
require_once($GLOBALS['container']->get('ocde.config')->getBaseDir() . '/lib/calculation.inc.php');
|
||||
require_once($GLOBALS['container']->get('ocde.config')->getBaseDir() . '/lib/consts.inc.php');
|
||||
require_once($GLOBALS['container']->get('ocde.config')->getBaseDir() . '/lib2/errorhandler.inc.php');
|
||||
|
||||
// check for banned UAs
|
||||
$useragent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";
|
||||
@ -396,14 +386,14 @@
|
||||
|
||||
if (isset($sql_debug) && ($sql_debug == true))
|
||||
{
|
||||
require_once($opt['rootpath'] . 'lib/sqldebugger.inc.php');
|
||||
require_once($GLOBALS['container']->get('ocde.config')->getBaseDir() . '/lib/sqldebugger.inc.php');
|
||||
$result = sqldbg_execute($filtered_sql, $bSlave);
|
||||
if ($result === false) sql_error();
|
||||
}
|
||||
else
|
||||
{
|
||||
// Zeitmessung für die Ausführung
|
||||
require_once($opt['rootpath'] . 'lib/bench.inc.php');
|
||||
require_once($GLOBALS['container']->get('ocde.config')->getBaseDir() . '/lib/bench.inc.php');
|
||||
$cSqlExecution = new Cbench;
|
||||
$cSqlExecution->start();
|
||||
|
||||
|
||||
@ -1,492 +0,0 @@
|
||||
<?php
|
||||
|
||||
// This file is ISO-88591-encoded! Beware of the '£' and of
|
||||
// not multibyte-aware functions if you intend to change this!
|
||||
|
||||
/*************************************************************************
|
||||
* *
|
||||
* class.html2text.inc *
|
||||
* *
|
||||
*************************************************************************
|
||||
* *
|
||||
* Converts HTML to formatted plain text *
|
||||
* *
|
||||
* Copyright (c) 2005-2007 Jon Abernathy <jon@chuggnutt.com> *
|
||||
* 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 <jon@chuggnutt.com> *
|
||||
* *
|
||||
* 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
|
||||
* <TH> 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 </li> 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 <th> 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 <a> tag handling.
|
||||
*
|
||||
* Thanks to Wojciech Bajon (again!) for suggesting fixes and additions,
|
||||
* including the <a> 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.
|
||||
*
|
||||
* @author Jon Abernathy <jon@chuggnutt.com>
|
||||
* @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[^>]*>.*?<\/script>/i', // <script>s -- which strip_tags supposedly has problems with
|
||||
'/<style[^>]*>.*?<\/style>/i', // <style>s -- which strip_tags supposedly has problems with
|
||||
//'/<!-- .* -->/', // Comments -- which strip_tags might have problem a with
|
||||
'/<h[123][^>]*>(.*?)<\/h[123]>/ie', // H1 - H3
|
||||
'/<h[456][^>]*>(.*?)<\/h[456]>/ie', // H4 - H6
|
||||
'/<p[^>]*>/i', // <P>
|
||||
'/<br[^>]*>/i', // <br>
|
||||
'/<b[^>]*>(.*?)<\/b>/ie', // <b>
|
||||
'/<strong[^>]*>(.*?)<\/strong>/ie', // <strong>
|
||||
'/<i[^>]*>(.*?)<\/i>/i', // <i>
|
||||
'/<em[^>]*>(.*?)<\/em>/i', // <em>
|
||||
'/(<ul[^>]*>|<\/ul>)/i', // <ul> and </ul>
|
||||
'/(<ol[^>]*>|<\/ol>)/i', // <ol> and </ol>
|
||||
'/<li[^>]*>(.*?)<\/li>/i', // <li> and </li>
|
||||
'/<li[^>]*>/i', // <li>
|
||||
'/<a [^>]*href="([^"]+)"[^>]*>(.*?)<\/a>/ie',
|
||||
// <a href="">
|
||||
'/<hr[^>]*>/i', // <hr>
|
||||
'/(<table[^>]*>|<\/table>)/i', // <table> and </table>
|
||||
'/(<tr[^>]*>|<\/tr>)/i', // <tr> and </tr>
|
||||
'/<td[^>]*>(.*?)<\/td>/i', // <td> and </td>
|
||||
'/<th[^>]*>(.*?)<\/th>/ie', // <th> and </th>
|
||||
'/&(nbsp|#160);/i', // Non-breaking space
|
||||
'/&(quot|rdquo|ldquo|#8220|#8221|#147|#148);/i',
|
||||
// Double quotes
|
||||
'/&(apos|rsquo|lsquo|#8216|#8217);/i', // Single quotes
|
||||
'/>/i', // Greater-than
|
||||
'/</i', // Less-than
|
||||
'/&(amp|#38);/i', // Ampersand
|
||||
'/&(copy|#169);/i', // Copyright
|
||||
'/&(trade|#8482|#153);/i', // Trademark
|
||||
'/&(reg|#174);/i', // Registered
|
||||
'/&(mdash|#151|#8212);/i', // mdash
|
||||
'/&(ndash|minus|#8211|#8722);/i', // ndash
|
||||
'/&(bull|#149|#8226);/i', // Bullet
|
||||
'/&(pound|#163);/i', // Pound sign
|
||||
'/&(euro|#8364);/i', // Euro sign
|
||||
'/&[^&;]+;/i', // Unknown/unhandled entities
|
||||
'/[ ]{2,}/' // Runs of spaces, post-handling
|
||||
);
|
||||
|
||||
/**
|
||||
* List of pattern replacements corresponding to patterns searched.
|
||||
*
|
||||
* @var array $replace
|
||||
* @access public
|
||||
* @see $search
|
||||
*/
|
||||
var $replace = array(
|
||||
'', // Non-legal carriage return
|
||||
' ', // Newlines and tabs
|
||||
' ', // Runs of spaces, pre-handling
|
||||
'', // <script>s -- which strip_tags supposedly has problems with
|
||||
'', // <style>s -- which strip_tags supposedly has problems with
|
||||
//'', // Comments -- which strip_tags might have problem a with
|
||||
"strtoupper(\"\n\n\\1\n\n\")", // H1 - H3
|
||||
"ucwords(\"\n\n\\1\n\n\")", // H4 - H6
|
||||
"\n\n\t", // <P>
|
||||
"\n", // <br>
|
||||
'strtoupper("\\1")', // <b>
|
||||
'strtoupper("\\1")', // <strong>
|
||||
'_\\1_', // <i>
|
||||
'_\\1_', // <em>
|
||||
"\n\n", // <ul> and </ul>
|
||||
"\n\n", // <ol> and </ol>
|
||||
"\t* \\1\n", // <li> and </li>
|
||||
"\n\t* ", // <li>
|
||||
'$this->_build_link_list("\\1", "\\2")',
|
||||
// <a href="">
|
||||
"\n-------------------------\n", // <hr>
|
||||
"\n\n", // <table> and </table>
|
||||
"\n", // <tr> and </tr>
|
||||
"\t\t\\1\n", // <td> and </td>
|
||||
"strtoupper(\"\t\t\\1\n\")", // <th> and </th>
|
||||
' ', // Non-breaking space
|
||||
'"', // Double quotes
|
||||
"'", // Single quotes
|
||||
'>',
|
||||
'<',
|
||||
'&',
|
||||
'(c)',
|
||||
'(tm)',
|
||||
'(R)',
|
||||
'--',
|
||||
'-',
|
||||
'*',
|
||||
'£',
|
||||
'EUR', // Euro sign. € ?
|
||||
'', // Unknown/unhandled entities
|
||||
' ' // Runs of spaces, post-handling
|
||||
);
|
||||
|
||||
/**
|
||||
* Contains a list of HTML tags to allow in the resulting text.
|
||||
*
|
||||
* @var string $allowed_tags
|
||||
* @access public
|
||||
* @see set_allowed_tags()
|
||||
*/
|
||||
var $allowed_tags = '';
|
||||
|
||||
/**
|
||||
* Contains the base URL that relative links should resolve to.
|
||||
*
|
||||
* @var string $url
|
||||
* @access public
|
||||
*/
|
||||
var $url;
|
||||
|
||||
/**
|
||||
* Indicates whether content in the $html variable has been converted yet.
|
||||
*
|
||||
* @var boolean $_converted
|
||||
* @access private
|
||||
* @see $html, $text
|
||||
*/
|
||||
var $_converted = false;
|
||||
|
||||
/**
|
||||
* Contains URL addresses from links to be rendered in plain text.
|
||||
*
|
||||
* @var string $_link_list
|
||||
* @access private
|
||||
* @see _build_link_list()
|
||||
*/
|
||||
var $_link_list = '';
|
||||
|
||||
/**
|
||||
* Number of valid links detected in the text, used for plain text
|
||||
* display (rendered similar to footnotes).
|
||||
*
|
||||
* @var integer $_link_count
|
||||
* @access private
|
||||
* @see _build_link_list()
|
||||
*/
|
||||
var $_link_count = 0;
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* If the HTML source string (or file) is supplied, the class
|
||||
* will instantiate with that source propagated, all that has
|
||||
* to be done it to call get_text().
|
||||
*
|
||||
* @param string $source HTML content
|
||||
* @param boolean $from_file Indicates $source is a file to pull content from
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function html2text( $source = '', $from_file = false )
|
||||
{
|
||||
if ( !empty($source) ) {
|
||||
$this->set_html($source, $from_file);
|
||||
}
|
||||
$this->set_base_url();
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads source HTML into memory, either from $source string or a file.
|
||||
*
|
||||
* @param string $source HTML content
|
||||
* @param boolean $from_file Indicates $source is a file to pull content from
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function set_html( $source, $from_file = false )
|
||||
{
|
||||
$this->html = $source;
|
||||
|
||||
if ( $from_file && file_exists($source) ) {
|
||||
$fp = fopen($source, 'r');
|
||||
$this->html = fread($fp, filesize($source));
|
||||
fclose($fp);
|
||||
}
|
||||
|
||||
$this->_converted = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the text, converted from HTML.
|
||||
*
|
||||
* @access public
|
||||
* @return string
|
||||
*/
|
||||
function get_text()
|
||||
{
|
||||
if ( !$this->_converted ) {
|
||||
$this->_convert();
|
||||
}
|
||||
|
||||
return $this->text;
|
||||
}
|
||||
|
||||
/**
|
||||
* Prints the text, converted from HTML.
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function print_text()
|
||||
{
|
||||
print $this->get_text();
|
||||
}
|
||||
|
||||
/**
|
||||
* Alias to print_text(), operates identically.
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
* @see print_text()
|
||||
*/
|
||||
function p()
|
||||
{
|
||||
print $this->get_text();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the allowed HTML tags to pass through to the resulting text.
|
||||
*
|
||||
* Tags should be in the form "<p>", with no corresponding closing tag.
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function set_allowed_tags( $allowed_tags = '' )
|
||||
{
|
||||
if ( !empty($allowed_tags) ) {
|
||||
$this->allowed_tags = $allowed_tags;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets a base URL to handle relative links.
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function set_base_url( $url = '' )
|
||||
{
|
||||
if ( empty($url) ) {
|
||||
if ( !empty($_SERVER['HTTP_HOST']) ) {
|
||||
$this->url = 'http://' . $_SERVER['HTTP_HOST'];
|
||||
} else {
|
||||
$this->url = '';
|
||||
}
|
||||
} else {
|
||||
// Strip any trailing slashes for consistency (relative
|
||||
// URLs may already start with a slash like "/file.html")
|
||||
if ( substr($url, -1) == '/' ) {
|
||||
$url = substr($url, 0, -1);
|
||||
}
|
||||
$this->url = $url;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Workhorse function that does actual conversion.
|
||||
*
|
||||
* First performs custom tag replacement specified by $search and
|
||||
* $replace arrays. Then strips any remaining HTML tags, reduces whitespace
|
||||
* and newlines to a readable format, and word wraps the text to
|
||||
* $width characters.
|
||||
*
|
||||
* @access private
|
||||
* @return void
|
||||
*/
|
||||
function _convert()
|
||||
{
|
||||
// Variables used for building the link list
|
||||
$this->_link_count = 0;
|
||||
$this->_link_list = '';
|
||||
|
||||
$text = trim(stripslashes($this->html));
|
||||
|
||||
// Run our defined search-and-replace
|
||||
$text = preg_replace($this->search, $this->replace, $text);
|
||||
|
||||
// Strip any other HTML tags
|
||||
$text = strip_tags($text, $this->allowed_tags);
|
||||
|
||||
// Bring down number of empty lines to 2 max
|
||||
$text = preg_replace("/\n\s+\n/", "\n\n", $text);
|
||||
$text = preg_replace("/[\n]{3,}/", "\n\n", $text);
|
||||
|
||||
// Add link list
|
||||
if ( !empty($this->_link_list) ) {
|
||||
$text .= "\n\nLinks:\n------\n" . $this->_link_list;
|
||||
}
|
||||
|
||||
// Wrap the text to a readable format
|
||||
// for PHP versions >= 4.0.2. Default width is 75
|
||||
// If width is 0 or less, don't wrap the text.
|
||||
if ( $this->width > 0 ) {
|
||||
$text = wordwrap($text, $this->width);
|
||||
}
|
||||
|
||||
$this->text = $text;
|
||||
|
||||
$this->_converted = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper function called by preg_replace() on link replacement.
|
||||
*
|
||||
* Maintains an internal list of links to be displayed at the end of the
|
||||
* text, with numeric indices to the original point in the text they
|
||||
* appeared. Also makes an effort at identifying and handling absolute
|
||||
* and relative links.
|
||||
*
|
||||
* @param string $link URL of the link
|
||||
* @param string $display Part of the text to associate number with
|
||||
* @access private
|
||||
* @return string
|
||||
*/
|
||||
function _build_link_list( $link, $display )
|
||||
{
|
||||
if ( substr($link, 0, 7) == 'http://' || substr($link, 0, 8) == 'https://' ||
|
||||
substr($link, 0, 7) == 'mailto:' ) {
|
||||
$this->_link_count++;
|
||||
$this->_link_list .= "[" . $this->_link_count . "] $link\n";
|
||||
$additional = ' [' . $this->_link_count . ']';
|
||||
} elseif ( substr($link, 0, 11) == 'javascript:' ) {
|
||||
// Don't count the link; ignore it
|
||||
$additional = '';
|
||||
// what about href="#anchor" ?
|
||||
} else {
|
||||
$this->_link_count++;
|
||||
$this->_link_list .= "[" . $this->_link_count . "] " . $this->url;
|
||||
if ( substr($link, 0, 1) != '/' ) {
|
||||
$this->_link_list .= '/';
|
||||
}
|
||||
$this->_link_list .= "$link\n";
|
||||
$additional = ' [' . $this->_link_count . ']';
|
||||
}
|
||||
|
||||
return $display . $additional;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
@ -17,10 +17,10 @@
|
||||
|
||||
****************************************************************************/
|
||||
|
||||
//prepare the templates and include all neccessary
|
||||
require_once('./lib/common.inc.php');
|
||||
require_once($stylepath . '/lib/icons.inc.php');
|
||||
require_once('./lib/recommendation.inc.php');
|
||||
//prepare the templates and include all neccessary
|
||||
require_once('./lib/common.inc.php');
|
||||
require_once($stylepath . '/lib/icons.inc.php');
|
||||
require_once('./lib/recommendation.inc.php');
|
||||
|
||||
//Preprocessing
|
||||
if ($error == false)
|
||||
@ -109,7 +109,7 @@
|
||||
if ($log_record['text_html'] != 0)
|
||||
{
|
||||
$logtext = html_entity_decode($logtext, ENT_COMPAT, 'UTF-8');
|
||||
$h2t = new html2text($logtext);
|
||||
$h2t = new \Html2Text\Html2Text($logtext);
|
||||
$h2t->set_base_url($absolute_server_URI);
|
||||
$logtext = $h2t->get_text();
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#!/usr/local/bin/php -q
|
||||
#!/usr/bin/env php
|
||||
<?php
|
||||
/***************************************************************************
|
||||
./util/watchlist/runwatch.php
|
||||
@ -19,12 +19,13 @@
|
||||
|
||||
***************************************************************************/
|
||||
|
||||
// needs absolute rootpath because called as cronjob
|
||||
$rootpath = dirname(__FILE__) . '/../../';
|
||||
require_once($rootpath . 'lib/clicompatbase.inc.php');
|
||||
require_once('settings.inc.php');
|
||||
require_once($rootpath . 'lib/consts.inc.php');
|
||||
require_once($rootpath . 'lib2/html2text.class.php');
|
||||
require_once __DIR__ . '/../../lib/core.php';
|
||||
|
||||
use Html2Text\Html2Text;
|
||||
|
||||
require_once $GLOBALS['container']->get('ocde.config')->getBaseDir() . '/lib/clicompatbase.inc.php';
|
||||
require_once 'settings.inc.php';
|
||||
require_once $GLOBALS['container']->get('ocde.config')->getBaseDir() . '/lib/consts.inc.php';
|
||||
|
||||
// use posix pid-files to lock process
|
||||
if (!CreatePidFile($watchpid))
|
||||
@ -109,7 +110,7 @@
|
||||
if ($r['count'] > 0)
|
||||
{
|
||||
// ok, eine mail ist fäig
|
||||
$mailbody = read_file($rootpath . 'util/watchlist/watchlist.email');
|
||||
$mailbody = read_file($GLOBALS['container']->get('ocde.config')->getBaseDir() . '/util/watchlist/watchlist.email');
|
||||
$mailbody = mb_ereg_replace('{username}', $rUser['username'], $mailbody);
|
||||
|
||||
$rsWatchesOwner = sql("SELECT id, watchtext FROM watches_waiting WHERE user_id='&1' AND watchtype=1 ORDER BY id DESC", $rUser['user_id']);
|
||||
@ -218,7 +219,7 @@ function process_owner_log($user_id, $log_id)
|
||||
if ($rLog['text_html'] != 0)
|
||||
{
|
||||
$logtext = html_entity_decode($logtext, ENT_COMPAT, 'UTF-8');
|
||||
$h2t = new html2text($logtext);
|
||||
$h2t = new Html2Text($logtext);
|
||||
$h2t->set_base_url($absolute_server_URI);
|
||||
$logtext = $h2t->get_text();
|
||||
/*
|
||||
@ -265,7 +266,7 @@ function process_log_watch($user_id, $log_id)
|
||||
if ($rLog['text_html'] != 0)
|
||||
{
|
||||
$logtext = html_entity_decode($logtext, ENT_COMPAT, 'UTF-8');
|
||||
$h2t = new html2text($logtext);
|
||||
$h2t = new Html2Text($logtext);
|
||||
$h2t->set_base_url($absolute_server_URI);
|
||||
$logtext = $h2t->get_text();
|
||||
/*
|
||||
@ -432,4 +433,3 @@ function CleanupAndExit($PidFile, $message = false)
|
||||
echo $message . "\n";
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
@ -8,6 +8,8 @@
|
||||
***************************************************************************/
|
||||
|
||||
chdir ("../../htdocs");
|
||||
require_once 'lib/core.php';
|
||||
|
||||
require('lib2/cli.inc.php');
|
||||
|
||||
|
||||
@ -47,8 +49,6 @@ function test_encoding($path)
|
||||
static $ur_exclude = array( // no unicode reminder needed
|
||||
'lang/de/ocstyle/search1/search.result.caches',
|
||||
'lib2/b2evo-captcha',
|
||||
'lib2/HTMLPurifier',
|
||||
'lib2/html2text.class.php',
|
||||
'lib2/imagebmp.inc.php',
|
||||
'lib2/smarty',
|
||||
);
|
||||
@ -73,5 +73,3 @@ function test_encoding($path)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user