--- trunk/bin/irc-logger.pl	2007/04/07 22:57:08	59
+++ trunk/bin/irc-logger.pl	2007/06/08 12:07:45	63
@@ -73,7 +73,9 @@
 use HTML::CalendarMonthSimple;
 use Getopt::Long;
 use DateTime;
+use URI::Escape;
 use Data::Dump qw/dump/;
+use DateTime::Format::ISO8601;
 
 my $use_twitter = 1;
 eval { require Net::Twitter; };
@@ -260,7 +262,10 @@
 
 	$sql .= " where message ilike ? or nick ilike ? " if ($args->{search});
 	$sql .= " where id in (" . join(",", @{ $tags->{ $args->{tag} } }) . ") " if ($args->{tag} && $tags->{ $args->{tag} });
-	$sql .= " where date(time) = ? " if ($args->{date});
+	if ($args->{date}) {
+		$args->{date} = DateTime::Format::ISO8601->parse_datetime( $args->{date} )->ymd;
+		$sql .= " where date(time) = ? ";
+	}
 	$sql .= " order by log.time desc";
 	$sql .= " limit " . $args->{limit} if ($args->{limit});
 
@@ -835,18 +840,35 @@
 .nick { color: #000000; font-size: 80%; padding: 2px; font-family: courier, courier new, monospace ; }
 .message { color: #000000; font-size: 100%; }
 .search { float: right; }
+a:link.tag, a:visited.tag { border: 1px dashed #ccc; backgound: #ccc; text-decoration: none }
+a:hover.tag { border: 1px solid #eee }
+hr { border: 1px dashed #ccc; height: 1px; clear: both; }
+/*
 .col-0 { background: #ffff66 }
 .col-1 { background: #a0ffff }
 .col-2 { background: #99ff99 }
 .col-3 { background: #ff9999 }
 .col-4 { background: #ff66ff }
-a:link.tag, a:visited.tag { border: 1px dashed #ccc; backgound: #ccc; text-decoration: none }
-a:hover.tag { border: 1px solid #eee }
-hr { border: 1px dashed #ccc; height: 1px; clear: both; }
+*/
 _END_OF_STYLE_
 
 my $max_color = 4;
 
+my @cols = qw(
+	#ffcccc #ccffe6 #ccccff #e6ccff #ffccff #ffcce6 #ff9999 #ffcc99 #ffff99
+	#ccff99 #99ff99 #99ffcc #99ccff #9999ff #cc99ff #ff6666 #ffb366 #ffff66
+	#66ff66 #66ffb3 #66b3ff #6666ff #ff3333 #33ff33 #3399ff #3333ff #ff3399
+	#a0a0a0 #ff0000 #ffff00 #80ff00 #0000ff #8000ff #ff00ff #ff0080 #994d00
+	#999900 #009900 #cc0066 #c0c0c0 #ccff99 #99ff33 #808080 #660033 #ffffff
+);
+
+$max_color = 0;
+foreach my $c (@cols) {
+	$style .= ".col-${max_color} { background: $c }\n";
+	$max_color++;
+}
+warn "defined $max_color colors for users...\n";
+
 my %nick_enumerator;
 
 sub root_handler {
@@ -924,12 +946,21 @@
 				filter => {
 					message => sub {
 						my $m = shift || return;
+
+						# protect HTML from wiki modifications
+						sub e {
+							my $t = shift;
+							return 'uri_unescape{' . uri_escape($t) . '}';
+						}
+
 						$m =~ s/($escape_re)/$escape{$1}/gs;
-						$m =~ s#($RE{URI}{HTTP})#<a href="$1">$1</a>#gs;
-						$m =~ s#$tag_regex#<a href="?tag=$1" class="tag">$1</a>#g;
+						$m =~ s#($RE{URI}{HTTP})#e(qq{<a href="$1">$1</a>})#egs;
+						$m =~ s#$tag_regex#e(qq{<a href="?tag=$1" class="tag">$1</a>})#egs;
 						$m =~ s#\*(\w+)\*#<b>$1</b>#gs;
 						$m =~ s#_(\w+)_#<u>$1</u>#gs;
 						$m =~ s#\/(\w+)\/#<i>$1</i>#gs;
+
+						$m =~ s#uri_unescape{([^}]+)}#uri_unescape($1)#egs;
 						return $m;
 					},
 					nick => sub {