From 18046ff979899fb85e8e87f244cd801a3bcc065f Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 4 Jan 2011 14:13:23 -0700
Subject: [PATCH] Bug #9474: Fix display of raw HTML in help system

Use new raw XML tag to indicate child tags should not be parsed.
---
 framework/Core/lib/Horde/Help.php | 15 ++++++++-------
 kronolith/locale/en/help.xml      | 27 +++++++++++++++------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/framework/Core/lib/Horde/Help.php b/framework/Core/lib/Horde/Help.php
index 9020a94b2..cc1b33352 100644
--- a/framework/Core/lib/Horde/Help.php
+++ b/framework/Core/lib/Horde/Help.php
@@ -83,10 +83,6 @@ class Horde_Help
             if ($entry->attributes()->id == $id) {
                 foreach ($entry->children() as $child) {
                     switch ($child->getName()) {
-                    case 'title':
-                        $out .= '<h1>' . $this->_processNode($child) . '</h1>';
-                        break;
-
                     case 'heading':
                         $out .= '<h2>' . $this->_processNode($child) . '</h2>';
                         break;
@@ -94,10 +90,16 @@ class Horde_Help
                     case 'para':
                         $out .= '<p>' . $this->_processNode($child) . '</p>';
                         break;
+
+                    case 'raw':
+                        $out .= '<p class="fixed">' . htmlentities($this->_processNode($child)) . '</p>';
+                        break;
+
+                    case 'title':
+                        $out .= '<h1>' . $this->_processNode($child) . '</h1>';
+                        break;
                     }
                 }
-
-                break;
             }
         }
 
@@ -218,5 +220,4 @@ class Horde_Help
             . Horde::img('help.png', Horde_Core_Translation::t("Help")) . '</a>';
     }
 
-
 }
diff --git a/kronolith/locale/en/help.xml b/kronolith/locale/en/help.xml
index 85d6a7b24..064ac72e4 100644
--- a/kronolith/locale/en/help.xml
+++ b/kronolith/locale/en/help.xml
@@ -161,25 +161,28 @@
   <para>
     To embed a small Month View of the current month:
   </para>
-    <i>&lt;div id=&quot;kronocalendar&quot;&gt;&lt;/div&gt;&lt;script
-    src=&quot;http://hostname.example.com/horde/kronolith/imple.php?imple=Embed
-    /container=kronocalendar/view=month/calendar=calendar_name&quot;
-    type=&quot;text/javascript&quot;&gt;&lt;/script&gt;</i>
+  <raw>
+    &lt;div id=&quot;kronocalendar&quot;&gt;&lt;/div&gt;&lt;script
+    src=&quot;http://hostname.example.com/horde/kronolith/imple.php?imple=Embed/container=kronocalendar/view=month/calendar=calendar_name&quot;
+    type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
+  </raw>
   <para>
     To embed an Upcoming Events View (note the 'months' and 'maxevents'
     parameters):
   </para>
-    <i>&lt;div id=&quot;kronolist&quot;&gt;&lt;/div&gt;&lt;script
-    src=&quot;http://hostname.example.com/horde/kronolith/imple.php?imple=Embed
-    /view=monthlist/calendar=calendar_name/container=kronolist/months=2/
-    maxevents=10&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;</i>
+  <raw>
+    &lt;div id=&quot;kronolist&quot;&gt;&lt;/div&gt;&lt;script
+    src=&quot;http://hostname.example.com/horde/kronolith/imple.php?imple=Embed/view=monthlist/calendar=calendar_name/container=kronolist/months=2/
+    maxevents=10&quot; type=&quot;text/javascript&quot;&gt;&lt;/script&gt;
+  </raw>
   <para>
     To embed a Summary View:
   </para>
-    <i>&lt;div id=&quot;kronosummary&quot;&gt;
+  <raw>
+    &lt;div id=&quot;kronosummary&quot;&gt;
     &lt;/div&gt;&lt;script type=&quot;text/javascript&quot;
-    src=&quot;http://hostname.example.com/horde/kronolith/imple.php?imple=Embed
-    /container=kronosummary/view=summary/calendar=calendar_name
-    &quot;&gt;&lt;/script&gt;</i>
+    src=&quot;http://hostname.example.com/horde/kronolith/imple.php?imple=Embed/container=kronosummary/view=summary/calendar=calendar_name
+    &quot;&gt;&lt;/script&gt;
+  </raw>
 </entry>
 </help>
-- 
2.11.0