Merge branch 'master' into feature/timerclock

# Conflicts:
#	include/courtroom.h

1 files changed, 8 insertions, 2 deletions

diff --git a/src/aopacket.cpp b/src/aopacket.cpp
index bb6ac73b..a40d2ef7 100644
--- a/src/aopacket.cpp
+++ b/src/aopacket.cpp
@@ -8,9 +8,15 @@ AOPacket::AOPacket(QString p_packet_string)
   m_contents = packet_contents.mid(1, packet_contents.size()-2); // trims %
 }
 
-QString AOPacket::to_string()
+QString AOPacket::to_string(bool encoded)
 {
-  return m_header + "#" + m_contents.join("#") + "#%";
+  QStringList contents = m_contents;
+  if (encoded)
+    contents.replaceInStrings("#", "<num>")
+      .replaceInStrings("%", "<percent>")
+      .replaceInStrings("$", "<dollar>")
+      .replaceInStrings("&", "<and>");
+  return m_header + "#" + contents.join("#") + "#%";
 }
 
 void AOPacket::net_encode()