Changeset 28911 for main/trunk/greenstone2/runtime-src/src/recpt/rssaction.cpp

Timestamp:

2014-03-17T21:36:16+13:00 (10 years ago)

Author:

ak19

Message:

Fourth commit for security and safe cgiargs.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/rssaction.cpp (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/rssaction.cpp

@@ -68 +68 @@
       << "<channel>\n"
       << "  <title>_collectionname_</title>\n"
-      << "  <link>_httpdomain__httppageabout_</link>\n"
+      << "  <link>_httpdomainHtmlsafe__httppageabout_</link>\n"
       << "  <description>_collectionextra_</description>\n"
       << "  <language>_cgiarglHtmlsafe_</language>\n"
@@ -79 +79 @@
       << "  <title>_collectionname_</title>\n"
       << "  <url>_iconcollection_</url>\n"
-      << "  <link>_httpdomain__httppageabout_</link>\n"
+      << "  <link>_httpdomainHtmlsafe__httppageabout_</link>\n"
       << "  <description>_collectionextra_</description>\n"
       << "</image>\n";
@@ -125 +125 @@
     
     if(!args["hostname"].empty()) {
-      disp.setmacro("httpdomain", "Global", "http://" + encodeForURL(args["hostname"]));
+      disp.setmacro("httpdomain", "Global", "http://" + args["hostname"]);
+      disp.setmacro("httpdomainHtmlsafe", "Global", "http://" + encodeForHTML(args["hostname"]));
     } 
     else { // we shouldn't have to get here
-      disp.setmacro("httpdomain", "Global", "http://localhost:8282"); // the default used in zextra.dm. (Could perhaps default this to localhost too)
+      text_t default_domain = "http://localhost:8282";
+      disp.setmacro("httpdomain", "Global", default_domain); // the default used in zextra.dm. (Could perhaps default this to localhost too)
+      disp.setmacro("httpdomain", "Global", encodeForHTML(default_domain));
     }
   }