--- deliantra/server/lib/cf.pm	2007/10/25 09:01:24	1.390
+++ deliantra/server/lib/cf.pm	2007/10/26 04:22:05	1.391
@@ -1550,44 +1550,83 @@
 
 =cut
 
+   use re 'eval';
+
+my $group;
+my $interior; $interior = qr{
+   (?:
+      \ (.*?)\  (?{ $group = $^N })
+      | < (??{$interior}) >
+   )
+}x;
+
 sub expand_cfpod {
-   ((my $self), (local $_)) = @_;
+   my ($self, $pod) = @_;
+
+   my $xml;
+
+   while () {
+      if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) {
+         $group = $1;
+
+         $group =~ s/&/&amp;/g;
+         $group =~ s/</&lt;/g;
+
+         $xml .= $group;
+      } elsif ($pod =~ m%\G
+                  ([BCGHITU])
+                  <
+                     (?:
+                        ([^<>]*) (?{ $group = $^N })
+                        | < $interior >
+                     )
+                  >
+               %gcsx
+      ) {
+         my ($code, $data) = ($1, $group);
+
+         if ($code eq "B") {
+            $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
+         } elsif ($code eq "I") {
+            $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
+         } elsif ($code eq "U") {
+            $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
+         } elsif ($code eq "C") {
+            $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
+         } elsif ($code eq "T") {
+            $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
+         } elsif ($code eq "G") {
+            my ($male, $female) = split /\|/, $data;
+            $data =  $self->gender ? $female : $male;
+            $xml .= expand_cfpod ($self, $data);
+         } elsif ($code eq "H") {
+             $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
+                      "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
+                      "")
+                        [$self->{hintmode}];
+         } else {
+            $xml .= "error processing '$code($data)' directive";
+         }
+      } else {
+         if ($pod =~ /\G(.+)/) {
+            warn "parse error while expanding $pod (at $1)";
+         }
+         last;
+      }
+   }
 
-   # escape & and <
-   s/&/&amp;/g;
-   s/(?<![BIUGHT])</&lt;/g;
-
-   # this is buggy, it needs to properly take care of nested <'s
-
-   1 while
-      # replace B<>, I<>, U<> etc.
-      s/B<([^\>]*)>/<b>$1<\/b>/
-      || s/I<([^\>]*)>/<i>$1<\/i>/
-      || s/U<([^\>]*)>/<u>$1<\/u>/
-      || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
-      # replace G<male|female> tags
-      || s{G<([^>|]*)\|([^>]*)>}{
-         $self->gender ? $2 : $1
-      }ge
-      # replace H<hint text>
-      || s{H<([^\>]*)>}
-          {
-             ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
-              "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
-              "")
-                [$self->{hintmode}]
-          }ge;
-
-   # create single paragraphs (very hackish)
-   s/(?<=\S)\n(?=\w)/ /g;
-
-   # compress some whitespace
-   s/\s+\n/\n/g; # ws line-ends
-   s/\n\n+/\n/g; # double lines
-   s/^\n+//;     # beginning lines
-   s/\n+$//;     # ending lines
+   for ($xml) {
+      # create single paragraphs (very hackish)
+      s/(?<=\S)\n(?=\w)/ /g;
+
+      # compress some whitespace
+      s/\s+\n/\n/g; # ws line-ends
+      s/\n\n+/\n/g; # double lines
+      s/^\n+//;     # beginning lines
+      s/\n+$//;     # ending lines
+   }
 
-   $_
+   $xml
 }
 
 sub hintmode {
@@ -2668,6 +2707,7 @@
 
 =cut
 
+# non-persistent channels (usually the info channel)
 our %CHANNEL = (
    "c/identify" => {
       id      => "infobox",
@@ -2709,7 +2749,7 @@
       id      => "infobox",
       title   => "Uptime",
       reply   => undef,
-      tooltip => "How long the server has been running sicne last restart",
+      tooltip => "How long the server has been running since last restart",
    },
    "c/mapinfo" => {
       id      => "infobox",