Changeset 1279 for branches/New_Config_Format-branch/gsdl/perllib/ghtml.pm

Timestamp:

2000-07-13T10:21:53+12:00 (24 years ago)

Author:

sjboddie

Message:

merged changes to trunk into New_Config_Format branch

File:

• branches/New_Config_Format-branch/gsdl/perllib/ghtml.pm (modified) (5 diffs)

branches/New_Config_Format-branch/gsdl/perllib/ghtml.pm

@@ -34 +34 @@
 sub htmlsafe
 {
-    $_[0] =~ s/&/&/og;
-    $_[0] =~ s/</&lt;/og;
-    $_[0] =~ s/>/&gt;/og;
+    $_[0] =~ s/&/&amp;/osg;
+    $_[0] =~ s/</&lt;/osg;
+    $_[0] =~ s/>/&gt;/osg;
+    $_[0] =~ s/\"/&quot;/osg;
 }
 
@@ -45 +46 @@
 sub urlsafe
 {
-    $_[0] =~ s/[\x09\x20\x22\x3c\x3e\x5b\x5c\x5d\x5e\x60\x7b\x7c\x7d\x7e\?\=\&\+_\/]/sprintf("%%%2x", ord($&))/ge;
+    $_[0] =~ s/[\x09\x20\x22\x3c\x3e\x5b\x5c\x5d\x5e\x60\x7b\x7c\x7d\x7e\?\=\&\+_\/]/sprintf("%%%2x", ord($&))/gse;
 }
 
@@ -56 +57 @@
 sub dmsafe {
     my ($s) = $_[0];
-    $s =~ s/&/&amp;/og; # for html
-    $s =~ s/</&lt;/og;  # for html
-    $s =~ s/>/&gt;/og;  # for html
-    $s =~ s/\_/&#095;/og; # for dm (we have a convention of starting macros with _
-    $s =~ s/\"/&quot;/og; # for html (don't want to be interpreted as a quote)
-    $s =~ s/\{/&#123;/og; # for dm blocks
-    $s =~ s/\}/&#125;/og; # for dm blocks
+    $s =~ s/&/&amp;/osg; # for html
+    $s =~ s/</&lt;/osg;  # for html
+    $s =~ s/>/&gt;/osg;  # for html
+    $s =~ s/\_/&#095;/osg; # for dm (we have a convention of starting macros with _
+    $s =~ s/\"/&quot;/osg; # for html (don't want to be interpreted as a quote)
+    $s =~ s/\{/&#123;/osg; # for dm blocks
+    $s =~ s/\}/&#125;/osg; # for dm blocks
+    $s =~ s/\\/&#092;/osg; # for dm (dm removes naturally occurring backquotes)
     return $s;
 }
@@ -170 +172 @@
     # args: the text that you want to convert
 
-    $_[0] =~ s/&([^;]+);/&getcharequiv($1,0)/ge;
+    $_[0] =~ s/&([^;]+);/&getcharequiv($1,0)/gse;
 }
 
@@ -177 +179 @@
     # args: the text that you want to convert
 
-    $_[0] =~ s/&([^;]+);/&getcharequiv($1,1)/ge;
+    $_[0] =~ s/&([^;]+);/&getcharequiv($1,1)/gse;
 }