[evolvis-commits] r18148: debugging pending merges:↵ Thorsten Glaser 2012-02-29 remove the Akelos XHTML validator, as it fails with PHP 5.4, and
mirabilos at evolvis.org
mirabilos at evolvis.org
Wed Feb 29 12:29:44 CET 2012
Author: mirabilos
Date: 2012-02-29 12:29:44 +0100 (Wed, 29 Feb 2012)
New Revision: 18148
Removed:
trunk/gforge_base/evolvisforge-5.1/src/common/include/XhtmlValidator.php
Modified:
trunk/gforge_base/evolvisforge-5.1/src/common/include/extras-debug.php
trunk/gforge_base/evolvisforge-5.1/src/common/include/pre.php
trunk/gforge_base/evolvisforge-5.1/src/etc/config.ini.d/debug.ini
trunk/gforge_base/evolvisforge-5.1/src/etc/local.d/24debug
Log:
debugging pending merges:
Thorsten Glaser 2012-02-29 remove the Akelos XHTML validator, as it fails with PHP 5.4, and
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/extras-debug.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/extras-debug.php 2012-02-29 11:29:38 UTC (rev 18147)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/extras-debug.php 2012-02-29 11:29:44 UTC (rev 18148)
@@ -241,38 +241,12 @@
}
}
- $sysdebug_akelos = forge_get_config('sysdebug_akelos');
- if ($sysdebug_akelos) {
- /* Akelos XHTML Validator (most other stuff) */
- require_once($gfcommon . "include/XhtmlValidator.php");
- $XhtmlValidator = new XhtmlValidator();
- $sbuf = explode("<html", $cbuf, 2);
- $sbuf[1] = "<html" . $sbuf[1];
- $vbuf = $sbuf[1];
- if ($XhtmlValidator->validate($vbuf) === false) {
- //$vbuf = $XhtmlValidator->highlightErrors($sbuf[1]);
- $errs = '<ul><li>' . join("</li>\n<li>",
- $XhtmlValidator->getErrors()) . '</li></ul>';
- $valck[] = array(
- 'msg' => "Akelos XHTML Validator found some errors on this document!",
- 'extra' => $errs,
- 'type' => "error",
- );
- $appsrc = true;
- }
- }
-
/* append XHTML source code, if validation failed */
if ($appsrc) {
- if (!$sysdebug_akelos || $vbuf == $sbuf[1]) {
- $vbuf = "<ol><li>" . $pre_tag .
- join(" </pre></li>\n<li>" . $pre_tag,
- explode("\n", htmlentities(rtrim($cbuf)))) .
- " </pre></li></ol>";
- } else {
- $vbuf = $pre_tag . htmlentities(rtrim($sbuf[0])) .
- "</pre>" . $vbuf;
- }
+ $vbuf = "<ol><li>" . $pre_tag .
+ join(" </pre></li>\n<li>" . $pre_tag,
+ explode("\n", htmlentities(rtrim($cbuf)))) .
+ " </pre></li></ol>";
$valck[] = array(
'msg' => "Since XHTML validation failed, here’s the checked document for you to look at:",
'extra' => $vbuf,
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/pre.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/pre.php 2012-02-29 11:29:38 UTC (rev 18147)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/pre.php 2012-02-29 11:29:44 UTC (rev 18148)
@@ -148,8 +148,6 @@
forge_set_config_item_bool ('sysdebug_dbquery', 'core') ;
forge_define_config_item ('sysdebug_xmlstarlet', 'core', 'false') ;
forge_set_config_item_bool ('sysdebug_xmlstarlet', 'core') ;
-forge_define_config_item ('sysdebug_akelos', 'core', 'false') ;
-forge_set_config_item_bool ('sysdebug_akelos', 'core') ;
// Load extra func to add extras func like debug
$sysdebug_enable = forge_get_config('sysdebug_enable');
Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/config.ini.d/debug.ini
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/config.ini.d/debug.ini 2012-02-29 11:29:38 UTC (rev 18147)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/config.ini.d/debug.ini 2012-02-29 11:29:44 UTC (rev 18148)
@@ -22,7 +22,5 @@
; output validation (if sysdebug_enable)
-; XHTML/1.0 Transitional validation using xmlstarlet and the DTD
+; XHTML/1.0 Transitional + RDFa validation using xmlstarlet and the DTD
sysdebug_xmlstarlet = false
-; Akelos validator; apparently XHTML/1.0 Strict or XHTML/1.1 (?)
-sysdebug_akelos = false
Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/local.d/24debug
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/local.d/24debug 2012-02-29 11:29:38 UTC (rev 18147)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/local.d/24debug 2012-02-29 11:29:44 UTC (rev 18148)
@@ -24,8 +24,6 @@
/* output validation (if sysdebug_enable) */
-// XHTML/1.0 Transitional validation using xmlstarlet and the DTD
+// XHTML/1.0 Transitional + RDFa validation using xmlstarlet and the DTD
$sysdebug_xmlstarlet = false;
-// Akelos validator; apparently XHTML/1.0 Strict or XHTML/1.1 (?)
-$sysdebug_akelos = false;
More information about the evolvis-commits
mailing list