Changeset 24929 for main/trunk/greenstone3/web/interfaces

Timestamp:

2012-01-10T11:21:41+13:00 (12 years ago)

Author:

sjm84

Message:

CGI parameters will now have any newlines escaped

File:

• main/trunk/greenstone3/web/interfaces/oran/transform/javascript-global-setup.xsl (modified) (3 diffs)

main/trunk/greenstone3/web/interfaces/oran/transform/javascript-global-setup.xsl

@@ -22 +22 @@
         <xsl:call-template name="populate-image-url-values"/>
         <xsl:call-template name="populate-metadata-values"/>
+        <xsl:call-template name="include-global-javascript-functions"/>
     </xsl:template>
     
@@ -30 +31 @@
             <xsl:for-each select="/page/pageRequest/paramList/param">
                 <xsl:text disable-output-escaping="yes">name = "</xsl:text><xsl:value-of select="@name"/><xsl:text disable-output-escaping="yes">";</xsl:text>
-                <xsl:text disable-output-escaping="yes">value = "</xsl:text><xsl:value-of select="@value"/><xsl:text disable-output-escaping="yes">";</xsl:text>
+                <xsl:text disable-output-escaping="yes">value = "</xsl:text><xsl:value-of select="util:escapeNewLines(@value)"/><xsl:text disable-output-escaping="yes">";</xsl:text>
                 <xsl:text disable-output-escaping="yes">name = name.replace(".", "_");</xsl:text>
                 gs.cgiParams[name] = value;
@@ -104 +105 @@
             <xsl:text disable-output-escaping="yes">gs.imageURLs.pageIcon = "</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'page_icon_image')"/><xsl:text disable-output-escaping="yes">";</xsl:text>
             <xsl:text disable-output-escaping="yes">gs.imageURLs.trashFull = "</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'trash_full_image')"/><xsl:text disable-output-escaping="yes">";</xsl:text>
+            <xsl:text disable-output-escaping="yes">gs.imageURLs.blank = "</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'blank_image')"/><xsl:text disable-output-escaping="yes">";</xsl:text>
         </script>
+    </xsl:template>
+    
+    <xsl:template name="include-global-javascript-functions">
+        <script type="text/javascript" src="interfaces/oran/js/javascript-global-functions.js"><xsl:text> </xsl:text></script>
     </xsl:template>
 </xsl:stylesheet>