diff --git a/include/class.format.php b/include/class.format.php index 4e0ddf9ac257ce1731bbf6f3f674fd61e9d10fed..5c188e497c0f28e423dbee7a59de3e5a21c93f0e 100644 --- a/include/class.format.php +++ b/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. diff --git a/include/staff/system.inc.php b/include/staff/system.inc.php index 9c45c3dabd873d6e5be5ec8ceb9a61d2dee71c90..6b59f0a08c13dd35cff13a7a22576aba6a81ae84 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 90e0f176ac0f0cb138b136a2e76ff16427f73898..a6c3340b5902ed979991404731a6ef33e0bc6009 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>