Merge pull request #503 from greezybacon/issue/require-dom-extension

html: PHP DomDocument classes are in the `dom` ext

Reviewed-By: Peter Rotich <peter@osticket.com>

include/class.format.php

@@ -145,7 +145,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.

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>

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>