--- trunk/bin/irc-logger.pl	2007/04/07 17:03:57	57
+++ trunk/bin/irc-logger.pl	2007/09/29 13:13:41	67
@@ -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; };
@@ -258,9 +260,22 @@
 
 	my $sql = $context ? $sql_context : $sql_message;
 
+	sub check_date {
+		my $date = shift;
+		$date = eval { DateTime::Format::ISO8601->parse_datetime( $args->{date} )->ymd; };
+		if ( $@ ) {
+			warn "invalid date ", $args->{date}, $/;
+			$date = DateTime->now->ymd;
+		}
+		return $date;
+	}
+
 	$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}) {
+		$sql .= " where date(time) = ? ";
+		$args->{date} = check_date( $args->{date} );
+	}
 	$sql .= " order by log.time desc";
 	$sql .= " limit " . $args->{limit} if ($args->{limit});
 
@@ -274,7 +289,7 @@
 		$sth->execute();
 		_log "tag '$tag' returned ", $sth->rows, " results ", $context || '';
 	} elsif (my $date = $args->{date}) {
-		$sth->execute($date);
+		$sth->execute( check_date($date) );
 		_log "found ", $sth->rows, " messages for date $date ", $context || '';
 	} else {
 		$sth->execute();
@@ -550,7 +565,7 @@
 		save_message( channel => $channel, me => 1, nick => $nick, msg => $msg);
 
 		if ( $use_twitter ) {
-			if ( my $twitter = meta( $nick, $channel, 'twitter' ) ) {
+			if ( my $twitter = meta( $nick, $NICK, 'twitter' ) ) {
 				my ($login,$passwd) = split(/\s+/,$twitter,2);
 				_log("sending twitter for $nick/$login on $channel ");
 				my $bot = Net::Twitter->new( username=>$login, password=>$passwd );
@@ -835,18 +850,37 @@
 .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; }
+*/
+.calendar { border: 1px solid red; width: 100%; }
+.month { border: 0px; width: 100%; }
 _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 {
@@ -880,28 +914,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>",
@@ -909,7 +957,7 @@
 				limit => $q->param('last') || $q->param('date') ? undef : 100,
 				search => $search || undef,
 				tag => $q->param('tag') || undef,
-				date => $q->param('date') || undef,
+				date => check_date( $q->param('date') ),
 				fmt => {
 					date => sub {
 						my $date = shift || return;
@@ -924,9 +972,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 {