Changeset 11320 for trunk

Timestamp:

2006-03-09T14:50:45+13:00 (18 years ago)

Author:

mdewsnip

Message:

Now deals with "<" and ">" characters correctly in the submitted text strings.

Location:

trunk/gsdl/src/recpt

Files:

• gtiaction.cpp (modified) (3 diffs)
• gtiaction.h (modified) (1 diff)

trunk/gsdl/src/recpt/gtiaction.cpp

@@ -439 +439 @@
       submission_text += &cgi_argument_name_cstr[strlen(source_chunk_key_start_cstr)];
       submission_text += "\">\n";
-      submission_text += to_utf8(args[cgi_argument->first]) + "\n";
+      submission_text += to_utf8(xml_safe(args[cgi_argument->first])) + "\n";
       submission_text += "</SourceFileText>\n";
     }
@@ -447 +447 @@
       submission_text += &cgi_argument_name_cstr[strlen(target_chunk_key_start_cstr)];
       submission_text += "\">\n";
-      submission_text += to_utf8(args[cgi_argument->first]) + "\n";
+      submission_text += to_utf8(xml_safe(args[cgi_argument->first])) + "\n";
       submission_text += "</TargetFileText>\n";
     }
@@ -485 +485 @@
 
   return text_string_escaped;
+}
+
+
+
+text_t gtiaction::xml_safe(const text_t &text_string)
+{
+  text_t text_string_safe;
+  text_t::const_iterator here = text_string.begin();
+  text_t::const_iterator end = text_string.end();
+  while (here != end) {
+    if (*here == '<') text_string_safe += "&lt;";
+    else if (*here == '>') text_string_safe += "&gt;";
+    else text_string_safe.push_back(*here);
+    ++here;
+  }
+
+  return text_string_safe;
 }
 

trunk/gsdl/src/recpt/gtiaction.h

@@ -105 +105 @@
   text_t escape_all(text_t source_string, char character_to_escape);
 
+  text_t xml_safe(const text_t &text_string);
+
   void process_gti_submissions(displayclass& disp, cgiargsclass& args, ostream& logout, bool force_submission);