--- trunk/bin/irc-logger.pl	2007/04/14 12:45:03	60
+++ trunk/bin/irc-logger.pl	2007/06/08 12:17:35	65
@@ -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,15 @@
 
 	$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}) {
+		my $date = eval { DateTime::Format::ISO8601->parse_datetime( $args->{date} )->ymd; };
+		if ( $@ ) {
+			warn "invalid date ", $args->{date}, $/;
+			$date = DateTime->now->ymd;
+		}
+		$sql .= " where date(time) = ? ";
+		$args->{date} = $date;
+	}
 	$sql .= " order by log.time desc";
 	$sql .= " limit " . $args->{limit} if ($args->{limit});
 
@@ -845,6 +855,8 @@
 .col-3 { background: #ff9999 }
 .col-4 { background: #ff66ff }
 */
+.calendar { border: 1px solid red; width: 100%; }
+.month { border: 0px; width: 100%; }
 _END_OF_STYLE_
 
 my $max_color = 4;
@@ -897,28 +909,42 @@
 		qq{<p>};
 	if ($request->url =~ m#/history#) {
 		my $sth = $dbh->prepare(qq{
-			select date(time) as date,count(*) as nr
+			select date(time) as date,count(*) as nr,sum(length(message)) as len
 				from log
 				group by date(time)
 				order by date(time) desc
 		});
 		$sth->execute();
 		my ($l_yyyy,$l_mm) = (0,0);
+		$html .= qq{<table class="calendar"><tr>};
 		my $cal;
+		my $ord = 0;
 		while (my $row = $sth->fetchrow_hashref) {
 			# this is probably PostgreSQL specific, expects ISO date
 			my ($yyyy,$mm,$dd) = split(/-/, $row->{date});
 			if ($yyyy != $l_yyyy || $mm != $l_mm) {
-				$html .= $cal->as_HTML() if ($cal);
+				if ( $cal ) {
+					$html .= qq{<td valign="top">} . $cal->as_HTML() . qq{</td>};
+					$ord++;
+					$html .= qq{</tr><tr>} if ( $ord % 3 == 0 );
+				}
 				$cal = new HTML::CalendarMonthSimple('month'=>$mm,'year'=>$yyyy);
-				$cal->border(2);
+				$cal->border(1);
+				$cal->width('30%');
+				$cal->cellheight('5em');
+				$cal->tableclass('month');
+				#$cal->cellclass('day');
+				$cal->sunday('SUN');
+				$cal->saturday('SAT');
+				$cal->weekdays('MON','TUE','WED','THU','FRI');
 				($l_yyyy,$l_mm) = ($yyyy,$mm);
 			}
 			$cal->setcontent($dd, qq{
-				<a href="/?date=$row->{date}">$row->{nr}</a>
+				<a href="/?date=$row->{date}">$row->{nr}</a><br/>$row->{len}
 			});
+			
 		}
-		$html .= $cal->as_HTML() if ($cal);
+		$html .= qq{<td valign="top">} . $cal->as_HTML() . qq{</td></tr></table>};
 
 	} else {
 		$html .= join("</p><p>",
@@ -941,12 +967,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 {