From b7eb9ebda7e0026d03a07183f14eaf8c5e579977 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Thu, 30 Jan 2014 12:11:16 -0600
Subject: [PATCH] html: PHP DomDocument classes are in the `dom` ext
---
include/class.format.php | 2 +-
include/staff/system.inc.php | 6 +++++-
setup/inc/install-prereq.inc.php | 3 ++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/include/class.format.php b/include/class.format.php
index 31650f2c6..32e3dfc94 100644
--- a/include/class.format.php
+++ b/include/class.format.php
@@ -149,7 +149,7 @@ class Format {
# See if advanced html2text is available (requires xml extension)
if (function_exists('convert_html_to_text')
- && extension_loaded('xml'))
+ && extension_loaded('dom'))
return convert_html_to_text($html, $width);
# Try simple html2text - insert line breaks after new line tags.
diff --git a/include/staff/system.inc.php b/include/staff/system.inc.php
index 9c45c3dab..6b59f0a08 100644
--- a/include/staff/system.inc.php
+++ b/include/staff/system.inc.php
@@ -31,7 +31,11 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin()) die('Access
<tr><td><i class="icon icon-<?php
echo extension_loaded('xml')?'check':'warning-sign'; ?>"></i></td>
<td>xml</td>
- <td>Used for HTML email processing and XML API</td></tr>
+ <td>XML API</td></tr>
+ <tr><td><i class="icon icon-<?php
+ echo extension_loaded('dom')?'check':'warning-sign'; ?>"></i></td>
+ <td>xml-dom</td>
+ <td>Used for HTML email processing</td></tr>
<tr><td><i class="icon icon-<?php
echo extension_loaded('json')?'check':'warning-sign'; ?>"></i></td>
<td>json</td>
diff --git a/setup/inc/install-prereq.inc.php b/setup/inc/install-prereq.inc.php
index 90e0f176a..a6c3340b5 100644
--- a/setup/inc/install-prereq.inc.php
+++ b/setup/inc/install-prereq.inc.php
@@ -24,7 +24,8 @@ if(!defined('SETUPINC')) die('Kwaheri!');
<ul class="progress">
<li class="<?php echo extension_loaded('gd')?'yes':'no'; ?>">Gdlib extension</li>
<li class="<?php echo extension_loaded('imap')?'yes':'no'; ?>">PHP IMAP extension. <em>Required for mail fetching</em></li>
- <li class="<?php echo extension_loaded('xml')?'yes':'no'; ?>">PHP XML extension (for HTML email processing, and XML API)</li>
+ <li class="<?php echo extension_loaded('xml') ?'yes':'no'; ?>">PHP XML extension (for XML API)</li>
+ <li class="<?php echo extension_loaded('dom') ?'yes':'no'; ?>">PHP XML-DOM extension (for HTML email processing)</li>
<li class="<?php echo extension_loaded('json')?'yes':'no'; ?>">PHP JSON extension (faster performance)</li>
<li class="<?php echo extension_loaded('gettext')?'yes':'no'; ?>">Gettext is used for translations (faster performance)</li>
<li class="<?php echo extension_loaded('mbstring')?'yes':'no'; ?>">Mbstring is <b>strongly</b> recommended for all installations</li>
--
GitLab